From ee876f3801de7195f430e69bfea87830c75c3b0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 19:57:56 +0000 Subject: [PATCH 1/2] Bump shortuuid from 1.0.4 to 1.0.5 Bumps [shortuuid](https://github.com/skorokithakis/shortuuid) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/skorokithakis/shortuuid/releases) - [Changelog](https://github.com/skorokithakis/shortuuid/blob/master/CHANGELOG.md) - [Commits](https://github.com/skorokithakis/shortuuid/compare/v1.0.4...v1.0.5) --- updated-dependencies: - dependency-name: shortuuid dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2da69cb..4ab7649 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ amqpstorm==2.10.3 jsonschema==4.2.1 httpx==0.20.0 -shortuuid==1.0.4 +shortuuid==1.0.5 From e47fdf57ef00c26c5d7d1e0a83fff065697ce10d Mon Sep 17 00:00:00 2001 From: Stefan Negru Date: Mon, 8 Nov 2021 22:10:34 +0200 Subject: [PATCH 2/2] switch to 3.8 support --- .github/workflows/style.yml | 2 +- .github/workflows/unit.yml | 8 ++++---- Dockerfile | 6 +++--- setup.py | 2 +- tox.ini | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 2e72508..32ccc89 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -8,7 +8,7 @@ jobs: max-parallel: 4 matrix: os: [ubuntu-latest] - python-version: [3.7] + python-version: [3.8] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index fd65ff6..3e2e334 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -8,7 +8,7 @@ jobs: max-parallel: 4 matrix: os: [ubuntu-latest] - python-version: [3.7] + python-version: [3.8] runs-on: ${{ matrix.os }} @@ -26,8 +26,8 @@ jobs: run: | python -m pip install --upgrade pip pip install tox tox-gh-actions - - name: Run unit tests for python 3.7 - if: ${{ matrix.python-version == '3.7' }} + - name: Run unit tests for python 3.8 + if: ${{ matrix.python-version == '3.8' }} # env: # COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - run: tox -e py37 + run: tox -e py38 diff --git a/Dockerfile b/Dockerfile index f3781ab..f08c54c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.7-alpine3.12 as BUILD +FROM python:3.8-alpine3.12 as BUILD RUN apk add --no-cache git gcc musl-dev libffi-dev make gnupg && \ rm -rf /var/cache/apk/* @@ -11,14 +11,14 @@ RUN pip install --upgrade pip && \ pip install -r /root/sdaorch/requirements.txt && \ pip install /root/sdaorch -FROM python:3.7-alpine3.12 +FROM python:3.8-alpine3.12 LABEL maintainer "NeIC System Developers" LABEL org.label-schema.schema-version="1.0" RUN apk add --no-cache --update supervisor -COPY --from=BUILD /usr/local/lib/python3.7/ usr/local/lib/python3.7/ +COPY --from=BUILD /usr/local/lib/python3.8/ usr/local/lib/python3.8/ COPY --from=BUILD /usr/local/bin/sdainbox /usr/local/bin/ diff --git a/setup.py b/setup.py index fc5d128..91948ac 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ "Intended Audience :: Information Technology", # Pick your license as you wish "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", ], install_requires=["amqpstorm", "jsonschema", "httpx", "shortuuid"], extras_require={ diff --git a/tox.ini b/tox.ini index 9cdc242..5fcdd53 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py37, flake8, mypy, black +envlist = py38, flake8, mypy, black skipsdist = True [flake8] @@ -42,4 +42,4 @@ commands = py.test -x --cov=sda_orchestrator tests/ [gh-actions] python = - 3.7: flake8, py37, docs, mypy, black + 3.8: flake8, py38, docs, mypy, black