From 082db6f13d52f287af39838b48f389e69e8756fe Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Fri, 8 Apr 2022 09:52:58 +0200 Subject: [PATCH 01/13] move to python 3.9 --- .github/workflows/ci-release.yml | 2 +- .github/workflows/ci-staging.yml | 2 +- .github/workflows/ci-testing-deploy.yml | 60 +++++++++---------- .pre-commit-config.yaml | 2 +- mypy.ini | 2 +- packages/dask-task-models-library/setup.py | 4 +- packages/models-library/setup.py | 4 +- .../postgres-database/scripts/erd/Dockerfile | 10 ++-- .../postgres-database/scripts/erd/Makefile | 2 +- packages/postgres-database/setup.py | 2 +- packages/service-integration/setup.py | 2 +- packages/service-library/setup.py | 2 +- .../src/servicelib/aiohttp/monitoring.py | 2 +- packages/settings-library/setup.py | 2 +- requirements/tools/Dockerfile | 2 +- requirements/tools/Makefile | 2 +- scripts/mypy.bash | 2 +- scripts/pydeps-docker/Dockerfile | 2 +- scripts/pydeps.bash | 2 +- services/api-server/Dockerfile | 2 +- services/api-server/setup.py | 2 +- services/catalog/Dockerfile | 48 +++++++-------- services/catalog/setup.py | 2 +- services/dask-sidecar/Dockerfile | 2 +- services/dask-sidecar/setup.py | 4 +- services/datcore-adapter/Dockerfile | 2 +- services/datcore-adapter/setup.py | 2 +- services/director-v2/Dockerfile | 2 +- services/director-v2/setup.py | 2 +- services/dynamic-sidecar/Dockerfile | 2 +- services/dynamic-sidecar/setup.py | 2 +- services/migration/Dockerfile | 6 +- services/storage/Dockerfile | 2 +- services/storage/setup.py | 2 +- services/web/Dockerfile | 2 +- services/web/server/setup.py | 2 +- .../isolated/test_application_settings.py | 2 +- 37 files changed, 98 insertions(+), 98 deletions(-) diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index f632fd163ea..b9cde4d219c 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -17,7 +17,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] diff --git a/.github/workflows/ci-staging.yml b/.github/workflows/ci-staging.yml index 080f022f653..2520ac21e98 100644 --- a/.github/workflows/ci-staging.yml +++ b/.github/workflows/ci-staging.yml @@ -17,7 +17,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] diff --git a/.github/workflows/ci-testing-deploy.yml b/.github/workflows/ci-testing-deploy.yml index f17e13b6b9f..5cea19bc9e4 100644 --- a/.github/workflows/ci-testing-deploy.yml +++ b/.github/workflows/ci-testing-deploy.yml @@ -39,7 +39,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -80,7 +80,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -132,7 +132,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -182,7 +182,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -232,7 +232,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -269,7 +269,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -319,7 +319,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -375,7 +375,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -482,7 +482,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -538,7 +538,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -590,7 +590,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -640,7 +640,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -730,7 +730,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8, 3.9] + python: [3.9, 3.10] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -767,7 +767,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -818,7 +818,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -868,7 +868,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -918,7 +918,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -968,7 +968,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1018,7 +1018,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1068,7 +1068,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1119,7 +1119,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1185,7 +1185,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1251,7 +1251,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1317,7 +1317,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1386,7 +1386,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1452,7 +1452,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1505,7 +1505,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1558,7 +1558,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] node: [14] os: [ubuntu-20.04] docker_buildx: [v0.7.1] @@ -1632,7 +1632,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1756,7 +1756,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.8] + python: [3.9] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 135285e6ad1..43f241a1bef 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ # See https://pre-commit.com/hooks.html for more hooks exclude: "^.venv$|^.cache$|^.pytest_cache$" default_language_version: - python: python3.8 + python: python3.9 repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.2.0 diff --git a/mypy.ini b/mypy.ini index 1a2777bca8f..ab2add147bd 100644 --- a/mypy.ini +++ b/mypy.ini @@ -1,6 +1,6 @@ # Global options: [mypy] -python_version = 3.8 +python_version = 3.9 warn_return_any = True warn_unused_configs = True diff --git a/packages/dask-task-models-library/setup.py b/packages/dask-task-models-library/setup.py index b3ea8bcfe22..faf5d12b31e 100644 --- a/packages/dask-task-models-library/setup.py +++ b/packages/dask-task-models-library/setup.py @@ -38,13 +38,13 @@ def read_reqs(reqs_path: Path) -> Set[str]: version=Path(CURRENT_DIR / "VERSION").read_text().strip(), author="Sylvain Anderegg (sanderegg)", description="Core service library for simcore pydantic dask task models", - python_requires="~=3.8", + python_requires="~=3.9", classifiers=[ "Development Status :: 2 - Pre-Alpha", "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", "Natural Language :: English", - "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", ], long_description=Path(CURRENT_DIR / "README.md").read_text(), license="MIT license", diff --git a/packages/models-library/setup.py b/packages/models-library/setup.py index db2e4d39c08..d57014008d1 100644 --- a/packages/models-library/setup.py +++ b/packages/models-library/setup.py @@ -35,13 +35,13 @@ def read_reqs(reqs_path: Path) -> Set[str]: version=Path(CURRENT_DIR / "VERSION").read_text().strip(), author="Sylvain Anderegg (sanderegg)", description="Core service library for simcore pydantic models", - python_requires="~=3.8", + python_requires="~=3.9", classifiers=[ "Development Status :: 2 - Pre-Alpha", "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", "Natural Language :: English", - "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", ], long_description=Path(CURRENT_DIR / "README.md").read_text(), license="MIT license", diff --git a/packages/postgres-database/scripts/erd/Dockerfile b/packages/postgres-database/scripts/erd/Dockerfile index aa0281aa98a..a43612425b6 100644 --- a/packages/postgres-database/scripts/erd/Dockerfile +++ b/packages/postgres-database/scripts/erd/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION="3.8.10" +ARG PYTHON_VERSION="3.9.12" FROM python:${PYTHON_VERSION}-slim-buster as base RUN apt-get update \ @@ -22,7 +22,7 @@ RUN pip --no-cache-dir install --upgrade \ # devenv RUN pip install --no-cache-dir \ - pyparsing \ - pydot \ - eralchemy \ - sqlalchemy_schemadisplay + pyparsing \ + pydot \ + eralchemy \ + sqlalchemy_schemadisplay diff --git a/packages/postgres-database/scripts/erd/Makefile b/packages/postgres-database/scripts/erd/Makefile index a2b5221e27b..b896d82e56d 100644 --- a/packages/postgres-database/scripts/erd/Makefile +++ b/packages/postgres-database/scripts/erd/Makefile @@ -3,7 +3,7 @@ # .DEFAULT_GOAL := help -PYTHON_VERSION=3.8.10 +PYTHON_VERSION=3.9.12 # locations REPODIR := $(shell git rev-parse --show-toplevel) diff --git a/packages/postgres-database/setup.py b/packages/postgres-database/setup.py index 629584c0cc4..ece036714c0 100644 --- a/packages/postgres-database/setup.py +++ b/packages/postgres-database/setup.py @@ -42,7 +42,7 @@ def read_reqs(reqs_path: Path) -> Set[str]: "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", "Natural Language :: English", - "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", ], long_description=Path(CURRENT_DIR / "README.md").read_text(), license="MIT license", diff --git a/packages/service-integration/setup.py b/packages/service-integration/setup.py index b14667b372b..d1b6ceb6d0b 100644 --- a/packages/service-integration/setup.py +++ b/packages/service-integration/setup.py @@ -46,7 +46,7 @@ def read_reqs(reqs_path: Path) -> Set[str]: "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", "Natural Language :: English", - "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Framework :: Pytest", ], long_description=Path(CURRENT_DIR / "README.md").read_text(), diff --git a/packages/service-library/setup.py b/packages/service-library/setup.py index 25a4b48e96b..f9c63e55ea4 100644 --- a/packages/service-library/setup.py +++ b/packages/service-library/setup.py @@ -36,7 +36,7 @@ def read_reqs(reqs_path: Path) -> Set[str]: author="Pedro Crespo-Valero (pcrespov)", description="Core service library for simcore (or servicelib)", license="MIT license", - python_requires="~=3.8", + python_requires="~=3.9", install_requires=tuple(PROD_REQUIREMENTS), packages=find_packages(where="src"), package_dir={"": "src"}, diff --git a/packages/service-library/src/servicelib/aiohttp/monitoring.py b/packages/service-library/src/servicelib/aiohttp/monitoring.py index fa60ebcfef9..97dbe07f272 100644 --- a/packages/service-library/src/servicelib/aiohttp/monitoring.py +++ b/packages/service-library/src/servicelib/aiohttp/monitoring.py @@ -65,7 +65,7 @@ # process_max_fds 1.048576e+06 # # HELP python_info Python platform information # # TYPE python_info gauge -# python_info{implementation="CPython",major="3",minor="8",patchlevel="10",version="3.8.10"} 1.0 +# python_info{implementation="CPython",major="3",minor="8",patchlevel="10",version="3.9.12"} 1.0 # # HELP python_gc_objects_collected_total Objects collected during gc # # TYPE python_gc_objects_collected_total counter # python_gc_objects_collected_total{generation="0"} 7328.0 diff --git a/packages/settings-library/setup.py b/packages/settings-library/setup.py index ea6d9661458..ccaed78c4a9 100644 --- a/packages/settings-library/setup.py +++ b/packages/settings-library/setup.py @@ -46,7 +46,7 @@ def read_reqs(reqs_path: Path) -> Set[str]: "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", "Natural Language :: English", - "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", ], long_description=(CURRENT_DIR.resolve().parent / "README.md").read_text(), license="MIT license", diff --git a/requirements/tools/Dockerfile b/requirements/tools/Dockerfile index 2d61565a437..015bef0ccc7 100644 --- a/requirements/tools/Dockerfile +++ b/requirements/tools/Dockerfile @@ -7,7 +7,7 @@ # - Can be installed with pyenv (SEE pyenv install --list ) # # -ARG PYTHON_VERSION="3.8.10" +ARG PYTHON_VERSION="3.9.12" FROM python:${PYTHON_VERSION}-slim-buster as base diff --git a/requirements/tools/Makefile b/requirements/tools/Makefile index 9f9c10d3c6b..35e2d1a3ac5 100644 --- a/requirements/tools/Makefile +++ b/requirements/tools/Makefile @@ -14,7 +14,7 @@ # .DEFAULT_GOAL := help -PYTHON_VERSION=3.8.10 +PYTHON_VERSION=3.9.12 # locations REPODIR := $(shell git rev-parse --show-toplevel) diff --git a/scripts/mypy.bash b/scripts/mypy.bash index 5fb38ceae15..1e43d3947cb 100755 --- a/scripts/mypy.bash +++ b/scripts/mypy.bash @@ -10,7 +10,7 @@ image_name="$(basename "$0"):latest" # FIXME: current version of mypy is pinned to 0.910 because 0.920 fails with pydantic plugin docker buildx build --tag "$image_name" - &>/dev/null < /dev/null && pwd ) -PYTHON_VERSION=3.8.10 +PYTHON_VERSION=3.9.12 IMAGE_NAME="local/pydeps-devkit:${PYTHON_VERSION}" WORKDIR="$(pwd)" diff --git a/services/api-server/Dockerfile b/services/api-server/Dockerfile index 767408a630f..a474b7aa87c 100644 --- a/services/api-server/Dockerfile +++ b/services/api-server/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION="3.8.10" +ARG PYTHON_VERSION="3.9.12" FROM python:${PYTHON_VERSION}-slim-buster as base # # USAGE: diff --git a/services/api-server/setup.py b/services/api-server/setup.py index b40c203a3e0..53afcf1293e 100644 --- a/services/api-server/setup.py +++ b/services/api-server/setup.py @@ -48,7 +48,7 @@ def read_reqs(reqs_path: Path) -> Set[str]: description=DESCRIPTION, long_description=README, license="MIT license", - python_requires="~=3.8", + python_requires="~=3.9", packages=find_packages(where="src"), package_dir={ "": "src", diff --git a/services/catalog/Dockerfile b/services/catalog/Dockerfile index 6de4e932dfa..e46da072d8c 100644 --- a/services/catalog/Dockerfile +++ b/services/catalog/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION="3.8.10" +ARG PYTHON_VERSION="3.9.12" FROM python:${PYTHON_VERSION}-slim-buster as base # # @@ -20,17 +20,17 @@ RUN set -eux && \ # simcore-user uid=8004(scu) gid=8004(scu) groups=8004(scu) ENV SC_USER_ID=8004 \ - SC_USER_NAME=scu \ - SC_BUILD_TARGET=base \ - SC_BOOT_MODE=default + SC_USER_NAME=scu \ + SC_BUILD_TARGET=base \ + SC_BOOT_MODE=default RUN adduser \ - --uid ${SC_USER_ID} \ - --disabled-password \ - --gecos "" \ - --shell /bin/sh \ - --home /home/${SC_USER_NAME} \ - ${SC_USER_NAME} + --uid ${SC_USER_ID} \ + --disabled-password \ + --gecos "" \ + --shell /bin/sh \ + --home /home/${SC_USER_NAME} \ + ${SC_USER_NAME} # Sets utf-8 encoding for Python et al @@ -38,7 +38,7 @@ ENV LANG=C.UTF-8 # Turns off writing .pyc files; superfluous on an ephemeral container. ENV PYTHONDONTWRITEBYTECODE=1 \ - VIRTUAL_ENV=/home/scu/.venv + VIRTUAL_ENV=/home/scu/.venv # Ensures that the python and pip executables used in the image will be # those from our virtualenv. @@ -57,19 +57,19 @@ FROM base as build ENV SC_BUILD_TARGET=build RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - build-essential \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* + && apt-get install -y --no-install-recommends \ + build-essential \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* # NOTE: python virtualenv is used here such that installed # packages may be moved to production image easily by copying the venv RUN python -m venv "${VIRTUAL_ENV}" RUN pip install --no-cache-dir --upgrade \ - pip~=22.0 \ - wheel \ - setuptools + pip~=22.0 \ + wheel \ + setuptools WORKDIR /build @@ -95,7 +95,7 @@ COPY --chown=scu:scu services/catalog /build/services/catalog WORKDIR /build/services/catalog RUN pip3 --no-cache-dir install -r requirements/prod.txt &&\ - pip3 --no-cache-dir list -v + pip3 --no-cache-dir list -v # --------------------------Production stage ------------------- @@ -108,7 +108,7 @@ RUN pip3 --no-cache-dir install -r requirements/prod.txt &&\ FROM base as production ENV SC_BUILD_TARGET=production \ - SC_BOOT_MODE=production + SC_BOOT_MODE=production ENV PYTHONOPTIMIZE=TRUE @@ -123,10 +123,10 @@ RUN chmod +x services/catalog/docker/*.sh HEALTHCHECK --interval=30s \ - --timeout=20s \ - --start-period=30s \ - --retries=3 \ - CMD ["python3", "services/catalog/docker/healthcheck.py", "http://localhost:8000/"] + --timeout=20s \ + --start-period=30s \ + --retries=3 \ + CMD ["python3", "services/catalog/docker/healthcheck.py", "http://localhost:8000/"] ENTRYPOINT [ "/bin/sh", "services/catalog/docker/entrypoint.sh" ] CMD ["/bin/sh", "services/catalog/docker/boot.sh"] diff --git a/services/catalog/setup.py b/services/catalog/setup.py index 97287cf3769..d724da7744e 100644 --- a/services/catalog/setup.py +++ b/services/catalog/setup.py @@ -44,7 +44,7 @@ def read_reqs(reqs_path: Path) -> Set[str]: description="Manages and maintains a catalog of all published components (e.g. macro-algorithms, scripts, etc)", long_description=(CURRENT_DIR / "README.md").read_text(), license="MIT license", - python_requires="~=3.8", + python_requires="~=3.9", packages=find_packages(where="src"), package_dir={ "": "src", diff --git a/services/dask-sidecar/Dockerfile b/services/dask-sidecar/Dockerfile index 0335f5bf143..415ca7ace03 100644 --- a/services/dask-sidecar/Dockerfile +++ b/services/dask-sidecar/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG PYTHON_VERSION="3.8.10" +ARG PYTHON_VERSION="3.9.12" FROM --platform=${TARGETPLATFORM} python:${PYTHON_VERSION}-slim-buster as base ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/services/dask-sidecar/setup.py b/services/dask-sidecar/setup.py index bce17821090..ab1d750e06d 100644 --- a/services/dask-sidecar/setup.py +++ b/services/dask-sidecar/setup.py @@ -33,11 +33,11 @@ def read_reqs(reqs_path: Path) -> Set[str]: "Development Status :: 1 - Planning", "License :: OSI Approved :: MIT License", "Natural Language :: English", - "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", ], long_description=(CURRENT_DIR / "README.md").read_text(), license="MIT license", - python_requires="~=3.8", + python_requires="~=3.9", packages=find_packages(where="src"), package_dir={ "": "src", diff --git a/services/datcore-adapter/Dockerfile b/services/datcore-adapter/Dockerfile index 41203834b8a..5f838dcfb85 100644 --- a/services/datcore-adapter/Dockerfile +++ b/services/datcore-adapter/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION="3.8.10" +ARG PYTHON_VERSION="3.9.12" ARG PENNSIEVE_VERSION="0.3.5" FROM itisfoundation/pennsieve-agent:${PYTHON_VERSION}-${PENNSIEVE_VERSION} as pennsieve-agent FROM python:${PYTHON_VERSION}-slim-buster as base diff --git a/services/datcore-adapter/setup.py b/services/datcore-adapter/setup.py index 6511b1a2f77..7d31111d7a2 100644 --- a/services/datcore-adapter/setup.py +++ b/services/datcore-adapter/setup.py @@ -38,7 +38,7 @@ def read_reqs(reqs_path: Path) -> Set[str]: description="Interfaces with datcore storage", long_description=(CURRENT_DIR / "README.md").read_text(), license="MIT license", - python_requires="~=3.8", + python_requires="~=3.9", packages=find_packages(where="src"), package_dir={ "": "src", diff --git a/services/director-v2/Dockerfile b/services/director-v2/Dockerfile index 53ef964146f..9dd613e16f3 100644 --- a/services/director-v2/Dockerfile +++ b/services/director-v2/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION="3.8.10" +ARG PYTHON_VERSION="3.9.12" FROM python:${PYTHON_VERSION}-slim-buster as base # diff --git a/services/director-v2/setup.py b/services/director-v2/setup.py index 44e16da0a7d..62a2ac22210 100644 --- a/services/director-v2/setup.py +++ b/services/director-v2/setup.py @@ -48,7 +48,7 @@ def read_reqs(reqs_path: Path) -> Set[str]: description="Orchestrates the pipeline of services defined by the user", long_description=(CURRENT_DIR / "README.md").read_text(), license="MIT license", - python_requires="~=3.8", + python_requires="~=3.9", packages=find_packages(where="src"), package_dir={ "": "src", diff --git a/services/dynamic-sidecar/Dockerfile b/services/dynamic-sidecar/Dockerfile index e8c5db5c394..da7c8eed1d3 100644 --- a/services/dynamic-sidecar/Dockerfile +++ b/services/dynamic-sidecar/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION="3.8.10" +ARG PYTHON_VERSION="3.9.12" FROM python:${PYTHON_VERSION}-slim-buster as base # # USAGE: diff --git a/services/dynamic-sidecar/setup.py b/services/dynamic-sidecar/setup.py index cc9413df8c8..841105e82af 100644 --- a/services/dynamic-sidecar/setup.py +++ b/services/dynamic-sidecar/setup.py @@ -50,7 +50,7 @@ def read_reqs(reqs_path: Path) -> Set[str]: "": "src", }, include_package_data=True, - python_requires="~=3.8", + python_requires="~=3.9", PROD_REQUIREMENTS=PROD_REQUIREMENTS, TEST_REQUIREMENTS=TEST_REQUIREMENTS, setup_requires=["setuptools_scm"], diff --git a/services/migration/Dockerfile b/services/migration/Dockerfile index d11ed9b1aab..93950faa4ee 100644 --- a/services/migration/Dockerfile +++ b/services/migration/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION="3.8.10" +ARG PYTHON_VERSION="3.9.12" FROM python:${PYTHON_VERSION}-slim-buster as base LABEL maintainer=sanderegg @@ -33,8 +33,8 @@ FROM base as build RUN apt-get update \ && apt-get install -y --no-install-recommends \ - build-essential \ - git \ + build-essential \ + git \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/services/storage/Dockerfile b/services/storage/Dockerfile index 23dc88e2ea8..f44e37959b9 100644 --- a/services/storage/Dockerfile +++ b/services/storage/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION="3.8.10" +ARG PYTHON_VERSION="3.9.12" FROM python:${PYTHON_VERSION}-slim-buster as base # # USAGE: diff --git a/services/storage/setup.py b/services/storage/setup.py index 19fcf56bcdd..5f08ec64cb8 100644 --- a/services/storage/setup.py +++ b/services/storage/setup.py @@ -39,7 +39,7 @@ def read_reqs(reqs_path: Path) -> Set[str]: version=Path(CURRENT_DIR / "VERSION").read_text().strip(), description="Service to manage data storage in simcore", author="Manuel Guidon (mguidon)", - python_requires="~=3.8", + python_requires="~=3.9", packages=find_packages(where="src"), package_dir={"": "src"}, include_package_data=True, diff --git a/services/web/Dockerfile b/services/web/Dockerfile index c3f9ae13f23..bb6d0bf6223 100644 --- a/services/web/Dockerfile +++ b/services/web/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION="3.8.10" +ARG PYTHON_VERSION="3.9.12" FROM python:${PYTHON_VERSION}-slim-buster as base # # USAGE: diff --git a/services/web/server/setup.py b/services/web/server/setup.py index c0d60b02029..f853d999b0a 100644 --- a/services/web/server/setup.py +++ b/services/web/server/setup.py @@ -60,7 +60,7 @@ def read_reqs(reqs_path: Path) -> Set[str]: "simcore-service-webserver=simcore_service_webserver.__main__:main", ] }, - python_requires="~=3.8", + python_requires="~=3.9", install_requires=INSTALL_REQUIREMENTS, tests_require=TEST_REQUIREMENTS, setup_requires=["pytest-runner"], diff --git a/services/web/server/tests/unit/isolated/test_application_settings.py b/services/web/server/tests/unit/isolated/test_application_settings.py index 607786ae417..01427c85eb4 100644 --- a/services/web/server/tests/unit/isolated/test_application_settings.py +++ b/services/web/server/tests/unit/isolated/test_application_settings.py @@ -75,7 +75,7 @@ def mock_env_Dockerfile_build(monkeypatch): PYTHON_GET_PIP_SHA256=6123659241292b2147b58922b9ffe11dda66b39d52d8a6f3aa310bc1d60ea6f7 PYTHON_GET_PIP_URL=https://github.com/pypa/get-pip/raw/a1675ab6c2bd898ed82b1f58c486097f763c74a9/public/get-pip.py PYTHON_PIP_VERSION=21.1.3 - PYTHON_VERSION=3.8.10 + PYTHON_VERSION=3.9.12 PYTHONDONTWRITEBYTECODE=1 PYTHONOPTIMIZE=TRUE SC_BOOT_MODE=production From 2417f5610ba03b0991b3e52719e51afd0e0f7b7f Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Fri, 8 Apr 2022 09:58:00 +0200 Subject: [PATCH 02/13] upgraded packages to python 3.9.12 --- .../requirements/_base.txt | 13 ++------- .../requirements/_test.txt | 4 +-- .../requirements/_tools.txt | 4 +-- .../models-library/requirements/_base.txt | 2 +- .../models-library/requirements/_test.txt | 13 +-------- .../models-library/requirements/_tools.txt | 2 +- .../postgres-database/requirements/_base.txt | 12 +------- .../requirements/_migration.txt | 16 +---------- .../postgres-database/requirements/_test.txt | 2 +- .../postgres-database/requirements/_tools.txt | 2 +- .../requirements/_base.txt | 9 +----- .../requirements/_test.txt | 2 +- .../requirements/_tools.txt | 2 +- .../service-library/requirements/_aiohttp.txt | 2 +- .../service-library/requirements/_base.txt | 2 +- .../service-library/requirements/_fastapi.txt | 2 +- .../service-library/requirements/_test.txt | 2 +- .../service-library/requirements/_tools.txt | 2 +- .../settings-library/requirements/_base.txt | 2 +- .../settings-library/requirements/_test.txt | 2 +- .../settings-library/requirements/_tools.txt | 2 +- packages/simcore-sdk/requirements/_base.txt | 28 ++++++++----------- packages/simcore-sdk/requirements/_test.txt | 20 +++---------- packages/simcore-sdk/requirements/_tools.txt | 5 ++-- 24 files changed, 43 insertions(+), 109 deletions(-) diff --git a/packages/dask-task-models-library/requirements/_base.txt b/packages/dask-task-models-library/requirements/_base.txt index db03ed809b2..8b99f4106b5 100644 --- a/packages/dask-task-models-library/requirements/_base.txt +++ b/packages/dask-task-models-library/requirements/_base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in @@ -70,14 +70,7 @@ toolz==0.11.2 # partd tornado==6.1 # via distributed -typing-extensions==4.1.1 ; python_version < "3.9" - # via - # -r requirements/_base.in - # pydantic -urllib3==1.26.9 - # via - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # distributed +typing-extensions==4.1.1 + # via pydantic zict==2.1.0 # via distributed diff --git a/packages/dask-task-models-library/requirements/_test.txt b/packages/dask-task-models-library/requirements/_test.txt index 03d2a3de065..13f0d7a6c26 100644 --- a/packages/dask-task-models-library/requirements/_test.txt +++ b/packages/dask-task-models-library/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in @@ -126,7 +126,7 @@ tomli==2.0.1 # coverage # pylint # pytest -typing-extensions==4.1.1 ; python_version < "3.9" +typing-extensions==4.1.1 # via # -c requirements/_base.txt # astroid diff --git a/packages/dask-task-models-library/requirements/_tools.txt b/packages/dask-task-models-library/requirements/_tools.txt index 93d83caba28..10bc4284a10 100644 --- a/packages/dask-task-models-library/requirements/_tools.txt +++ b/packages/dask-task-models-library/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in @@ -59,7 +59,7 @@ tomli==2.0.1 # -c requirements/_test.txt # black # pep517 -typing-extensions==4.1.1 ; python_version < "3.9" +typing-extensions==4.1.1 # via # -c requirements/_base.txt # -c requirements/_test.txt diff --git a/packages/models-library/requirements/_base.txt b/packages/models-library/requirements/_base.txt index c41044042d5..c5a1189d8fa 100644 --- a/packages/models-library/requirements/_base.txt +++ b/packages/models-library/requirements/_base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in diff --git a/packages/models-library/requirements/_test.txt b/packages/models-library/requirements/_test.txt index e1712a0a5b4..cb65a1e28a7 100644 --- a/packages/models-library/requirements/_test.txt +++ b/packages/models-library/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in @@ -53,13 +53,6 @@ idna==3.3 # -c requirements/_base.txt # requests # yarl -importlib-metadata==4.11.3 - # via alembic -importlib-resources==5.6.0 ; python_version < "3.9" - # via - # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # alembic iniconfig==1.1.1 # via pytest isort==5.10.1 @@ -163,10 +156,6 @@ yarl==1.7.2 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in # aiohttp -zipp==3.7.0 - # via - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/packages/models-library/requirements/_tools.txt b/packages/models-library/requirements/_tools.txt index 9491b5e8616..e260e7e8c2d 100644 --- a/packages/models-library/requirements/_tools.txt +++ b/packages/models-library/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in diff --git a/packages/postgres-database/requirements/_base.txt b/packages/postgres-database/requirements/_base.txt index 31f788cec18..a6573dc16c4 100644 --- a/packages/postgres-database/requirements/_base.txt +++ b/packages/postgres-database/requirements/_base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in @@ -10,12 +10,6 @@ greenlet==1.1.2 # via sqlalchemy idna==3.3 # via yarl -importlib-metadata==4.11.3 - # via alembic -importlib-resources==5.6.0 ; python_version < "3.9" - # via - # -c requirements/../../../requirements/constraints.txt - # alembic mako==1.2.0 # via alembic markupsafe==2.1.1 @@ -31,7 +25,3 @@ sqlalchemy==1.4.32 # alembic yarl==1.7.2 # via -r requirements/_base.in -zipp==3.7.0 - # via - # importlib-metadata - # importlib-resources diff --git a/packages/postgres-database/requirements/_migration.txt b/packages/postgres-database/requirements/_migration.txt index d1de3266d98..b9a7f43710c 100644 --- a/packages/postgres-database/requirements/_migration.txt +++ b/packages/postgres-database/requirements/_migration.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_migration.txt --strip-extras requirements/_migration.in @@ -24,15 +24,6 @@ idna==3.3 # via # -c requirements/_base.txt # requests -importlib-metadata==4.11.3 - # via - # -c requirements/_base.txt - # alembic -importlib-resources==5.6.0 ; python_version < "3.9" - # via - # -c requirements/../../../requirements/constraints.txt - # -c requirements/_base.txt - # alembic mako==1.2.0 # via # -c requirements/_base.txt @@ -65,8 +56,3 @@ websocket-client==0.59.0 # via # -r requirements/_migration.in # docker -zipp==3.7.0 - # via - # -c requirements/_base.txt - # importlib-metadata - # importlib-resources diff --git a/packages/postgres-database/requirements/_test.txt b/packages/postgres-database/requirements/_test.txt index d6ec763aa06..5b4c7825a66 100644 --- a/packages/postgres-database/requirements/_test.txt +++ b/packages/postgres-database/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in diff --git a/packages/postgres-database/requirements/_tools.txt b/packages/postgres-database/requirements/_tools.txt index f4aa9c18a8f..4472fc2bd27 100644 --- a/packages/postgres-database/requirements/_tools.txt +++ b/packages/postgres-database/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in diff --git a/packages/service-integration/requirements/_base.txt b/packages/service-integration/requirements/_base.txt index ef31685845d..e207bbc02ac 100644 --- a/packages/service-integration/requirements/_base.txt +++ b/packages/service-integration/requirements/_base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in @@ -24,11 +24,6 @@ idna==3.3 # via # email-validator # requests -importlib-resources==5.6.0 ; python_version < "3.9" - # via - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # jsonschema iniconfig==1.1.1 # via pytest jsonschema==4.4.0 @@ -68,5 +63,3 @@ urllib3==1.26.9 # requests websocket-client==1.3.1 # via docker -zipp==3.7.0 - # via importlib-resources diff --git a/packages/service-integration/requirements/_test.txt b/packages/service-integration/requirements/_test.txt index 26b6e331d7e..71264119978 100644 --- a/packages/service-integration/requirements/_test.txt +++ b/packages/service-integration/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in diff --git a/packages/service-integration/requirements/_tools.txt b/packages/service-integration/requirements/_tools.txt index 2d696ecd44e..f6f68bf662b 100644 --- a/packages/service-integration/requirements/_tools.txt +++ b/packages/service-integration/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in diff --git a/packages/service-library/requirements/_aiohttp.txt b/packages/service-library/requirements/_aiohttp.txt index c1cff6fc0c8..4b0b11263ac 100644 --- a/packages/service-library/requirements/_aiohttp.txt +++ b/packages/service-library/requirements/_aiohttp.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_aiohttp.txt --strip-extras requirements/_aiohttp.in diff --git a/packages/service-library/requirements/_base.txt b/packages/service-library/requirements/_base.txt index 8d1e20be2a0..1813a46603a 100644 --- a/packages/service-library/requirements/_base.txt +++ b/packages/service-library/requirements/_base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in diff --git a/packages/service-library/requirements/_fastapi.txt b/packages/service-library/requirements/_fastapi.txt index 233ffac5aad..e1a98c6572d 100644 --- a/packages/service-library/requirements/_fastapi.txt +++ b/packages/service-library/requirements/_fastapi.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_fastapi.txt --strip-extras requirements/_fastapi.in diff --git a/packages/service-library/requirements/_test.txt b/packages/service-library/requirements/_test.txt index aa703a3816a..23d81440563 100644 --- a/packages/service-library/requirements/_test.txt +++ b/packages/service-library/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in diff --git a/packages/service-library/requirements/_tools.txt b/packages/service-library/requirements/_tools.txt index d662e08fe9b..42a0395baa2 100644 --- a/packages/service-library/requirements/_tools.txt +++ b/packages/service-library/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in diff --git a/packages/settings-library/requirements/_base.txt b/packages/settings-library/requirements/_base.txt index 5abac5573dd..32ad882418b 100644 --- a/packages/settings-library/requirements/_base.txt +++ b/packages/settings-library/requirements/_base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in diff --git a/packages/settings-library/requirements/_test.txt b/packages/settings-library/requirements/_test.txt index 1d8cefc54cd..b1ca18f7b8c 100644 --- a/packages/settings-library/requirements/_test.txt +++ b/packages/settings-library/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in diff --git a/packages/settings-library/requirements/_tools.txt b/packages/settings-library/requirements/_tools.txt index 758240a19a4..c90002b12d8 100644 --- a/packages/settings-library/requirements/_tools.txt +++ b/packages/settings-library/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in diff --git a/packages/simcore-sdk/requirements/_base.txt b/packages/simcore-sdk/requirements/_base.txt index 8440c070982..1ac1fa0c61a 100644 --- a/packages/simcore-sdk/requirements/_base.txt +++ b/packages/simcore-sdk/requirements/_base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in @@ -48,18 +48,10 @@ idna==3.3 # via # email-validator # yarl -importlib-metadata==4.11.3 - # via alembic -importlib-resources==5.6.0 ; python_version < "3.9" +jsonschema==3.2.0 # via - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # alembic - # jsonschema -jsonschema==4.4.0 - # via -r requirements/_base.in + # -c requirements/../../../packages/service-library/requirements/./constraints.txt + # -r requirements/_base.in mako==1.2.0 # via alembic markupsafe==2.1.1 @@ -89,13 +81,16 @@ pyparsing==3.0.7 # via packaging pyrsistent==0.18.1 # via jsonschema -pyyaml==6.0 +pyyaml==5.4.1 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt + # -c requirements/../../../packages/service-library/requirements/./constraints.txt # -c requirements/../../../requirements/constraints.txt # -r requirements/../../../packages/service-library/requirements/_base.in +six==1.16.0 + # via jsonschema sqlalchemy==1.4.32 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt @@ -119,7 +114,6 @@ yarl==1.7.2 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in # aiohttp -zipp==3.7.0 - # via - # importlib-metadata - # importlib-resources + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/packages/simcore-sdk/requirements/_test.txt b/packages/simcore-sdk/requirements/_test.txt index 30da1aa953b..25cebdaffeb 100644 --- a/packages/simcore-sdk/requirements/_test.txt +++ b/packages/simcore-sdk/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in @@ -75,15 +75,6 @@ idna==3.3 # -c requirements/_base.txt # requests # yarl -importlib-metadata==4.11.3 - # via - # -c requirements/_base.txt - # alembic -importlib-resources==5.6.0 ; python_version < "3.9" - # via - # -c requirements/../../../requirements/constraints.txt - # -c requirements/_base.txt - # alembic iniconfig==1.1.1 # via pytest isort==5.10.1 @@ -179,7 +170,9 @@ requests==2.27.1 # coveralls # docker six==1.16.0 - # via python-dateutil + # via + # -c requirements/_base.txt + # python-dateutil sqlalchemy==1.4.32 # via # -c requirements/../../../requirements/constraints.txt @@ -210,11 +203,6 @@ yarl==1.7.2 # via # -c requirements/_base.txt # aiohttp -zipp==3.7.0 - # via - # -c requirements/_base.txt - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/packages/simcore-sdk/requirements/_tools.txt b/packages/simcore-sdk/requirements/_tools.txt index 37f052cde2c..b52c3ba2620 100644 --- a/packages/simcore-sdk/requirements/_tools.txt +++ b/packages/simcore-sdk/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in @@ -42,13 +42,14 @@ platformdirs==2.5.1 # virtualenv pre-commit==2.17.0 # via -r requirements/../../../requirements/devenv.txt -pyyaml==6.0 +pyyaml==5.4.1 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # pre-commit six==1.16.0 # via + # -c requirements/_base.txt # -c requirements/_test.txt # virtualenv toml==0.10.2 From aa6bbe6334960bbb90d9d355a1696e0806a3a56e Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Fri, 8 Apr 2022 10:06:14 +0200 Subject: [PATCH 03/13] upgraded services to python 3.9.12 --- services/web/server/requirements/_base.txt | 17 +---------------- services/web/server/requirements/_test.txt | 16 +--------------- services/web/server/requirements/_tools.txt | 2 +- 3 files changed, 3 insertions(+), 32 deletions(-) diff --git a/services/web/server/requirements/_base.txt b/services/web/server/requirements/_base.txt index eb2bb354c71..aeface3c816 100644 --- a/services/web/server/requirements/_base.txt +++ b/services/web/server/requirements/_base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in @@ -109,17 +109,6 @@ idna==3.3 # via # email-validator # yarl -importlib-metadata==4.11.3 - # via alembic -importlib-resources==5.6.0 ; python_version < "3.9" - # via - # -c requirements/../../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../../packages/service-library/requirements/./../../../requirements/constraints.txt - # -c requirements/../../../../packages/settings-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../../requirements/constraints.txt - # alembic isodate==0.6.1 # via openapi-core jinja-app-loader==1.0.2 @@ -285,10 +274,6 @@ yarl==1.5.1 # aio-pika # aiohttp # aiormq -zipp==3.7.0 - # via - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/web/server/requirements/_test.txt b/services/web/server/requirements/_test.txt index baff264fc8d..0badc1e3031 100644 --- a/services/web/server/requirements/_test.txt +++ b/services/web/server/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in @@ -113,15 +113,6 @@ idna==3.3 # -c requirements/_base.txt # requests # yarl -importlib-metadata==4.11.3 - # via - # -c requirements/_base.txt - # alembic -importlib-resources==5.6.0 ; python_version < "3.9" - # via - # -c requirements/../../../../requirements/constraints.txt - # -c requirements/_base.txt - # alembic iniconfig==1.1.1 # via pytest isort==5.10.1 @@ -302,11 +293,6 @@ yarl==1.5.1 # via # -c requirements/_base.txt # aiohttp -zipp==3.7.0 - # via - # -c requirements/_base.txt - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/web/server/requirements/_tools.txt b/services/web/server/requirements/_tools.txt index 5caadaa7080..37237f9426d 100644 --- a/services/web/server/requirements/_tools.txt +++ b/services/web/server/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in From 4b143d2294d60400ca2ebd61316554e1b1a38e77 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Fri, 8 Apr 2022 10:06:50 +0200 Subject: [PATCH 04/13] upgraded services to python 3.9.12 --- services/api-server/requirements/_base.txt | 21 +------------- services/api-server/requirements/_test.txt | 17 +---------- services/api-server/requirements/_tools.txt | 2 +- services/catalog/requirements/_base.txt | 20 ++----------- services/catalog/requirements/_test.txt | 16 +--------- services/catalog/requirements/_tools.txt | 2 +- services/dask-sidecar/requirements/_base.txt | 5 ++-- .../requirements/_dask-complete.txt | 4 +-- .../requirements/_dask-distributed.txt | 2 +- .../dask-sidecar/requirements/_packages.txt | 8 ++--- services/dask-sidecar/requirements/_test.txt | 4 +-- services/dask-sidecar/requirements/_tools.txt | 4 +-- .../datcore-adapter/requirements/_base.txt | 3 +- .../datcore-adapter/requirements/_test.txt | 2 +- .../datcore-adapter/requirements/_tools.txt | 2 +- services/director-v2/requirements/_base.txt | 29 +++---------------- services/director-v2/requirements/_test.txt | 18 ++---------- services/director-v2/requirements/_tools.txt | 4 +-- .../dynamic-sidecar/requirements/_base.txt | 24 ++------------- .../dynamic-sidecar/requirements/_test.txt | 2 +- .../dynamic-sidecar/requirements/_tools.txt | 2 +- services/storage/requirements/_base.txt | 17 +---------- services/storage/requirements/_test.txt | 2 +- services/storage/requirements/_tools.txt | 2 +- 24 files changed, 41 insertions(+), 171 deletions(-) diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index 1d7b12c2d93..c9515df01b7 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in @@ -122,21 +122,6 @@ idna==3.3 # requests # rfc3986 # yarl -importlib-metadata==4.11.3 - # via alembic -importlib-resources==5.6.0 ; python_version < "3.9" - # via - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt - # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # alembic itsdangerous==2.1.2 # via fastapi jaeger-client==4.8.0 @@ -330,10 +315,6 @@ yarl==1.7.2 # -r requirements/../../../packages/postgres-database/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in # aiohttp -zipp==3.7.0 - # via - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/api-server/requirements/_test.txt b/services/api-server/requirements/_test.txt index d824b119d28..864fc3759db 100644 --- a/services/api-server/requirements/_test.txt +++ b/services/api-server/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in @@ -107,16 +107,6 @@ idna==3.3 # requests # rfc3986 # yarl -importlib-metadata==4.11.3 - # via - # -c requirements/_base.txt - # alembic -importlib-resources==5.6.0 ; python_version < "3.9" - # via - # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # -c requirements/_base.txt - # alembic iniconfig==1.1.1 # via pytest isort==5.10.1 @@ -272,11 +262,6 @@ yarl==1.7.2 # via # -c requirements/_base.txt # -r requirements/../../../packages/postgres-database/requirements/_base.in -zipp==3.7.0 - # via - # -c requirements/_base.txt - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/api-server/requirements/_tools.txt b/services/api-server/requirements/_tools.txt index 1082144eb5d..139612e1e88 100644 --- a/services/api-server/requirements/_tools.txt +++ b/services/api-server/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in diff --git a/services/catalog/requirements/_base.txt b/services/catalog/requirements/_base.txt index e4fc10e0481..b6906ed878a 100644 --- a/services/catalog/requirements/_base.txt +++ b/services/catalog/requirements/_base.txt @@ -1,12 +1,12 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in # aiocache==0.11.1 # via -r requirements/_base.in -aiodebug==1.1.2 +aiodebug==2.3.0 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -73,17 +73,6 @@ idna==2.10 # requests # rfc3986 # yarl -importlib-metadata==4.8.1 - # via alembic -importlib-resources==5.3.0 ; python_version < "3.9" - # via - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt - # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # alembic itsdangerous==1.1.0 # via fastapi jaeger-client==4.8.0 @@ -202,6 +191,7 @@ typer==0.4.1 # via -r requirements/../../../packages/settings-library/requirements/_base.in typing-extensions==3.10.0.2 # via + # aiodebug # aioredis # pydantic ujson==4.0.2 @@ -225,7 +215,3 @@ websockets==10.1 # via uvicorn yarl==1.6.3 # via -r requirements/../../../packages/postgres-database/requirements/_base.in -zipp==3.6.0 - # via - # importlib-metadata - # importlib-resources diff --git a/services/catalog/requirements/_test.txt b/services/catalog/requirements/_test.txt index 258c6289664..948698955d0 100644 --- a/services/catalog/requirements/_test.txt +++ b/services/catalog/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in @@ -116,15 +116,6 @@ idna==2.10 # requests # rfc3986 # yarl -importlib-metadata==4.8.1 - # via - # -c requirements/_base.txt - # alembic -importlib-resources==5.3.0 ; python_version < "3.9" - # via - # -c requirements/../../../requirements/constraints.txt - # -c requirements/_base.txt - # alembic iniconfig==1.1.1 # via pytest isort==5.10.1 @@ -276,11 +267,6 @@ yarl==1.6.3 # via # -c requirements/_base.txt # aiohttp -zipp==3.6.0 - # via - # -c requirements/_base.txt - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/catalog/requirements/_tools.txt b/services/catalog/requirements/_tools.txt index ca9db4a9e2f..e9d315d80b4 100644 --- a/services/catalog/requirements/_tools.txt +++ b/services/catalog/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in diff --git a/services/dask-sidecar/requirements/_base.txt b/services/dask-sidecar/requirements/_base.txt index 76f1f891a27..427ad5308e4 100644 --- a/services/dask-sidecar/requirements/_base.txt +++ b/services/dask-sidecar/requirements/_base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in @@ -285,9 +285,8 @@ traitlets==5.1.1 # nbclient # nbconvert # nbformat -typing-extensions==3.10.0.2 ; python_version < "3.9" +typing-extensions==3.10.0.2 # via - # -c requirements/../../../packages/dask-task-models-library/requirements/_base.in # aiodocker # async-timeout # bokeh diff --git a/services/dask-sidecar/requirements/_dask-complete.txt b/services/dask-sidecar/requirements/_dask-complete.txt index 922c92daea4..1b252bb47af 100644 --- a/services/dask-sidecar/requirements/_dask-complete.txt +++ b/services/dask-sidecar/requirements/_dask-complete.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_dask-complete.txt --strip-extras requirements/_dask-complete.in @@ -130,7 +130,7 @@ tornado==6.1 # -c requirements/./_base.txt # bokeh # distributed -typing-extensions==3.10.0.2 ; python_version < "3.9" +typing-extensions==3.10.0.2 # via # -c requirements/./_base.txt # bokeh diff --git a/services/dask-sidecar/requirements/_dask-distributed.txt b/services/dask-sidecar/requirements/_dask-distributed.txt index f19d60ece56..23bf37861f7 100644 --- a/services/dask-sidecar/requirements/_dask-distributed.txt +++ b/services/dask-sidecar/requirements/_dask-distributed.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_dask-distributed.txt --strip-extras requirements/_dask-distributed.in diff --git a/services/dask-sidecar/requirements/_packages.txt b/services/dask-sidecar/requirements/_packages.txt index da477352277..2e68956f8bc 100644 --- a/services/dask-sidecar/requirements/_packages.txt +++ b/services/dask-sidecar/requirements/_packages.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_packages.txt --strip-extras requirements/_packages.in # -aiodebug==1.1.2 +aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiofiles==0.8.0 # via @@ -139,10 +139,10 @@ tornado==6.1 # via # -c requirements/_base.txt # distributed -typing-extensions==3.10.0.2 ; python_version < "3.9" +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt - # -r requirements/../../../packages/dask-task-models-library/requirements/_base.in + # aiodebug # pydantic urllib3==1.26.7 # via diff --git a/services/dask-sidecar/requirements/_test.txt b/services/dask-sidecar/requirements/_test.txt index d8b3d5526ef..fc3a45cb093 100644 --- a/services/dask-sidecar/requirements/_test.txt +++ b/services/dask-sidecar/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in @@ -172,7 +172,7 @@ tomli==2.0.1 # coverage # pylint # pytest -typing-extensions==3.10.0.2 ; python_version < "3.9" +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # -c requirements/_packages.txt diff --git a/services/dask-sidecar/requirements/_tools.txt b/services/dask-sidecar/requirements/_tools.txt index a5702a61d38..dab014a5d4b 100644 --- a/services/dask-sidecar/requirements/_tools.txt +++ b/services/dask-sidecar/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in @@ -63,7 +63,7 @@ tomli==2.0.1 # -c requirements/_test.txt # black # pep517 -typing-extensions==3.10.0.2 ; python_version < "3.9" +typing-extensions==3.10.0.2 # via # -c requirements/_base.txt # -c requirements/_packages.txt diff --git a/services/datcore-adapter/requirements/_base.txt b/services/datcore-adapter/requirements/_base.txt index a3ad3e37e9f..e2765ffa80c 100644 --- a/services/datcore-adapter/requirements/_base.txt +++ b/services/datcore-adapter/requirements/_base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in @@ -155,6 +155,7 @@ rfc3986==1.5.0 # via httpx rsa==4.0 # via + # -r requirements/_base.in # pennsieve # python-jose s3transfer==0.5.2 diff --git a/services/datcore-adapter/requirements/_test.txt b/services/datcore-adapter/requirements/_test.txt index 53849a72f68..12a7e2eb477 100644 --- a/services/datcore-adapter/requirements/_test.txt +++ b/services/datcore-adapter/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in diff --git a/services/datcore-adapter/requirements/_tools.txt b/services/datcore-adapter/requirements/_tools.txt index a040f34b7aa..eea5f59431d 100644 --- a/services/datcore-adapter/requirements/_tools.txt +++ b/services/datcore-adapter/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in diff --git a/services/director-v2/requirements/_base.txt b/services/director-v2/requirements/_base.txt index 5f69cbffb41..327513ea865 100644 --- a/services/director-v2/requirements/_base.txt +++ b/services/director-v2/requirements/_base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in @@ -8,7 +8,7 @@ aio-pika==6.8.0 # via -r requirements/_base.in aiocache==0.11.1 # via -r requirements/_base.in -aiodebug==1.1.2 +aiodebug==2.3.0 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -153,23 +153,6 @@ idna==2.10 # requests # rfc3986 # yarl -importlib-metadata==4.8.1 - # via alembic -importlib-resources==5.3.0 ; python_version < "3.9" - # via - # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/dask-task-models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt - # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # alembic itsdangerous==1.1.0 # via fastapi jaeger-client==4.8.0 @@ -388,9 +371,9 @@ tqdm==4.62.3 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in typer==0.4.1 # via -r requirements/../../../packages/settings-library/requirements/_base.in -typing-extensions==4.1.1 ; python_version < "3.9" +typing-extensions==4.1.1 # via - # -r requirements/../../../packages/dask-task-models-library/requirements/_base.in + # aiodebug # aiodocker # aioredis # pydantic @@ -432,10 +415,6 @@ zict==2.0.0 # via # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # distributed -zipp==3.6.0 - # via - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/director-v2/requirements/_test.txt b/services/director-v2/requirements/_test.txt index 579e1068c72..b3414eadbf0 100644 --- a/services/director-v2/requirements/_test.txt +++ b/services/director-v2/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in @@ -158,15 +158,6 @@ idna==2.10 # requests # rfc3986 # yarl -importlib-metadata==4.8.1 - # via - # -c requirements/_base.txt - # alembic -importlib-resources==5.3.0 ; python_version < "3.9" - # via - # -c requirements/../../../requirements/constraints.txt - # -c requirements/_base.txt - # alembic iniconfig==1.1.1 # via pytest isort==5.10.1 @@ -345,7 +336,7 @@ tornado==6.1 # bokeh traitlets==5.1.1 # via dask-gateway-server -typing-extensions==4.1.1 ; python_version < "3.9" +typing-extensions==4.1.1 # via # -c requirements/_base.txt # aioitertools @@ -373,11 +364,6 @@ yarl==1.7.2 # aio-pika # aiohttp # aiormq -zipp==3.6.0 - # via - # -c requirements/_base.txt - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/director-v2/requirements/_tools.txt b/services/director-v2/requirements/_tools.txt index cf7b63279a2..e6539efa833 100644 --- a/services/director-v2/requirements/_tools.txt +++ b/services/director-v2/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in @@ -61,7 +61,7 @@ tomli==2.0.1 # -c requirements/_test.txt # black # pep517 -typing-extensions==4.1.1 ; python_version < "3.9" +typing-extensions==4.1.1 # via # -c requirements/_base.txt # -c requirements/_test.txt diff --git a/services/dynamic-sidecar/requirements/_base.txt b/services/dynamic-sidecar/requirements/_base.txt index 8d49ebbfffc..ce2cd88a7ca 100644 --- a/services/dynamic-sidecar/requirements/_base.txt +++ b/services/dynamic-sidecar/requirements/_base.txt @@ -1,12 +1,12 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in # aio-pika==6.8.0 # via -r requirements/_base.in -aiodebug==1.1.2 +aiodebug==2.3.0 # via # -c requirements/../../../packages/service-library/requirements/./_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -152,21 +152,6 @@ idna==2.10 # requests # rfc3986 # yarl -importlib-metadata==4.8.1 - # via alembic -importlib-resources==5.3.0 ; python_version < "3.9" - # via - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt - # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # alembic jaeger-client==4.8.0 # via fastapi-contrib jsonschema==3.2.0 @@ -315,6 +300,7 @@ typer==0.4.1 # via -r requirements/../../../packages/settings-library/requirements/_base.in typing-extensions==3.10.0.2 # via + # aiodebug # aiodocker # pydantic urllib3==1.26.6 @@ -345,10 +331,6 @@ yarl==1.6.3 # aio-pika # aiohttp # aiormq -zipp==3.6.0 - # via - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/dynamic-sidecar/requirements/_test.txt b/services/dynamic-sidecar/requirements/_test.txt index 12fb340d197..e57a56b7df2 100644 --- a/services/dynamic-sidecar/requirements/_test.txt +++ b/services/dynamic-sidecar/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in diff --git a/services/dynamic-sidecar/requirements/_tools.txt b/services/dynamic-sidecar/requirements/_tools.txt index 398a445e82a..84be5d1d8de 100644 --- a/services/dynamic-sidecar/requirements/_tools.txt +++ b/services/dynamic-sidecar/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in diff --git a/services/storage/requirements/_base.txt b/services/storage/requirements/_base.txt index b254ad238a8..aaee1263120 100644 --- a/services/storage/requirements/_base.txt +++ b/services/storage/requirements/_base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in @@ -76,17 +76,6 @@ idna==3.3 # via # email-validator # yarl -importlib-metadata==4.11.3 - # via alembic -importlib-resources==5.6.0 ; python_version < "3.9" - # via - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/./../../../requirements/constraints.txt - # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # alembic isodate==0.6.1 # via openapi-core jinja2==3.1.1 @@ -231,10 +220,6 @@ yarl==1.7.2 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in # aiohttp -zipp==3.7.0 - # via - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/services/storage/requirements/_test.txt b/services/storage/requirements/_test.txt index 85e4a94e3fa..61498709ada 100644 --- a/services/storage/requirements/_test.txt +++ b/services/storage/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in diff --git a/services/storage/requirements/_tools.txt b/services/storage/requirements/_tools.txt index c0e6045f410..ac51c87e26c 100644 --- a/services/storage/requirements/_tools.txt +++ b/services/storage/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in From fafaba30d3ce36f11bc98fdf8d1af2b8aba021cb Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Fri, 8 Apr 2022 10:18:25 +0200 Subject: [PATCH 05/13] upgraded to python 3.9.12 --- api/tests/requirements.txt | 8 +------ ci/helpers/requirements.txt | 12 +++++----- requirements/PYTHON_VERSION | 2 +- .../maintenance/migrate_project/Dockerfile | 5 ++-- tests/e2e/requirements/requirements.txt | 4 ++-- .../requirements/requirements.txt | 2 +- tests/public-api/requirements/_test.txt | 8 +------ tests/public-api/requirements/_tools.txt | 2 +- tests/swarm-deploy/requirements/_test.txt | 23 +------------------ tests/swarm-deploy/requirements/_tools.txt | 2 +- 10 files changed, 17 insertions(+), 51 deletions(-) diff --git a/api/tests/requirements.txt b/api/tests/requirements.txt index 31111ef18b4..b020a238824 100644 --- a/api/tests/requirements.txt +++ b/api/tests/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements.txt requirements.in @@ -33,10 +33,6 @@ frozenlist==1.3.0 # aiosignal idna==3.3 # via yarl -importlib-resources==5.6.0 ; python_version < "3.9" - # via - # -c ../../requirements/constraints.txt - # jsonschema iniconfig==1.1.1 # via pytest isodate==0.6.1 @@ -111,8 +107,6 @@ werkzeug==2.0.3 # via openapi-core yarl==1.7.2 # via aiohttp -zipp==3.7.0 - # via importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/ci/helpers/requirements.txt b/ci/helpers/requirements.txt index 1910bf8a82f..aa5c8fc2d3e 100644 --- a/ci/helpers/requirements.txt +++ b/ci/helpers/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements.txt requirements.in @@ -16,13 +16,13 @@ attrs==21.4.0 # via aiohttp certifi==2021.10.8 # via requests -charset-normalizer==2.0.11 +charset-normalizer==2.0.12 # via # aiohttp # requests docker==5.0.3 # via -r requirements.in -fastapi==0.73.0 +fastapi==0.75.1 # via -r requirements.in frozenlist==1.3.0 # via @@ -47,11 +47,11 @@ sniffio==1.2.0 # via anyio starlette==0.17.1 # via fastapi -typing-extensions==4.0.1 +typing-extensions==4.1.1 # via pydantic -urllib3==1.26.8 +urllib3==1.26.9 # via requests -websocket-client==1.2.3 +websocket-client==1.3.2 # via docker yarl==1.7.2 # via aiohttp diff --git a/requirements/PYTHON_VERSION b/requirements/PYTHON_VERSION index cc1923a40b1..bd28b9c5c27 100644 --- a/requirements/PYTHON_VERSION +++ b/requirements/PYTHON_VERSION @@ -1 +1 @@ -3.8 +3.9 diff --git a/scripts/maintenance/migrate_project/Dockerfile b/scripts/maintenance/migrate_project/Dockerfile index b75b086363c..425538a316e 100644 --- a/scripts/maintenance/migrate_project/Dockerfile +++ b/scripts/maintenance/migrate_project/Dockerfile @@ -1,7 +1,7 @@ -FROM python:3.8.12-buster +FROM python:3.9.12-buster RUN curl https://rclone.org/install.sh | bash && \ - rclone --version + rclone --version WORKDIR /scripts @@ -12,4 +12,3 @@ COPY scripts/maintenance/migrate_project/requirements.txt /scripts/requirements. RUN pip install -r /scripts/requirements.txt COPY scripts/maintenance/migrate_project/src/*.py /scripts/ - diff --git a/tests/e2e/requirements/requirements.txt b/tests/e2e/requirements/requirements.txt index 06814106735..f3a7b3acf87 100644 --- a/tests/e2e/requirements/requirements.txt +++ b/tests/e2e/requirements/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements.txt requirements.in @@ -24,5 +24,5 @@ urllib3==1.26.9 # via # -c ../../../requirements/constraints.txt # requests -websocket-client==1.3.1 +websocket-client==1.3.2 # via docker diff --git a/tests/environment-setup/requirements/requirements.txt b/tests/environment-setup/requirements/requirements.txt index 1808a881f2f..7c429bcdd56 100644 --- a/tests/environment-setup/requirements/requirements.txt +++ b/tests/environment-setup/requirements/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/requirements.txt --strip-extras requirements/requirements.in diff --git a/tests/public-api/requirements/_test.txt b/tests/public-api/requirements/_test.txt index d131f5c5d6c..0401282ce52 100644 --- a/tests/public-api/requirements/_test.txt +++ b/tests/public-api/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in @@ -51,10 +51,6 @@ idna==3.3 # requests # rfc3986 # yarl -importlib-resources==5.6.0 ; python_version < "3.9" - # via - # -c requirements/../../../requirements/constraints.txt - # jsonschema iniconfig==1.1.1 # via pytest jsonschema==4.4.0 @@ -115,5 +111,3 @@ websocket-client==1.3.1 # via docker yarl==1.7.2 # via aiohttp -zipp==3.7.0 - # via importlib-resources diff --git a/tests/public-api/requirements/_tools.txt b/tests/public-api/requirements/_tools.txt index 849ab8be667..8d1e52be4a8 100644 --- a/tests/public-api/requirements/_tools.txt +++ b/tests/public-api/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in diff --git a/tests/swarm-deploy/requirements/_test.txt b/tests/swarm-deploy/requirements/_test.txt index d165fb263e6..d7f10280908 100644 --- a/tests/swarm-deploy/requirements/_test.txt +++ b/tests/swarm-deploy/requirements/_test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in @@ -93,22 +93,6 @@ idna==3.3 # email-validator # requests # yarl -importlib-metadata==4.11.3 - # via - # -r requirements/../../../packages/postgres-database/requirements/_migration.txt - # alembic -importlib-resources==5.6.0 ; python_version < "3.9" - # via - # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt - # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt - # -c requirements/../../../requirements/constraints.txt - # -r requirements/../../../packages/postgres-database/requirements/_migration.txt - # alembic iniconfig==1.1.1 # via pytest jsonschema==3.2.0 @@ -288,11 +272,6 @@ yarl==1.7.2 # aio-pika # aiohttp # aiormq -zipp==3.7.0 - # via - # -r requirements/../../../packages/postgres-database/requirements/_migration.txt - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/tests/swarm-deploy/requirements/_tools.txt b/tests/swarm-deploy/requirements/_tools.txt index 6c0c8313974..9037f74a422 100644 --- a/tests/swarm-deploy/requirements/_tools.txt +++ b/tests/swarm-deploy/requirements/_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in From 6c5b9c8cad2b408b82bf9bb209ea2f29db8b2f70 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Fri, 8 Apr 2022 10:23:08 +0200 Subject: [PATCH 06/13] fix definition of version as a string --- .github/workflows/ci-release.yml | 2 +- .github/workflows/ci-staging.yml | 2 +- .github/workflows/ci-testing-deploy.yml | 60 ++++++++++++------------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index b9cde4d219c..1cb3ddb4ce7 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -17,7 +17,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] diff --git a/.github/workflows/ci-staging.yml b/.github/workflows/ci-staging.yml index 2520ac21e98..e91e660f89f 100644 --- a/.github/workflows/ci-staging.yml +++ b/.github/workflows/ci-staging.yml @@ -17,7 +17,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] diff --git a/.github/workflows/ci-testing-deploy.yml b/.github/workflows/ci-testing-deploy.yml index 5cea19bc9e4..6d89ffb7b7e 100644 --- a/.github/workflows/ci-testing-deploy.yml +++ b/.github/workflows/ci-testing-deploy.yml @@ -39,7 +39,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -80,7 +80,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -132,7 +132,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -182,7 +182,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -232,7 +232,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -269,7 +269,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -319,7 +319,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -375,7 +375,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -482,7 +482,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -538,7 +538,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -590,7 +590,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -640,7 +640,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -730,7 +730,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9, 3.10] + python: ["3.9", "3.10"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -767,7 +767,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -818,7 +818,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -868,7 +868,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -918,7 +918,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -968,7 +968,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1018,7 +1018,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1068,7 +1068,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1119,7 +1119,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1185,7 +1185,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1251,7 +1251,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1317,7 +1317,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1386,7 +1386,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1452,7 +1452,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1505,7 +1505,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1558,7 +1558,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] node: [14] os: [ubuntu-20.04] docker_buildx: [v0.7.1] @@ -1632,7 +1632,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] @@ -1756,7 +1756,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python: [3.9] + python: ["3.9"] os: [ubuntu-20.04] docker_buildx: [v0.7.1] docker_compose: [1.29.1] From accf5817b586835b81d7d4bbe9b65c3245a84860 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Fri, 8 Apr 2022 10:40:16 +0200 Subject: [PATCH 07/13] keep the same pennsieve agent --- services/datcore-adapter/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/datcore-adapter/Dockerfile b/services/datcore-adapter/Dockerfile index 5f838dcfb85..41203834b8a 100644 --- a/services/datcore-adapter/Dockerfile +++ b/services/datcore-adapter/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION="3.9.12" +ARG PYTHON_VERSION="3.8.10" ARG PENNSIEVE_VERSION="0.3.5" FROM itisfoundation/pennsieve-agent:${PYTHON_VERSION}-${PENNSIEVE_VERSION} as pennsieve-agent FROM python:${PYTHON_VERSION}-slim-buster as base From 07f0600d59f269fab8483cbe0ce2d108b0297acb Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Fri, 8 Apr 2022 10:44:54 +0200 Subject: [PATCH 08/13] use python 3.9 importlib --- services/api-server/tests/unit/fakes/solvers_faker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/api-server/tests/unit/fakes/solvers_faker.py b/services/api-server/tests/unit/fakes/solvers_faker.py index 4a078f7fdc9..f505b043730 100644 --- a/services/api-server/tests/unit/fakes/solvers_faker.py +++ b/services/api-server/tests/unit/fakes/solvers_faker.py @@ -1,11 +1,11 @@ from dataclasses import dataclass +from importlib.resources import files from pathlib import Path from typing import Callable, Dict, Iterator, Tuple import packaging.version import yaml from fastapi import HTTPException, status -from importlib_resources import files from models_library.services import ServiceDockerData from simcore_service_api_server.models.schemas.solvers import ( LATEST_VERSION, From c4bd4aa11a5ff7f26232fb3c5103f5c4140a4315 Mon Sep 17 00:00:00 2001 From: Sylvain <35365065+sanderegg@users.noreply.github.com> Date: Fri, 8 Apr 2022 13:15:13 +0200 Subject: [PATCH 09/13] fix version of pennsieve-agent --- services/datcore-adapter/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/datcore-adapter/Dockerfile b/services/datcore-adapter/Dockerfile index 41203834b8a..b111664e784 100644 --- a/services/datcore-adapter/Dockerfile +++ b/services/datcore-adapter/Dockerfile @@ -1,6 +1,6 @@ -ARG PYTHON_VERSION="3.8.10" +ARG PYTHON_VERSION="3.9.12" ARG PENNSIEVE_VERSION="0.3.5" -FROM itisfoundation/pennsieve-agent:${PYTHON_VERSION}-${PENNSIEVE_VERSION} as pennsieve-agent +FROM itisfoundation/pennsieve-agent:3.8.10-${PENNSIEVE_VERSION} as pennsieve-agent FROM python:${PYTHON_VERSION}-slim-buster as base # From 02fbf2226fd74d7a421b28f8efaab7b9cfd67ac4 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Fri, 8 Apr 2022 16:50:44 +0200 Subject: [PATCH 10/13] linter python 3.10 --- .../servicelib/aiohttp/application_setup.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/packages/service-library/src/servicelib/aiohttp/application_setup.py b/packages/service-library/src/servicelib/aiohttp/application_setup.py index 57ef142b462..1fcea5e4084 100644 --- a/packages/service-library/src/servicelib/aiohttp/application_setup.py +++ b/packages/service-library/src/servicelib/aiohttp/application_setup.py @@ -3,7 +3,6 @@ import logging from copy import deepcopy from datetime import datetime -from distutils.util import strtobool from enum import Enum from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, TypedDict @@ -16,6 +15,22 @@ APP_SETUP_COMPLETED_KEY = f"{__name__ }.setup" +def strtobool(val): + # distutils.util is deprecated in python 3.10 so the fct strtobool was copied here for convenience + """Convert a string representation of truth to true (1) or false (0). + True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values + are 'n', 'no', 'f', 'false', 'off', and '0'. Raises ValueError if + 'val' is anything else. + """ + val = val.lower() + if val in ("y", "yes", "t", "true", "on", "1"): + return 1 + elif val in ("n", "no", "f", "false", "off", "0"): + return 0 + else: + raise ValueError("invalid truth value %r" % (val,)) + + class _SetupFunc(Protocol): __name__: str @@ -89,7 +104,7 @@ def _is_addon_enabled_from_config( for part in parts: if section and part == "enabled": # if section exists, no need to explicitly enable it - return strtobool(f"{searched_config.get(part, True)}") + return bool(strtobool(f"{searched_config.get(part, True)}")) searched_config = searched_config[part] except KeyError as ee: From 98a53d2f3aa787a585b0f8b74e6871aebbad4232 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Fri, 8 Apr 2022 17:26:15 +0200 Subject: [PATCH 11/13] distutils is deprecated in 3.10 --- .../src/pytest_simcore/minio_service.py | 4 ++-- .../servicelib/aiohttp/application_setup.py | 19 ++----------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/packages/pytest-simcore/src/pytest_simcore/minio_service.py b/packages/pytest-simcore/src/pytest_simcore/minio_service.py index 0a4ab9932de..57ec53c1f44 100644 --- a/packages/pytest-simcore/src/pytest_simcore/minio_service.py +++ b/packages/pytest-simcore/src/pytest_simcore/minio_service.py @@ -3,7 +3,6 @@ # pylint: disable=unused-variable import logging -from distutils.util import strtobool from typing import Dict, Iterator import pytest @@ -12,6 +11,7 @@ from minio import Minio from minio.datatypes import Object from minio.deleteobjects import DeleteError, DeleteObject +from pydantic import parse_obj_as from tenacity import Retrying from .helpers.utils_docker import get_localhost_ip, get_service_published_port @@ -50,7 +50,7 @@ def minio_config( "endpoint": f"{get_localhost_ip()}:{get_service_published_port('minio')}", "access_key": testing_environ_vars["S3_ACCESS_KEY"], "secret_key": testing_environ_vars["S3_SECRET_KEY"], - "secure": strtobool(testing_environ_vars["S3_SECURE"]) != 0, + "secure": parse_obj_as(bool, testing_environ_vars["S3_SECURE"]), }, "bucket_name": testing_environ_vars["S3_BUCKET_NAME"], } diff --git a/packages/service-library/src/servicelib/aiohttp/application_setup.py b/packages/service-library/src/servicelib/aiohttp/application_setup.py index 1fcea5e4084..8914dcb4194 100644 --- a/packages/service-library/src/servicelib/aiohttp/application_setup.py +++ b/packages/service-library/src/servicelib/aiohttp/application_setup.py @@ -7,6 +7,7 @@ from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, TypedDict from aiohttp import web +from pydantic import parse_obj_as from .application_keys import APP_CONFIG_KEY, APP_SETTINGS_KEY @@ -15,22 +16,6 @@ APP_SETUP_COMPLETED_KEY = f"{__name__ }.setup" -def strtobool(val): - # distutils.util is deprecated in python 3.10 so the fct strtobool was copied here for convenience - """Convert a string representation of truth to true (1) or false (0). - True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values - are 'n', 'no', 'f', 'false', 'off', and '0'. Raises ValueError if - 'val' is anything else. - """ - val = val.lower() - if val in ("y", "yes", "t", "true", "on", "1"): - return 1 - elif val in ("n", "no", "f", "false", "off", "0"): - return 0 - else: - raise ValueError("invalid truth value %r" % (val,)) - - class _SetupFunc(Protocol): __name__: str @@ -104,7 +89,7 @@ def _is_addon_enabled_from_config( for part in parts: if section and part == "enabled": # if section exists, no need to explicitly enable it - return bool(strtobool(f"{searched_config.get(part, True)}")) + return parse_obj_as(bool, f"{searched_config.get(part, True)}") searched_config = searched_config[part] except KeyError as ee: From ed6d37f24066b3d3fc65ba1c381d65fabf758449 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Fri, 8 Apr 2022 17:37:14 +0200 Subject: [PATCH 12/13] skip director-v0 --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index b6824c92797..5c436811c33 100644 --- a/Makefile +++ b/Makefile @@ -425,6 +425,7 @@ pylint: ## Runs python linter framework's wide -not -path "*generated_code*" \ -not -path "*build*" \ -not -path "*datcore.py" \ + -not -path "*/director/*" \ -not -path "*web/server*"))" # See exit codes and command line https://pylint.readthedocs.io/en/latest/user_guide/run.html#exit-codes From cbf3ad6c221248be3ac8b8ba80981d39325a0bd4 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Fri, 8 Apr 2022 18:54:36 +0200 Subject: [PATCH 13/13] @pcrespov review: no need to convert to string --- .../service-library/src/servicelib/aiohttp/application_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/service-library/src/servicelib/aiohttp/application_setup.py b/packages/service-library/src/servicelib/aiohttp/application_setup.py index 8914dcb4194..a6865c7b062 100644 --- a/packages/service-library/src/servicelib/aiohttp/application_setup.py +++ b/packages/service-library/src/servicelib/aiohttp/application_setup.py @@ -89,7 +89,7 @@ def _is_addon_enabled_from_config( for part in parts: if section and part == "enabled": # if section exists, no need to explicitly enable it - return parse_obj_as(bool, f"{searched_config.get(part, True)}") + return parse_obj_as(bool, searched_config.get(part, True)) searched_config = searched_config[part] except KeyError as ee: