From a27e97f02837885ec2ff64a1d507e72c412dbf7e Mon Sep 17 00:00:00 2001 From: Adrian Chang Date: Wed, 27 Mar 2024 19:22:48 -0700 Subject: [PATCH 1/2] Have testing container command default to tox command --- .github/workflows/release-container.yaml | 2 +- .github/workflows/testing-container.yaml | 2 +- Dockerfile | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-container.yaml b/.github/workflows/release-container.yaml index e4165b8f4..175ad1bf1 100644 --- a/.github/workflows/release-container.yaml +++ b/.github/workflows/release-container.yaml @@ -40,4 +40,4 @@ jobs: tags: | ${{ env.CONTAINER_IMAGE }}:latest - ${{ env.CONTAINER_IMAGE }}:${{ github.event.release.tag_name }} + ${{ env.CONTAINER_IMAGE }}:${{ github.event.release.tag_name }} \ No newline at end of file diff --git a/.github/workflows/testing-container.yaml b/.github/workflows/testing-container.yaml index 1c4c13056..45e981723 100644 --- a/.github/workflows/testing-container.yaml +++ b/.github/workflows/testing-container.yaml @@ -41,4 +41,4 @@ jobs: tags: | ${{ env.CONTAINER_IMAGE }}:develop - ${{ env.CONTAINER_IMAGE }}:${{ github.sha }} + ${{ env.CONTAINER_IMAGE }}:${{ github.sha }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index d9c33f9a5..51fc5949f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,8 @@ -FROM python:3.9-slim-bullseye +#https://stackoverflow.com/questions/77364550/attributeerror-module-pkgutil-has-no-attribute-impimporter-did-you-mean +#https://github.com/pyproj4/pyproj/issues/1321 +FROM python:3.8-slim-bullseye -RUN pip install pytest=="7.4.4" pytest-cases pytest-rerunfailures pytest-snapshot +RUN pip install pytest=="7.4.4" pytest-cases pytest-rerunfailures pytest-snapshot tox mypy strenum RUN apt-get -y update RUN apt install -y libsm6 \ libxext6 \ @@ -17,3 +19,4 @@ RUN pip install -r requirements.txt COPY . /usr/src/ RUN python setup.py install +CMD tox -e py -- tests/integration tests/data \ No newline at end of file From fd0bce933496bee9800672fa51f9b37726e97934 Mon Sep 17 00:00:00 2001 From: Adrian Chang Date: Thu, 28 Mar 2024 11:54:32 -0700 Subject: [PATCH 2/2] add spaces back in --- .github/workflows/release-container.yaml | 3 ++- .github/workflows/testing-container.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-container.yaml b/.github/workflows/release-container.yaml index 175ad1bf1..f6860f4db 100644 --- a/.github/workflows/release-container.yaml +++ b/.github/workflows/release-container.yaml @@ -40,4 +40,5 @@ jobs: tags: | ${{ env.CONTAINER_IMAGE }}:latest - ${{ env.CONTAINER_IMAGE }}:${{ github.event.release.tag_name }} \ No newline at end of file + ${{ env.CONTAINER_IMAGE }}:${{ github.event.release.tag_name }} + \ No newline at end of file diff --git a/.github/workflows/testing-container.yaml b/.github/workflows/testing-container.yaml index 45e981723..1dc02fb73 100644 --- a/.github/workflows/testing-container.yaml +++ b/.github/workflows/testing-container.yaml @@ -41,4 +41,5 @@ jobs: tags: | ${{ env.CONTAINER_IMAGE }}:develop - ${{ env.CONTAINER_IMAGE }}:${{ github.sha }} \ No newline at end of file + ${{ env.CONTAINER_IMAGE }}:${{ github.sha }} + \ No newline at end of file