Skip to content

Commit

Permalink
Merge pull request #84 from neicnordic/feature/python-3.9
Browse files Browse the repository at this point in the history
switch to python 3.9 #minor
  • Loading branch information
blankdots authored Jan 4, 2023
2 parents 66a5e65 + 6898359 commit f8551d1
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
max-parallel: 4
matrix:
os: [ubuntu-latest]
python-version: [3.8]
python-version: [3.9]

runs-on: ${{ matrix.os }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
max-parallel: 4
matrix:
os: [ubuntu-latest]
python-version: [3.8]
python-version: [3.8, 3.9]

runs-on: ${{ matrix.os }}

Expand All @@ -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.8
if: ${{ matrix.python-version == '3.8' }}
- name: Run unit tests for python 3.9
if: ${{ matrix.python-version == '3.9' }}
# env:
# COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
run: tox -e py38
run: tox -e py39
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8-alpine3.15 as BUILD
FROM python:3.9-alpine3.17 as BUILD

RUN apk add --no-cache git gcc musl-dev libffi-dev make gnupg && \
rm -rf /var/cache/apk/*
Expand All @@ -11,14 +11,14 @@ RUN pip install --upgrade pip && \
pip install -r /root/sdaorch/requirements.txt && \
pip install /root/sdaorch

FROM python:3.8-alpine3.15
FROM python:3.9-alpine3.17

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.8/ usr/local/lib/python3.8/
COPY --from=BUILD /usr/local/lib/python3.9/ usr/local/lib/python3.9/

COPY --from=BUILD /usr/local/bin/sdainbox /usr/local/bin/

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
# Pick your license as you wish
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
],
install_requires=["amqpstorm", "jsonschema", "httpx", "shortuuid"],
extras_require={
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38, flake8, mypy, black
envlist = py38, py39, flake8, mypy, black
skipsdist = True

[flake8]
Expand Down Expand Up @@ -42,4 +42,5 @@ commands = py.test -x --cov=sda_orchestrator tests/

[gh-actions]
python =
3.8: flake8, py38, docs, mypy, black
3.8: py38
3.9: flake8, py39, docs, mypy, black

0 comments on commit f8551d1

Please sign in to comment.