Skip to content

Commit 4194e2e

Browse files
authored
Fix/paho (#119)
* pin version < 2 * revert opentelemetry * fix requirements * fix version * fix licenses and tests
1 parent de93359 commit 4194e2e

File tree

6 files changed

+20
-29
lines changed

6 files changed

+20
-29
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
velocitas-sdk==0.13.0
1+
velocitas-sdk==0.13.1

.project-creation/test/test_integration.py

-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ def test_files_in_place():
4242

4343
# github integration
4444
is_dir(".github")
45-
is_dir(".github/actions")
46-
is_dir(".github/actions/pre-commit-action")
47-
is_file(".github/actions/pre-commit-action/action.yml")
4845
is_dir(".github/ISSUE_TEMPLATE")
4946
is_file(".github/ISSUE_TEMPLATE/bug-report.yml")
5047
is_file(".github/ISSUE_TEMPLATE/feature-request.yml")

NOTICE-3RD-PARTY-CONTENT.md

+6-8
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,18 @@
2828
|grpcio-tools|1.59.0|Apache 2.0|
2929
|identify|2.5.33|MIT|
3030
|idna|3.4|BSD|
31-
|importlib-metadata|6.11.0|Apache 2.0|
3231
|iniconfig|2.0.0|MIT|
3332
|multidict|6.0.4|Apache 2.0|
3433
|mypy|1.8.0|MIT|
3534
|mypy-extensions|1.0.0|MIT|
3635
|mypy-protobuf|3.4.0|Apache 2.0|
3736
|nodeenv|1.8.0|BSD|
38-
|opentelemetry-api|1.22.0|Apache 2.0|
39-
|opentelemetry-distro|0.43b0|Apache 2.0|
40-
|opentelemetry-instrumentation|0.43b0|Apache 2.0|
41-
|opentelemetry-instrumentation-logging|0.43b0|Apache 2.0|
42-
|opentelemetry-sdk|1.22.0|Apache 2.0|
43-
|opentelemetry-semantic-conventions|0.43b0|Apache 2.0|
37+
|opentelemetry-api|1.15.0|Apache 2.0|
38+
|opentelemetry-distro|0.36b0|Apache 2.0|
39+
|opentelemetry-instrumentation|0.36b0|Apache 2.0|
40+
|opentelemetry-instrumentation-logging|0.36b0|Apache 2.0|
41+
|opentelemetry-sdk|1.15.0|Apache 2.0|
42+
|opentelemetry-semantic-conventions|0.36b0|Apache 2.0|
4443
|packaging|23.1|Apache 2.0<br/>BSD|
4544
|paho-mqtt|1.6.1|OSI Approved|
4645
|pip|24.0|MIT|
@@ -70,7 +69,6 @@
7069
|wheel|0.42.0|MIT|
7170
|wrapt|1.15.0|BSD|
7271
|yarl|1.9.2|Apache 2.0|
73-
|zipp|3.17.0|MIT|
7472
## Workflows
7573
| Dependency | Version | License |
7674
|:-----------|:-------:|--------:|
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
velocitas-sdk==0.13.0
1+
velocitas-sdk==0.13.1

requirements.txt

+6-10
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ identify==2.5.33
6868
# via pre-commit
6969
idna==3.4
7070
# via yarl
71-
importlib-metadata==6.11.0
72-
# via opentelemetry-api
7371
iniconfig==2.0.0
7472
# via pytest
7573
multidict==6.0.4
@@ -84,26 +82,26 @@ mypy-protobuf==3.4.0
8482
# via velocitas_sdk (setup.py)
8583
nodeenv==1.8.0
8684
# via pre-commit
87-
opentelemetry-api==1.22.0
85+
opentelemetry-api==1.15.0
8886
# via
8987
# opentelemetry-distro
9088
# opentelemetry-instrumentation
9189
# opentelemetry-instrumentation-logging
9290
# opentelemetry-sdk
9391
# velocitas_sdk (setup.py)
94-
opentelemetry-distro==0.43b0
92+
opentelemetry-distro==0.36b0
9593
# via velocitas_sdk (setup.py)
96-
opentelemetry-instrumentation==0.43b0
94+
opentelemetry-instrumentation==0.36b0
9795
# via
9896
# opentelemetry-distro
9997
# opentelemetry-instrumentation-logging
100-
opentelemetry-instrumentation-logging==0.43b0
98+
opentelemetry-instrumentation-logging==0.36b0
10199
# via velocitas_sdk (setup.py)
102-
opentelemetry-sdk==1.22.0
100+
opentelemetry-sdk==1.15.0
103101
# via
104102
# opentelemetry-distro
105103
# velocitas_sdk (setup.py)
106-
opentelemetry-semantic-conventions==0.43b0
104+
opentelemetry-semantic-conventions==0.36b0
107105
# via opentelemetry-sdk
108106
packaging==23.1
109107
# via
@@ -192,8 +190,6 @@ wrapt==1.15.0
192190
# opentelemetry-instrumentation
193191
yarl==1.9.2
194192
# via aiohttp
195-
zipp==3.17.0
196-
# via importlib-metadata
197193

198194
# The following packages are considered to be unsafe in a requirements file:
199195
# pip

setup.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
"cloudevents>=1.10.0",
2121
"dapr",
2222
"aiohttp==3.9.3",
23-
"paho-mqtt>=1.6.1",
24-
"opentelemetry-distro>=0.43b0",
25-
"opentelemetry-instrumentation-logging>=0.43b0",
26-
"opentelemetry-sdk>=1.22.0",
27-
"opentelemetry-api>=1.22.0",
23+
"paho-mqtt>=1.6.1,<2",
24+
"opentelemetry-distro<=0.36b0",
25+
"opentelemetry-instrumentation-logging<=0.36b0",
26+
"opentelemetry-sdk<=1.15.0",
27+
"opentelemetry-api<=1.15.0",
2828
]
2929

3030
extra_requirements = {
@@ -63,7 +63,7 @@
6363

6464
setup(
6565
name="velocitas_sdk",
66-
version="0.13.0",
66+
version="0.13.1",
6767
description="A Python SDK for Vehicle app",
6868
long_description=long_description,
6969
long_description_content_type="text/markdown",

0 commit comments

Comments
 (0)