Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump shortuuid from 1.0.4 to 1.0.5 #28

Merged
merged 2 commits into from
Nov 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.7]
python-version: [3.8]

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.7]
python-version: [3.8]

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.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
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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/*
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.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/

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
amqpstorm==2.10.3
jsonschema==4.2.1
httpx==0.20.0
shortuuid==1.0.4
shortuuid==1.0.5
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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={
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py37, flake8, mypy, black
envlist = py38, flake8, mypy, black
skipsdist = True

[flake8]
Expand Down Expand Up @@ -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