diff --git a/.dockerignore b/.dockerignore index 99c7a66..c0fc847 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,5 @@ ** !/Dockerfile +!/wabucketref +!/requirements +!/setup.* diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c87c63..2e3e29f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,9 +140,9 @@ jobs: run: | docker build \ -t "ghcr.io/neuro-inc/wabucketref:${VERSION}" \ - -t "ghcr.io/neuro-inc/wabucketref:latest" \ --build-arg COMMIT_SHA=${COMMIT_SHA} \ - . + . \ + -f python37.Dockerfile - name: Push env: VERSION: ${{ needs.lint.outputs.version }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index de6a413..16fd66d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: hooks: - id: yesqa - repo: https://github.com/PyCQA/isort - rev: '5.12.0' + rev: '5.11.5' hooks: - id: isort - repo: https://github.com/psf/black @@ -39,7 +39,7 @@ repos: - id: pyupgrade args: ['--py37-plus'] - repo: https://github.com/pycqa/flake8 - rev: '6.0.0' + rev: '5.0.4' hooks: - id: flake8 args: diff --git a/python37.Dockerfile b/python37.Dockerfile new file mode 100644 index 0000000..98e1df9 --- /dev/null +++ b/python37.Dockerfile @@ -0,0 +1,6 @@ +FROM python:3.7.17-slim-bookworm as build + +LABEL org.opencontainers.image.source = "https://github.com/neuro-inc/mlops-wandb-bucket-ref" + +COPY . /tmp/wabucketref +RUN pip install --no-cache-dir /tmp/wabucketref diff --git a/requirements/python-base.txt b/requirements/python-base.txt index f6ff7e7..2fcbc59 100644 --- a/requirements/python-base.txt +++ b/requirements/python-base.txt @@ -1,2 +1,4 @@ -neuro-cli>=23.7.0 +aiobotocore~=2.6.0 +boto3==1.28.17 +neuro-cli>=22.7.1 wandb[aws]>=0.10.33,<=0.15.5 diff --git a/requirements/python-dev.txt b/requirements/python-dev.txt index 87eb68a..730b5d5 100644 --- a/requirements/python-dev.txt +++ b/requirements/python-dev.txt @@ -1,7 +1,8 @@ -r python-base.txt mypy==1.1.1 -pre-commit==3.1.1 +pre-commit==3.1.1; python_version >= "3.8" +pre-commit==2.21.0; python_version < "3.8" pytest==7.2.2 pytest-asyncio==0.20.3 towncrier==22.12.0 diff --git a/setup.py b/setup.py index 2dd3639..def619f 100644 --- a/setup.py +++ b/setup.py @@ -13,10 +13,12 @@ setup( name="wabucketref", version=version, - python_requires=">=3.8.1", + python_requires=">=3.7.17", install_requires=[ - "neuro-cli>=23.7.0", + "neuro-cli>=22.7.1", "wandb[aws]>=0.10.33,<=0.15.5", + "boto3==1.28.17", + "aiobotocore~=2.6.0", ], include_package_data=True, description=( diff --git a/wabucketref/__init__.py b/wabucketref/__init__.py index 3bf57d6..f1fa880 100644 --- a/wabucketref/__init__.py +++ b/wabucketref/__init__.py @@ -1,4 +1,4 @@ -__version__ = "23.7.0" +__version__ = "23.7.0.post1" from .api import WaBucketRefAPI from .utils import parse_meta