Merge pull request #35 from sanger/develop

Develop to master

.dockerignore

@@ -17,6 +17,5 @@ forlint.sh
 htmlcov
 lefthook.yml
 LICENSE
-mypy.ini
 README.md
 tmp

.github/workflows/ci.yml

@@ -17,96 +17,77 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.11.1
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/Pipfile') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Install pipenv
-        run: |
-          pip install pipenv
-      - name: Install dependencies
-        run: |
-          pipenv sync --dev --system
-      - name: Check format with black
-        run: |
-          # stop the build if there are black formatting errors
+
+      - uses: nelonoel/[email protected]
+
+      - name: Build and tag the image for testing and release
+        run: >-
+          docker build .
+          --file Dockerfile
+          --tag tol-lab-share:black
+
+      - name: Run tests against the image
+        run: >-
+          docker run
+          --entrypoint ''
+          tol-lab-share:black
           python -m black --check .
+
   flake8:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.11.1
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/Pipfile') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Install pipenv
-        run: |
-          pip install pipenv
-      - name: Install dependencies
-        run: |
-          pipenv sync --dev --system
-      - name: Lint with flake8
-        run: |
-          # stop the build if there are Python syntax errors or undefined names
+
+      - uses: nelonoel/[email protected]
+
+      - name: Build and tag the image for testing and release
+        run: >-
+          docker build .
+          --file Dockerfile
+          --tag tol-lab-share:flake8
+
+      - name: Run tests against the image
+        run: >-
+          docker run
+          --entrypoint ''
+          tol-lab-share:flake8
           flake8
   mypy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.11.1
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/Pipfile') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Install pipenv
-        run: |
-          pip install pipenv
-      - name: Install dependencies
-        run: |
-          pipenv sync --dev --system
-      - name: Run mypy
-        run: |
+
+      - uses: nelonoel/[email protected]
+
+      - name: Build and tag the image for testing and release
+        run: >-
+          docker build .
+          --file Dockerfile
+          --tag tol-lab-share:mypy
+
+      - name: Run tests against the image
+        run: >-
+          docker run
+          --entrypoint ''
+          tol-lab-share:mypy
           python -m mypy .
   test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.11.1
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/Pipfile') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Install pipenv
-        run: |
-          pip install pipenv
-      - name: Install dependencies
-        run: |
-          pipenv sync --dev --system
-      - name: Run tests and generate coverage report
-        run: |
-          python -m pytest -vx --cov=. --junitxml=pytest.xml
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
+
+      - uses: nelonoel/[email protected]
+
+      - name: Build and tag the image for testing and release
+        run: >-
+          docker build .
+          --file Dockerfile
+          --tag tol-lab-share:pytest
+
+      - name: Run tests against the image
+        run: >-
+          docker run
+          --entrypoint ''
+          tol-lab-share:pytest
+          python -m pytest -vx --cov=.
+

.release-version

@@ -1 +1 @@
-0.1.5
+0.2.0

Pipfile

@@ -25,6 +25,7 @@ slackclient = "~=2.9"
 lab-share-lib = {editable = false,git = 'https://github.com/sanger/lab-share-lib.git',ref = 'v0.1.6'}
 requests-mock = "*"
 types-requests = "*"
+python-snappy = "*"
 
 [requires]
 python_version = "3.11"