From 13ed217b7bf6310b75d2be0e24036fbe2a2578ac Mon Sep 17 00:00:00 2001 From: Erik Jaegervall Date: Mon, 29 Jul 2024 17:17:32 +0200 Subject: [PATCH] Using fixed versions --- .github/workflows/project-creation.yaml | 3 +++ .project-creation/.skeleton/requirements.in | 6 +++--- .project-creation/.skeleton/requirements.txt | 6 +++--- NOTICE-3RD-PARTY-CONTENT.md | 16 +++++++-------- examples/seat-adjuster/requirements.in | 8 ++++---- examples/seat-adjuster/requirements.txt | 8 ++++---- examples/seat-adjuster/tests/requirements.in | 1 - examples/seat-adjuster/tests/requirements.txt | 20 +++++++++---------- requirements.txt | 20 ++++++++++--------- setup.py | 18 ++++++++--------- 10 files changed, 54 insertions(+), 52 deletions(-) diff --git a/.github/workflows/project-creation.yaml b/.github/workflows/project-creation.yaml index 3056b5f5..a9b26c87 100644 --- a/.github/workflows/project-creation.yaml +++ b/.github/workflows/project-creation.yaml @@ -97,6 +97,9 @@ jobs: if [ "${{ matrix.example }}" != "no-example" ]; then cp -r ../sdk/examples/${{ matrix.example }}/* ../app/app fi + # And we do not want a requirement file from a previous version + # then we might get conflicts + # cp ../sdk/requirements.txt . - name: Install dependencies shell: bash diff --git a/.project-creation/.skeleton/requirements.in b/.project-creation/.skeleton/requirements.in index 7b20c3ae..cf61eeca 100644 --- a/.project-creation/.skeleton/requirements.in +++ b/.project-creation/.skeleton/requirements.in @@ -12,7 +12,7 @@ # # SPDX-License-Identifier: Apache-2.0 -grpcio==1.59.0 -protobuf==4.24.4 -cloudevents==1.10.0 +grpcio==1.64.1 +protobuf==5.27.2 +cloudevents==1.11.0 aiohttp==3.9.5 diff --git a/.project-creation/.skeleton/requirements.txt b/.project-creation/.skeleton/requirements.txt index 0d372219..b077dad4 100644 --- a/.project-creation/.skeleton/requirements.txt +++ b/.project-creation/.skeleton/requirements.txt @@ -12,7 +12,7 @@ async-timeout==4.0.3 # via aiohttp attrs==23.2.0 # via aiohttp -cloudevents==1.10.0 +cloudevents==1.11.0 # via -r requirements.in deprecation==2.1.0 # via cloudevents @@ -20,7 +20,7 @@ frozenlist==1.4.1 # via # aiohttp # aiosignal -grpcio==1.59.0 +grpcio==1.64.1 # via -r requirements.in idna==3.7 # via yarl @@ -30,7 +30,7 @@ multidict==6.0.5 # yarl packaging==24.1 # via deprecation -protobuf==4.24.4 +protobuf==5.27.2 # via -r requirements.in yarl==1.9.4 # via aiohttp diff --git a/NOTICE-3RD-PARTY-CONTENT.md b/NOTICE-3RD-PARTY-CONTENT.md index f06fa728..3a8df769 100644 --- a/NOTICE-3RD-PARTY-CONTENT.md +++ b/NOTICE-3RD-PARTY-CONTENT.md @@ -9,28 +9,28 @@ |async-timeout|4.0.3|Apache 2.0| |attrs|23.2.0|MIT| |build|1.2.1|MIT| -|cachetools|5.3.3|MIT| +|cachetools|5.4.0|MIT| |cfgv|3.4.0|MIT| |chardet|5.2.0|LGPL| |click|8.1.7|New BSD| |cloudevents|1.11.0|Apache 2.0| |colorama|0.4.6|BSD| -|coverage|7.5.4|Apache 2.0| +|coverage|7.6.0|Apache 2.0| |Deprecated|1.2.14|MIT| |deprecation|2.1.0|Apache 2.0| |distlib|0.3.8|Python Software Foundation License| -|exceptiongroup|1.2.1|MIT| +|exceptiongroup|1.2.2|MIT| |filelock|3.15.4|The Unlicense (Unlicense)| |frozenlist|1.4.1|Apache 2.0| |grpc-stubs|1.53.0.5|MIT| |grpcio|1.64.1|Apache 2.0| |grpcio-tools|1.64.1|Apache 2.0| -|identify|2.5.36|MIT| +|identify|2.6.0|MIT| |idna|3.7|BSD| |importlib-metadata|7.1.0|Apache 2.0| |iniconfig|2.0.0|MIT| |multidict|6.0.5|Apache 2.0| -|mypy|1.10.1|MIT| +|mypy|1.11.0|MIT| |mypy-extensions|1.0.0|MIT| |mypy-protobuf|3.6.0|Apache 2.0| |nodeenv|1.9.1|BSD| @@ -46,12 +46,12 @@ |pip-tools|7.4.1|BSD| |platformdirs|4.2.2|MIT| |pluggy|1.5.0|MIT| -|pre-commit|3.7.1|MIT| +|pre-commit|3.8.0|MIT| |protobuf|5.27.2|Google License| |pyproject-api|1.7.1|MIT| |pyproject-hooks|1.1.0|MIT| -|pytest|8.2.2|MIT| -|pytest-asyncio|0.23.7|Apache 2.0| +|pytest|8.3.2|MIT| +|pytest-asyncio|0.23.8|Apache 2.0| |pytest-cov|5.0.0|MIT| |pytz|2024.1|MIT| |PyYAML|6.0.1|MIT| diff --git a/examples/seat-adjuster/requirements.in b/examples/seat-adjuster/requirements.in index 513be7bb..ebdd7fbd 100644 --- a/examples/seat-adjuster/requirements.in +++ b/examples/seat-adjuster/requirements.in @@ -12,8 +12,8 @@ # # SPDX-License-Identifier: Apache-2.0 -grpcio==1.59.0 -protobuf==4.24.4 -cloudevents==1.10.0 +grpcio==1.64.1 +protobuf==5.27.2 +cloudevents==1.11.0 aiohttp==3.9.5 -packaging==23.0 +packaging==24.1 diff --git a/examples/seat-adjuster/requirements.txt b/examples/seat-adjuster/requirements.txt index f58375de..96a58240 100644 --- a/examples/seat-adjuster/requirements.txt +++ b/examples/seat-adjuster/requirements.txt @@ -12,7 +12,7 @@ async-timeout==4.0.3 # via aiohttp attrs==23.2.0 # via aiohttp -cloudevents==1.10.0 +cloudevents==1.11.0 # via -r requirements.in deprecation==2.1.0 # via cloudevents @@ -20,7 +20,7 @@ frozenlist==1.4.1 # via # aiohttp # aiosignal -grpcio==1.59.0 +grpcio==1.64.1 # via -r requirements.in idna==3.7 # via yarl @@ -28,11 +28,11 @@ multidict==6.0.5 # via # aiohttp # yarl -packaging==23.0 +packaging==24.1 # via # -r requirements.in # deprecation -protobuf==4.24.4 +protobuf==5.27.2 # via -r requirements.in yarl==1.9.4 # via aiohttp diff --git a/examples/seat-adjuster/tests/requirements.in b/examples/seat-adjuster/tests/requirements.in index 8f32e070..fe53cb33 100644 --- a/examples/seat-adjuster/tests/requirements.in +++ b/examples/seat-adjuster/tests/requirements.in @@ -17,4 +17,3 @@ pytest-ordering pytest-asyncio pytest-cov types-mock -packaging==23.0 diff --git a/examples/seat-adjuster/tests/requirements.txt b/examples/seat-adjuster/tests/requirements.txt index b9e39e8b..7371cfe1 100644 --- a/examples/seat-adjuster/tests/requirements.txt +++ b/examples/seat-adjuster/tests/requirements.txt @@ -4,29 +4,27 @@ # # pip-compile # -coverage[toml]==7.4.1 +coverage[toml]==7.6.0 # via # coverage # pytest-cov -exceptiongroup==1.2.0 +exceptiongroup==1.2.2 # via pytest iniconfig==2.0.0 # via pytest -packaging==23.0 - # via - # -r requirements.in - # pytest -pluggy==1.4.0 +packaging==24.1 + # via pytest +pluggy==1.5.0 # via pytest -pytest==7.4.4 +pytest==8.3.2 # via # -r requirements.in # pytest-asyncio # pytest-cov # pytest-ordering -pytest-asyncio==0.23.4 +pytest-asyncio==0.23.8 # via -r requirements.in -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements.in pytest-ordering==0.6 # via -r requirements.in @@ -34,5 +32,5 @@ tomli==2.0.1 # via # coverage # pytest -types-mock==5.1.0.20240106 +types-mock==5.1.0.20240425 # via -r requirements.in diff --git a/requirements.txt b/requirements.txt index 9e9d6628..4b4c08ae 100755 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ attrs==23.2.0 # via aiohttp build==1.2.1 # via pip-tools -cachetools==5.3.3 +cachetools==5.4.0 # via tox cfgv==3.4.0 # via pre-commit @@ -28,8 +28,10 @@ cloudevents==1.11.0 # via velocitas_sdk (setup.py) colorama==0.4.6 # via tox -coverage[toml]==7.5.4 - # via pytest-cov +coverage[toml]==7.6.0 + # via + # coverage + # pytest-cov deprecated==1.2.14 # via # opentelemetry-api @@ -38,7 +40,7 @@ deprecation==2.1.0 # via cloudevents distlib==0.3.8 # via virtualenv -exceptiongroup==1.2.1 +exceptiongroup==1.2.2 # via pytest filelock==3.15.4 # via @@ -57,7 +59,7 @@ grpcio==1.64.1 # velocitas_sdk (setup.py) grpcio-tools==1.64.1 # via velocitas_sdk (setup.py) -identify==2.5.36 +identify==2.6.0 # via pre-commit idna==3.7 # via yarl @@ -69,7 +71,7 @@ multidict==6.0.5 # via # aiohttp # yarl -mypy==1.10.1 +mypy==1.11.0 # via velocitas_sdk (setup.py) mypy-extensions==1.0.0 # via mypy @@ -118,7 +120,7 @@ pluggy==1.5.0 # via # pytest # tox -pre-commit==3.7.1 +pre-commit==3.8.0 # via velocitas_sdk (setup.py) protobuf==5.27.2 # via @@ -131,12 +133,12 @@ pyproject-hooks==1.1.0 # via # build # pip-tools -pytest==8.2.2 +pytest==8.3.2 # via # pytest-asyncio # pytest-cov # velocitas_sdk (setup.py) -pytest-asyncio==0.23.7 +pytest-asyncio==0.23.8 # via velocitas_sdk (setup.py) pytest-cov==5.0.0 # via velocitas_sdk (setup.py) diff --git a/setup.py b/setup.py index 9f98613f..0650db30 100644 --- a/setup.py +++ b/setup.py @@ -15,15 +15,15 @@ from setuptools import setup requirements = [ - "grpcio>=1.59.0", - "protobuf>=3.19.4", - "cloudevents>=1.10.0", - "aiohttp>=3.9.5", - "paho-mqtt>=2.1.0", - "opentelemetry-distro>=0.46b0", - "opentelemetry-instrumentation-logging>=0.46b0", - "opentelemetry-sdk>=1.25.0", - "opentelemetry-api>=1.25.0", + "grpcio==1.64.1", + "protobuf==5.27.2", + "cloudevents==1.11.0", + "aiohttp==3.9.5", + "paho-mqtt==2.1.0", + "opentelemetry-distro==0.46b0", + "opentelemetry-instrumentation-logging==0.46b0", + "opentelemetry-sdk==1.25.0", + "opentelemetry-api==1.25.0", ] extra_requirements = {