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 <[email protected]> Co-authored-by: Luca Cominardi <[email protected]> * feat(tracing): using zenoh-util function for log initialization (#172) * feat(tracing): using zenoh-util function for log initialization Signed-off-by: gabrik <[email protected]> * chore: adding Cargo.lock Signed-off-by: gabrik <[email protected]> * feat(tracing): using zenoh main Signed-off-by: gabrik <[email protected]> * chore: using new try_init_log_from_env Signed-off-by: gabrik <[email protected]> * chore: sync Cargo.lock Signed-off-by: gabrik <[email protected]> --------- Signed-off-by: gabrik <[email protected]> Co-authored-by: Luca Cominardi <[email protected]> * 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 <[email protected]> * Apply suggestions from code review Co-authored-by: Luca Cominardi <[email protected]> * test: add test for attachment --------- Co-authored-by: Luca Cominardi <[email protected]> * build: Sync with eclipse-zenoh/zenoh@81217c7 from 2024-04-22 (#190) Co-authored-by: eclipse-zenoh-bot <[email protected]> * 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 <[email protected]> * build: Sync with eclipse-zenoh/zenoh@9a9832a from 2024-04-24 (#193) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@7c64d99 from 2024-04-26 (#194) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@ad58af6 from 2024-04-26 (#195) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@e8916bf from 2024-04-26 (#196) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@ea604b6 from 2024-04-29 (#197) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@371ca6b from 2024-04-30 (#198) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@7a47445 from 2024-05-03 (#200) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@f5195c0 from 2024-05-03 (#202) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@e53364f from 2024-05-04 (#203) Co-authored-by: eclipse-zenoh-bot <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * Support timeout for get in session. Signed-off-by: ChenYing Kuo <[email protected]> * Update PR based on the review. Signed-off-by: ChenYing Kuo <[email protected]> * Fix CI lint error. Signed-off-by: ChenYing Kuo <[email protected]> * Update: PyTypeError => PyValueError Signed-off-by: ChenYing Kuo <[email protected]> * build: Sync with eclipse-zenoh/zenoh@45e05f0 from 2024-05-13 (#212) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@763a05f from 2024-05-14 (#213) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@75aa273 from 2024-05-15 (#214) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@25f06bd from 2024-05-21 (#215) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@3118d31 from 2024-05-28 (#216) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@d574654 from 2024-06-03 (#217) Co-authored-by: eclipse-zenoh-bot <[email protected]> * 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 <[email protected]> * build: Sync with eclipse-zenoh/zenoh@d8e66de from 2024-06-10 (#222) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@9d09742 from 2024-06-11 (#223) Co-authored-by: eclipse-zenoh-bot <[email protected]> * Fix markdown format in README. (#211) Signed-off-by: ChenYing Kuo <[email protected]> * build: Sync with eclipse-zenoh/zenoh@ed6c636 from 2024-06-12 (#225) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@8160b01 from 2024-06-13 (#228) Co-authored-by: eclipse-zenoh-bot <[email protected]> * Enable releasing from any branch (#227) * build: Sync with eclipse-zenoh/zenoh@7adad94 from 2024-06-14 (#230) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@93f93d2 from 2024-06-17 (#231) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@2500e5a from 2024-06-20 (#236) Co-authored-by: eclipse-zenoh-bot <[email protected]> * 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 <[email protected]> * build: Sync with eclipse-zenoh/zenoh@b93ca84 from 2024-07-03 (#248) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@b3e42ce from 2024-07-08 (#252) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@b3e42ce from 2024-07-08 (#253) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@b3e42ce from 2024-07-08 (#259) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@0a969cb from 2024-07-25 (#261) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@0a969cb from 2024-07-25 (#262) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@e587aa9 from 2024-07-26 (#265) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@2d88c7b from 2024-07-29 (#268) Co-authored-by: eclipse-zenoh-bot <[email protected]> * chore: remove useless dependencies --------- Signed-off-by: gabrik <[email protected]> Signed-off-by: ChenYing Kuo <[email protected]> Co-authored-by: Yuyuan Yuan <[email protected]> Co-authored-by: Mahmoud Mazouz <[email protected]> Co-authored-by: oteffahi <[email protected]> Co-authored-by: Gabriele Baldoni <[email protected]> Co-authored-by: Luca Cominardi <[email protected]> Co-authored-by: eclipse-zenoh-bot <[email protected]> Co-authored-by: eclipse-zenoh-bot <[email protected]> Co-authored-by: ChenYing Kuo <[email protected]> Co-authored-by: kydos <[email protected]> Co-authored-by: Diogo Matsubara <[email protected]> Co-authored-by: Diogo Matsubara <[email protected]>
eclipse-zenoh · Aug 2, 2024 · 4dc5323 · 4dc5323
1 parent e661e27
commit 4dc5323
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 154 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,6 +17,10 @@ on:
         type: string
         description: Release number of Zenoh
         required: false
+      branch:
+        type: string
+        description: Release branch
+        required: false
 
 jobs:
   tag:
@@ -32,6 +36,7 @@ jobs:
           repo: ${{ github.repository }}
           live-run: ${{ inputs.live-run || false }}
           version: ${{ inputs.version }}
+          branch: ${{ inputs.branch }}
           github-token: ${{ secrets.BOT_TOKEN_WORKFLOW }}
 
       - name: Checkout this repository
@@ -76,9 +81,9 @@ jobs:
           args: --release --out dist
 
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-macos
           path: dist
 
   build-windows:
@@ -106,9 +111,9 @@ jobs:
           args: --release --out dist
 
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-windows-${{ matrix.target }}
           path: dist
 
   build-linux:
@@ -131,9 +136,9 @@ jobs:
           args: --release --out dist
 
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-linux-${{ matrix.target }}
           path: dist
 
   build-linux-aarch64:
@@ -159,9 +164,9 @@ jobs:
           args: --release --out dist
 
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-linux-aarch64
           path: dist
 
   build-linux-armv6:
@@ -188,13 +193,15 @@ jobs:
           export AR_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-ar
           export CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-unknown-linux-gnueabihf-gcc
 
-          pip3 install maturin
+          python3 -m venv venv
+          source venv/bin/activate
+          pip3 install -r requirements-dev.txt
           maturin build --release --target arm-unknown-linux-gnueabihf --out dist
 
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-linux-armv6
           path: dist
 
   publish-pypi:
@@ -210,10 +217,11 @@ jobs:
     name: Deploy wheels to pypi
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: wheels
           path: dist
+          pattern: wheels-*
+          merge-multiple: true
 
       - name: Check dist
         run: ls -al ./dist/*

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,12 +40,9 @@ default = ["zenoh/default"]
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-env_logger = "0.11.3"
 flume = "0.11.0"
 json5 = "0.4.1"
 paste = "1.0.14"
 pyo3 = { version = "0.21.2", features = ["extension-module", "abi3-py38", "experimental-async", "experimental-declarative-modules"] }
-tracing = "0.1.40"
-uhlc = "0.7.0"
 validated_struct = "2.1.0"
 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 }