Skip to content

Commit 4dc5323

Browse files
wyfoYuanYuYuanfuzzypixelzoteffahigabrik
authored
Merge main into dev/1.0 (#270)
* chore: bump pyo3 to 0.21 (#175) Roughly adapt the code to the new PyO3 API, with a few warning fixes. * fix(examples): fix commented parts of z_put.py (#176) * fix(examples): fix commented parts of z_put.py * fix: apply PR reviews * fix: apply PR reviews * Correct the syntax of pyproject.toml (#181) * feat: Automate Release (#165) * build: Get Read the Docs release number from Cargo manifest This avoids hardcoding the release number in the documentation build config, making it easier to bump the version by only modifying the manifest. * build: Require Python 3.11 in Read the Docs configuration Python 3.11 is needed to access tomllib; useful for parsing the Cargo manifest file. * feat: Create branch, bump version and tag in release workflow * feat: Add publish-github job * fix: Broken tag dependencies * chore: Remove enforce-linking-issues workflow * fix: Bump version in pyproject.toml * chore: Upgrade artifact actions from v3 to v4 * fix: Typo in git-commit command * fix: Support jq 1.6 ubuntu-22.04 runners use jq 1.6 which doesn't recognize a dot for `[]` value iterator. See: jqlang/jq#1168. * Revert "chore: Upgrade artifact actions from v3 to v4" This reverts commit a535971. * fix: Build wheels from release branch * fix: Switch to pypa/gh-action-pypi-publish@release/v1 The older actions doesn't recognize the pyproject.toml metadata fields. * Force sphinx version to 7.2.6 (#185) * fix: Install maturin according to requirements-dev.txt (#186) * fix: fix scout deadlock (#188) Releasing GIL in Scout destructor prevents the deadlock. * fix(uhlc): bump uhlc version (#173) Signed-off-by: gabrik <gabriele.baldoni@gmail.com> Co-authored-by: Luca Cominardi <luca.cominardi@gmail.com> * feat(tracing): using zenoh-util function for log initialization (#172) * feat(tracing): using zenoh-util function for log initialization Signed-off-by: gabrik <gabriele.baldoni@gmail.com> * chore: adding Cargo.lock Signed-off-by: gabrik <gabriele.baldoni@gmail.com> * feat(tracing): using zenoh main Signed-off-by: gabrik <gabriele.baldoni@gmail.com> * chore: using new try_init_log_from_env Signed-off-by: gabrik <gabriele.baldoni@gmail.com> * chore: sync Cargo.lock Signed-off-by: gabrik <gabriele.baldoni@gmail.com> --------- Signed-off-by: gabrik <gabriele.baldoni@gmail.com> Co-authored-by: Luca Cominardi <luca.cominardi@gmail.com> * feat: add Attachment to API (#189) * feat: add Attachment to API * fix: make attachment a CLI arg in z_put example * Update zenoh/session.py Co-authored-by: Luca Cominardi <luca.cominardi@gmail.com> * Apply suggestions from code review Co-authored-by: Luca Cominardi <luca.cominardi@gmail.com> * test: add test for attachment --------- Co-authored-by: Luca Cominardi <luca.cominardi@gmail.com> * build: Sync with eclipse-zenoh/zenoh@81217c7 from 2024-04-22 (#190) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * fix: Create virtual environment for armv6 build (#191) * build: Sync with eclipse-zenoh/zenoh@2fdddae from 2024-04-23 (#192) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@9a9832a from 2024-04-24 (#193) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@7c64d99 from 2024-04-26 (#194) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@ad58af6 from 2024-04-26 (#195) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@e8916bf from 2024-04-26 (#196) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@ea604b6 from 2024-04-29 (#197) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@371ca6b from 2024-04-30 (#198) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@7a47445 from 2024-05-03 (#200) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@f5195c0 from 2024-05-03 (#202) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@e53364f from 2024-05-04 (#203) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * test: add z_ping/z_pong examples (#205) * fix: make attachment API more similar to dict API (#201) * fix: make attachment API more similar to dict API * fix: fix formatting * fix: fix formatting * fix: fix typing * fix: uncomment tests 😅 * docs: add docstring for Attachment * build: Sync with eclipse-zenoh/zenoh@7e5d5e8 from 2024-05-07 (#206) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * fix: add `Encoding.with_suffix` instead of `Encoding.append` (#208) * fix: add `Encoding.with_suffix` instead of `Encoding.append` * feat: add `prefix`/`suffix` methods to `Encoding` * build: Sync with eclipse-zenoh/zenoh@b8dd01d from 2024-05-07 (#209) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * Support timeout for get in session. Signed-off-by: ChenYing Kuo <evshary@gmail.com> * Update PR based on the review. Signed-off-by: ChenYing Kuo <evshary@gmail.com> * Fix CI lint error. Signed-off-by: ChenYing Kuo <evshary@gmail.com> * Update: PyTypeError => PyValueError Signed-off-by: ChenYing Kuo <evshary@gmail.com> * build: Sync with eclipse-zenoh/zenoh@45e05f0 from 2024-05-13 (#212) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@763a05f from 2024-05-14 (#213) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@75aa273 from 2024-05-15 (#214) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@25f06bd from 2024-05-21 (#215) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@3118d31 from 2024-05-28 (#216) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@d574654 from 2024-06-03 (#217) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * chore: Update artifacts action to v4 (#218) artifacts actions v3 are deprecated * fix: give unique name for artifacts (#220) upload-artifacts/v4 has a breaking change from v3, which requires the artifacts names to be unique. Fix #219 * build: Sync with eclipse-zenoh/zenoh@c279982 from 2024-06-05 (#221) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@d8e66de from 2024-06-10 (#222) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@9d09742 from 2024-06-11 (#223) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * Fix markdown format in README. (#211) Signed-off-by: ChenYing Kuo <evshary@gmail.com> * build: Sync with eclipse-zenoh/zenoh@ed6c636 from 2024-06-12 (#225) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@8160b01 from 2024-06-13 (#228) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * Enable releasing from any branch (#227) * build: Sync with eclipse-zenoh/zenoh@7adad94 from 2024-06-14 (#230) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@93f93d2 from 2024-06-17 (#231) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@2500e5a from 2024-06-20 (#236) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * fix: remove deprecated maturin arg (#241) See PyO3/maturin#1620, `--universal2` has been deprecated * build: Sync with eclipse-zenoh/zenoh@869ace6 from 2024-07-02 (#247) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@b93ca84 from 2024-07-03 (#248) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@b3e42ce from 2024-07-08 (#252) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@b3e42ce from 2024-07-08 (#253) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@b3e42ce from 2024-07-08 (#259) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@0a969cb from 2024-07-25 (#261) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@0a969cb from 2024-07-25 (#262) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@e587aa9 from 2024-07-26 (#265) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * build: Sync with eclipse-zenoh/zenoh@2d88c7b from 2024-07-29 (#268) Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> * chore: remove useless dependencies --------- Signed-off-by: gabrik <gabriele.baldoni@gmail.com> Signed-off-by: ChenYing Kuo <evshary@gmail.com> Co-authored-by: Yuyuan Yuan <az6980522@gmail.com> Co-authored-by: Mahmoud Mazouz <mazouz.mahmoud@outlook.com> Co-authored-by: oteffahi <70609372+oteffahi@users.noreply.github.com> Co-authored-by: Gabriele Baldoni <gabrik@users.noreply.github.com> Co-authored-by: Luca Cominardi <luca.cominardi@gmail.com> Co-authored-by: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com> Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com> Co-authored-by: ChenYing Kuo <evshary@gmail.com> Co-authored-by: kydos <kydos@protonmail.com> Co-authored-by: Diogo Matsubara <diogo.matsubara@pm.me> Co-authored-by: Diogo Matsubara <diogo.matsubara@zettascale.tech>
1 parent e661e27 commit 4dc5323

File tree

6 files changed

+70
-154
lines changed

6 files changed

+70
-154
lines changed

.github/workflows/release.yml

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ on:
1717
type: string
1818
description: Release number of Zenoh
1919
required: false
20+
branch:
21+
type: string
22+
description: Release branch
23+
required: false
2024

2125
jobs:
2226
tag:
@@ -32,6 +36,7 @@ jobs:
3236
repo: ${{ github.repository }}
3337
live-run: ${{ inputs.live-run || false }}
3438
version: ${{ inputs.version }}
39+
branch: ${{ inputs.branch }}
3540
github-token: ${{ secrets.BOT_TOKEN_WORKFLOW }}
3641

3742
- name: Checkout this repository
@@ -76,9 +81,9 @@ jobs:
7681
args: --release --out dist
7782

7883
- name: Upload wheels
79-
uses: actions/upload-artifact@v3
84+
uses: actions/upload-artifact@v4
8085
with:
81-
name: wheels
86+
name: wheels-macos
8287
path: dist
8388

8489
build-windows:
@@ -106,9 +111,9 @@ jobs:
106111
args: --release --out dist
107112

108113
- name: Upload wheels
109-
uses: actions/upload-artifact@v3
114+
uses: actions/upload-artifact@v4
110115
with:
111-
name: wheels
116+
name: wheels-windows-${{ matrix.target }}
112117
path: dist
113118

114119
build-linux:
@@ -131,9 +136,9 @@ jobs:
131136
args: --release --out dist
132137

133138
- name: Upload wheels
134-
uses: actions/upload-artifact@v3
139+
uses: actions/upload-artifact@v4
135140
with:
136-
name: wheels
141+
name: wheels-linux-${{ matrix.target }}
137142
path: dist
138143

139144
build-linux-aarch64:
@@ -159,9 +164,9 @@ jobs:
159164
args: --release --out dist
160165

161166
- name: Upload wheels
162-
uses: actions/upload-artifact@v3
167+
uses: actions/upload-artifact@v4
163168
with:
164-
name: wheels
169+
name: wheels-linux-aarch64
165170
path: dist
166171

167172
build-linux-armv6:
@@ -188,13 +193,15 @@ jobs:
188193
export AR_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-ar
189194
export CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-unknown-linux-gnueabihf-gcc
190195
191-
pip3 install maturin
196+
python3 -m venv venv
197+
source venv/bin/activate
198+
pip3 install -r requirements-dev.txt
192199
maturin build --release --target arm-unknown-linux-gnueabihf --out dist
193200
194201
- name: Upload wheels
195-
uses: actions/upload-artifact@v3
202+
uses: actions/upload-artifact@v4
196203
with:
197-
name: wheels
204+
name: wheels-linux-armv6
198205
path: dist
199206

200207
publish-pypi:
@@ -210,10 +217,11 @@ jobs:
210217
name: Deploy wheels to pypi
211218
runs-on: ubuntu-latest
212219
steps:
213-
- uses: actions/download-artifact@v3
220+
- uses: actions/download-artifact@v4
214221
with:
215-
name: wheels
216222
path: dist
223+
pattern: wheels-*
224+
merge-multiple: true
217225

218226
- name: Check dist
219227
run: ls -al ./dist/*

Cargo.lock

Lines changed: 4 additions & 104 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,9 @@ default = ["zenoh/default"]
4040
maintenance = { status = "actively-developed" }
4141

4242
[dependencies]
43-
env_logger = "0.11.3"
4443
flume = "0.11.0"
4544
json5 = "0.4.1"
4645
paste = "1.0.14"
4746
pyo3 = { version = "0.21.2", features = ["extension-module", "abi3-py38", "experimental-async", "experimental-declarative-modules"] }
48-
tracing = "0.1.40"
49-
uhlc = "0.7.0"
5047
validated_struct = "2.1.0"
5148
zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "dev/1.0.0", features = ["unstable", "internal"], default-features = false }

0 commit comments

Comments
 (0)