Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into dev/1.0 #270

Merged
merged 62 commits into from
Aug 2, 2024
Merged

Conversation

wyfo
Copy link
Contributor

@wyfo wyfo commented Aug 2, 2024

@diogomatsubara can you double check my merge?
@Mallets

wyfo and others added 30 commits April 15, 2024 13:24
Roughly adapt the code to the new PyO3 API, with a few warning fixes.
* fix(examples): fix commented parts of z_put.py

* fix: apply PR reviews

* fix: apply PR reviews
* 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.
Releasing GIL in Scout destructor prevents the deadlock.
Signed-off-by: gabrik <gabriele.baldoni@gmail.com>
Co-authored-by: Luca Cominardi <luca.cominardi@gmail.com>
…pse-zenoh#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

* 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>
…-zenoh#190)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#192)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#193)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#194)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#195)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#196)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#197)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#198)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#200)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#202)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#203)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
* 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
…-zenoh#206)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#208)

* fix: add `Encoding.with_suffix` instead of `Encoding.append`

* feat: add `prefix`/`suffix` methods to `Encoding`
…-zenoh#209)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
Signed-off-by: ChenYing Kuo <evshary@gmail.com>
Signed-off-by: ChenYing Kuo <evshary@gmail.com>
Signed-off-by: ChenYing Kuo <evshary@gmail.com>
eclipse-zenoh-bot and others added 26 commits May 31, 2024 00:14
…-zenoh#216)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#217)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
upload-artifacts/v4 has a breaking change from v3, which requires the
artifacts names to be unique. Fix eclipse-zenoh#219
…-zenoh#221)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#222)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#223)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
Signed-off-by: ChenYing Kuo <evshary@gmail.com>
…-zenoh#225)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#228)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#230)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#231)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#236)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#247)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#248)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#252)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#253)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#259)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#261)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#262)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#265)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
…-zenoh#268)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
# Conflicts:
#	.github/workflows/release.yml
#	Cargo.lock
#	Cargo.toml
#	README.md
#	examples/README.md
#	examples/z_ping.py
#	examples/z_pong.py
#	examples/z_put.py
#	examples/z_sub.py
#	pyproject.toml
#	src/closures.rs
#	src/config.rs
#	src/enums.rs
#	src/lib.rs
#	src/queryable.rs
#	src/session.rs
#	src/value.rs
#	tests/test_session.py
#	zenoh/enums.py
#	zenoh/queryable.py
#	zenoh/session.py
#	zenoh/value.py
@diogomatsubara
Copy link
Contributor

@wyfo LGTM. I'm curious about the conflicts in the source code files. Did you just kept the existing version already in the dev/1.0.0 branch?

@wyfo
Copy link
Contributor Author

wyfo commented Aug 2, 2024

Did you just kept the existing version already in the dev/1.0.0 branch?

Obviously yes, because this version is a 100% rewrite from scratch :)

@Mallets Mallets merged commit 4dc5323 into eclipse-zenoh:dev/1.0.0 Aug 2, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants