Skip to content

Commit

Permalink
Fix/paho (#119)
Browse files Browse the repository at this point in the history
* pin version < 2

* revert opentelemetry

* fix requirements

* fix version

* fix licenses and tests
  • Loading branch information
MP91 authored Feb 22, 2024
1 parent de93359 commit 4194e2e
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .project-creation/.skeleton/requirements-velocitas.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
velocitas-sdk==0.13.0
velocitas-sdk==0.13.1
3 changes: 0 additions & 3 deletions .project-creation/test/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ def test_files_in_place():

# github integration
is_dir(".github")
is_dir(".github/actions")
is_dir(".github/actions/pre-commit-action")
is_file(".github/actions/pre-commit-action/action.yml")
is_dir(".github/ISSUE_TEMPLATE")
is_file(".github/ISSUE_TEMPLATE/bug-report.yml")
is_file(".github/ISSUE_TEMPLATE/feature-request.yml")
Expand Down
14 changes: 6 additions & 8 deletions NOTICE-3RD-PARTY-CONTENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,18 @@
|grpcio-tools|1.59.0|Apache 2.0|
|identify|2.5.33|MIT|
|idna|3.4|BSD|
|importlib-metadata|6.11.0|Apache 2.0|
|iniconfig|2.0.0|MIT|
|multidict|6.0.4|Apache 2.0|
|mypy|1.8.0|MIT|
|mypy-extensions|1.0.0|MIT|
|mypy-protobuf|3.4.0|Apache 2.0|
|nodeenv|1.8.0|BSD|
|opentelemetry-api|1.22.0|Apache 2.0|
|opentelemetry-distro|0.43b0|Apache 2.0|
|opentelemetry-instrumentation|0.43b0|Apache 2.0|
|opentelemetry-instrumentation-logging|0.43b0|Apache 2.0|
|opentelemetry-sdk|1.22.0|Apache 2.0|
|opentelemetry-semantic-conventions|0.43b0|Apache 2.0|
|opentelemetry-api|1.15.0|Apache 2.0|
|opentelemetry-distro|0.36b0|Apache 2.0|
|opentelemetry-instrumentation|0.36b0|Apache 2.0|
|opentelemetry-instrumentation-logging|0.36b0|Apache 2.0|
|opentelemetry-sdk|1.15.0|Apache 2.0|
|opentelemetry-semantic-conventions|0.36b0|Apache 2.0|
|packaging|23.1|Apache 2.0<br/>BSD|
|paho-mqtt|1.6.1|OSI Approved|
|pip|24.0|MIT|
Expand Down Expand Up @@ -70,7 +69,6 @@
|wheel|0.42.0|MIT|
|wrapt|1.15.0|BSD|
|yarl|1.9.2|Apache 2.0|
|zipp|3.17.0|MIT|
## Workflows
| Dependency | Version | License |
|:-----------|:-------:|--------:|
Expand Down
2 changes: 1 addition & 1 deletion examples/seat-adjuster/requirements-velocitas.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
velocitas-sdk==0.13.0
velocitas-sdk==0.13.1
16 changes: 6 additions & 10 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ identify==2.5.33
# via pre-commit
idna==3.4
# via yarl
importlib-metadata==6.11.0
# via opentelemetry-api
iniconfig==2.0.0
# via pytest
multidict==6.0.4
Expand All @@ -84,26 +82,26 @@ mypy-protobuf==3.4.0
# via velocitas_sdk (setup.py)
nodeenv==1.8.0
# via pre-commit
opentelemetry-api==1.22.0
opentelemetry-api==1.15.0
# via
# opentelemetry-distro
# opentelemetry-instrumentation
# opentelemetry-instrumentation-logging
# opentelemetry-sdk
# velocitas_sdk (setup.py)
opentelemetry-distro==0.43b0
opentelemetry-distro==0.36b0
# via velocitas_sdk (setup.py)
opentelemetry-instrumentation==0.43b0
opentelemetry-instrumentation==0.36b0
# via
# opentelemetry-distro
# opentelemetry-instrumentation-logging
opentelemetry-instrumentation-logging==0.43b0
opentelemetry-instrumentation-logging==0.36b0
# via velocitas_sdk (setup.py)
opentelemetry-sdk==1.22.0
opentelemetry-sdk==1.15.0
# via
# opentelemetry-distro
# velocitas_sdk (setup.py)
opentelemetry-semantic-conventions==0.43b0
opentelemetry-semantic-conventions==0.36b0
# via opentelemetry-sdk
packaging==23.1
# via
Expand Down Expand Up @@ -192,8 +190,6 @@ wrapt==1.15.0
# opentelemetry-instrumentation
yarl==1.9.2
# via aiohttp
zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
"cloudevents>=1.10.0",
"dapr",
"aiohttp==3.9.3",
"paho-mqtt>=1.6.1",
"opentelemetry-distro>=0.43b0",
"opentelemetry-instrumentation-logging>=0.43b0",
"opentelemetry-sdk>=1.22.0",
"opentelemetry-api>=1.22.0",
"paho-mqtt>=1.6.1,<2",
"opentelemetry-distro<=0.36b0",
"opentelemetry-instrumentation-logging<=0.36b0",
"opentelemetry-sdk<=1.15.0",
"opentelemetry-api<=1.15.0",
]

extra_requirements = {
Expand Down Expand Up @@ -63,7 +63,7 @@

setup(
name="velocitas_sdk",
version="0.13.0",
version="0.13.1",
description="A Python SDK for Vehicle app",
long_description=long_description,
long_description_content_type="text/markdown",
Expand Down

0 comments on commit 4194e2e

Please sign in to comment.