diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index ed00f48..ebeb4bd 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -7,7 +7,7 @@ runs-on: ubuntu-20.04 strategy: matrix: - python: [3.8] + python: [3.11] steps: - uses: actions/checkout@v2 @@ -66,7 +66,7 @@ python-version: ${{ matrix.python }} - name: Install Tox - run: pip install tox==3.24.4 + run: pip install tox==4.15.0 - name: install docker-compose run: | diff --git a/requirements/base.txt b/requirements/base.txt index 0700052..0f494ca 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,15 +1,11 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --output-file=requirements/base.txt requirements/base.in # -e git+https://github.com/gridsingularity/gsy-framework@master#egg=gsy_framework # via -r requirements/base.in -async-timeout==4.0.3 - # via - # gsy-framework - # redis attrs==23.2.0 # via # -r requirements/base.in @@ -20,7 +16,7 @@ avro==1.11.3 # via gsy-framework awesome-slugify==1.6.5 # via -r requirements/base.in -bcrypt==4.1.3 +bcrypt==4.3.0 # via paramiko cachetools==5.3.3 # via @@ -30,7 +26,7 @@ certifi==2024.2.2 # via # gsy-framework # requests -cffi==1.16.0 +cffi==1.17.1 # via # cryptography # pynacl @@ -58,9 +54,9 @@ colorama==0.4.6 # via # gsy-framework # tox -colorlog==6.8.2 +colorlog==6.9.0 # via -r requirements/base.in -cryptography==42.0.7 +cryptography==44.0.2 # via paramiko decorator==5.1.1 # via @@ -81,15 +77,15 @@ filelock==3.14.0 # gsy-framework # tox # virtualenv -flake8==4.0.1 +geocoder==1.17.5 + # via gsy-framework +geographiclib==2.0 # via - # flake8-tuple + # geopy # gsy-framework -flake8-tuple==0.4.1 +geopy==2.4.1 # via gsy-framework -geocoder==1.17.5 - # via gsy-framework -graphql-core==3.2.3 +graphql-core==3.2.6 # via sgqlc identify==2.5.36 # via @@ -99,11 +95,8 @@ idna==3.7 # via # gsy-framework # requests -importlib-resources==6.4.0 - # via - # gsy-framework - # jsonschema - # jsonschema-specifications +iso3166==2.1.1 + # via gsy-framework jsonschema==4.22.0 # via gsy-framework jsonschema-specifications==2023.12.1 @@ -112,10 +105,6 @@ jsonschema-specifications==2023.12.1 # jsonschema kafka-python==2.0.2 # via gsy-framework -mccabe==0.6.1 - # via - # flake8 - # gsy-framework nodeenv==1.8.0 # via # gsy-framework @@ -131,12 +120,8 @@ parameterized==0.9.0 # via -r requirements/base.in paramiko==2.12.0 # via fabric3 -pendulum==2.1.2 +pendulum==3.0.0 # via gsy-framework -pkgutil-resolve-name==1.3.10 - # via - # gsy-framework - # jsonschema platformdirs==4.2.2 # via # gsy-framework @@ -148,16 +133,8 @@ pluggy==1.5.0 # tox pre-commit==3.5.0 # via gsy-framework -pycodestyle==2.8.0 - # via - # flake8 - # gsy-framework pycparser==2.22 # via cffi -pyflakes==2.4.0 - # via - # flake8 - # gsy-framework pynacl==1.5.0 # via paramiko pyproject-api==1.6.1 @@ -168,10 +145,7 @@ python-dateutil==2.9.0.post0 # via # gsy-framework # pendulum -pytzdata==2020.1 - # via - # gsy-framework - # pendulum + # time-machine pyyaml==6.0.1 # via # gsy-framework @@ -187,7 +161,7 @@ referencing==0.35.1 # gsy-framework # jsonschema # jsonschema-specifications -regex==2024.5.15 +regex==2024.11.6 # via awesome-slugify requests==2.31.0 # via @@ -198,25 +172,27 @@ rpds-py==0.18.1 # gsy-framework # jsonschema # referencing -sgqlc==16.3 +sgqlc==16.4 # via -r requirements/base.in six==1.16.0 # via # fabric3 - # flake8-tuple # geocoder # gsy-framework # paramiko # python-dateutil tabulate==0.9.0 # via gsy-framework -tomli==2.0.1 +time-machine==2.16.0 # via # gsy-framework - # pyproject-api - # tox + # pendulum tox==4.15.0 # via gsy-framework +tzdata==2025.2 + # via + # gsy-framework + # pendulum unidecode==0.4.21 # via awesome-slugify urllib3==1.26.18 @@ -232,10 +208,6 @@ websockets==12.0 # via # -r requirements/base.in # gsy-framework -zipp==3.18.2 - # via - # gsy-framework - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/dev.txt b/requirements/dev.txt index 90ab9e9..5afd216 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,249 +1,221 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --output-file=requirements/dev.txt requirements/dev.in # -e git+https://github.com/gridsingularity/gsy-framework@master#egg=gsy_framework - # via -r requirements/base.txt -astroid==3.2.2 + # via -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt +astroid==3.3.9 # via pylint -async-timeout==4.0.3 - # via - # -r requirements/base.txt - # gsy-framework - # redis attrs==23.2.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # jsonschema # referencing avro==1.11.3 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework awesome-slugify==1.6.5 - # via -r requirements/base.txt -bcrypt==4.1.3 + # via -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt +bcrypt==4.3.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # paramiko behave==1.2.6 # via -r requirements/dev.in cachetools==5.3.3 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # tox certifi==2024.2.2 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # requests -cffi==1.16.0 +cffi==1.17.1 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # cryptography # pynacl cfgv==3.4.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # pre-commit chardet==5.2.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # tox charset-normalizer==3.3.2 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # requests click==8.1.7 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # click-default-group # geocoder # gsy-framework click-default-group==1.2.4 - # via -r requirements/base.txt + # via -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt colorama==0.4.6 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # tox -colorlog==6.8.2 - # via -r requirements/base.txt -cryptography==42.0.7 +colorlog==6.9.0 + # via -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt +cryptography==44.0.2 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # paramiko decorator==5.1.1 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # ratelim -dill==0.3.8 +dill==0.3.9 # via pylint distlib==0.3.8 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # virtualenv et-xmlfile==1.1.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # openpyxl -exceptiongroup==1.2.1 - # via pytest fabric3==1.14.post1 - # via -r requirements/base.txt + # via -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt filelock==3.14.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # tox # virtualenv -flake8==4.0.1 +geocoder==1.17.5 # via - # -r requirements/base.txt - # flake8-tuple + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework -flake8-tuple==0.4.1 +geographiclib==2.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt + # geopy # gsy-framework -geocoder==1.17.5 +geopy==2.4.1 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework -graphql-core==3.2.3 +graphql-core==3.2.6 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # sgqlc identify==2.5.36 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # pre-commit idna==3.7 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # requests -importlib-resources==6.4.0 +iniconfig==2.1.0 + # via pytest +iso3166==2.1.1 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework - # jsonschema - # jsonschema-specifications -iniconfig==2.0.0 - # via pytest -isort==5.13.2 +isort==6.0.1 # via pylint jsonschema==4.22.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework jsonschema-specifications==2023.12.1 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # jsonschema kafka-python==2.0.2 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework -mccabe==0.6.1 - # via - # -r requirements/base.txt - # flake8 - # gsy-framework - # pylint +mccabe==0.7.0 + # via pylint nodeenv==1.8.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # pre-commit openpyxl==3.0.10 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework packaging==24.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # pyproject-api # pytest # tox parameterized==0.9.0 - # via -r requirements/base.txt + # via -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt paramiko==2.12.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # fabric3 -parse==1.20.1 +parse==1.20.2 # via # behave # parse-type -parse-type==0.6.2 +parse-type==0.6.4 # via behave -pendulum==2.1.2 +pendulum==3.0.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/base.txt - # gsy-framework - # jsonschema platformdirs==4.2.2 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # pylint # tox # virtualenv pluggy==1.5.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # pytest # tox pre-commit==3.5.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # -r requirements/dev.in # gsy-framework -pycodestyle==2.8.0 - # via - # -r requirements/base.txt - # flake8 - # gsy-framework pycparser==2.22 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # cffi -pyflakes==2.4.0 - # via - # -r requirements/base.txt - # flake8 - # gsy-framework -pylint==3.2.2 +pylint==3.3.6 # via -r requirements/dev.in pynacl==1.5.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # paramiko pyproject-api==1.6.1 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # tox -pytest==8.2.1 +pytest==8.3.5 # via # -r requirements/dev.in # pytest-mock @@ -251,57 +223,52 @@ pytest-mock==3.14.0 # via -r requirements/dev.in python-dateutil==2.9.0.post0 # via - # -r requirements/base.txt - # gsy-framework - # pendulum -pytzdata==2020.1 - # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # pendulum + # time-machine pyyaml==6.0.1 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # pre-commit ratelim==0.1.6 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # geocoder # gsy-framework redis==5.0.4 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework referencing==0.35.1 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # jsonschema # jsonschema-specifications -regex==2024.5.15 +regex==2024.11.6 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # awesome-slugify requests==2.31.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # geocoder # gsy-framework rpds-py==0.18.1 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # jsonschema # referencing -sgqlc==16.3 - # via -r requirements/base.txt +sgqlc==16.4 + # via -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt six==1.16.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # behave # fabric3 - # flake8-tuple # geocoder # gsy-framework # paramiko @@ -309,50 +276,43 @@ six==1.16.0 # python-dateutil tabulate==0.9.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework -tomli==2.0.1 +time-machine==2.16.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework - # pylint - # pyproject-api - # pytest - # tox -tomlkit==0.12.5 + # pendulum +tomlkit==0.13.2 # via pylint tox==4.15.0 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework -typing-extensions==4.11.0 +tzdata==2025.2 # via - # astroid - # pylint + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt + # gsy-framework + # pendulum unidecode==0.4.21 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # awesome-slugify urllib3==1.26.18 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # requests virtualenv==20.26.2 # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework # pre-commit # tox websockets==12.0 # via - # -r requirements/base.txt - # gsy-framework -zipp==3.18.2 - # via - # -r requirements/base.txt + # -r /Users/hannesd/gsy/gsy-e-sdk/requirements/base.txt # gsy-framework - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/tox.ini b/tox.ini index e7b5b87..35276b2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,21 @@ [tox] mintoxversion = 2.3 -envlist = check_readme, covclean, py38, coverage, integrationtests +envlist = + check_readme + covclean + py311 + coverage + integrationtests [testenv] -basepython = python3.8 -passenv = LANG TERM LANGUAGE LC_ALL LD_LIBRARY_PATH BRANCH +basepython = python3.11 +passenv = + LANG + TERM + LANGUAGE + LC_ALL + LD_LIBRARY_PATH + BRANCH commands_pre = pip install --upgrade pip pip install -rrequirements/base.txt @@ -27,13 +38,18 @@ max-line-length = 99 exclude = .tox,.cache,.pytest_cache [testenv:integrationtests] -passenv = {[testenv]passenv} INTEGRATION_TESTS_REPO INTEGRATION_TESTS_BRANCH GSY_E_TARGET_BRANCH GSY_E_TARGET_REPO +passenv = + {[testenv]passenv} + INTEGRATION_TESTS_REPO + INTEGRATION_TESTS_BRANCH + GSY_E_TARGET_BRANCH + GSY_E_TARGET_REPO setenv = API_CLIENT_RUN_ON_REDIS = true allowlist_externals = git - /bin/ln - /bin/rm + ln + rm commands_pre = {[testenv]commands_pre} pip install -rrequirements/dev.txt @@ -62,7 +78,8 @@ deps = readme_renderer commands = python setup.py check --restructuredtext --strict [testenv:ci] -passenv = {[testenv:integrationtests]passenv} +passenv = + {[testenv:integrationtests]passenv} setenv = API_CLIENT_RUN_ON_REDIS = true allowlist_externals =