Merge branch 'develop' of github.com:panoptes/panoptes-utils

.github/workflows/pythontest.yaml

@@ -1,12 +1,11 @@
 name: Test Python
-
 on: [ push, pull_request ]
 jobs:
   lint:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ 3.8 ]
+        python-version: [ "3.10" ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -22,26 +21,29 @@ jobs:
           # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
           flake8 . --count --exit-zero --max-complexity=10 --max-line-length=100 --statistics
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [ 3.8 ]
+        os: [ ubuntu-latest ]
+        python-version: [ '3.7', '3.8', '3.9', '3.10' ]
+        exclude:
+          - os: macos-latest
+            python-version: '3.8'
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Build panoptes-utils image
-        run: |
-          INCLUDE_BASE=true scripts/setup-local-environment.sh
-      - name: Test with pytest in panoptes-utils container
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install and test panoptes-utils on ${{ matrix.python-version }}
         run: |
-          mkdir -p logs && chmod -R 777 logs
-          PANLOG="${PWD}/logs" SLEEP_TIME=0 scripts/testing/test-software.sh
+          pip install -e ".[config,images,testing,social]"
+          pytest
       - name: Upload coverage report to codecov.io
         uses: codecov/codecov-action@v1
         if: success()
         with:
           name: codecov-upload
-          file: logs/coverage.xml
+          file: build/coverage.xml
           fail_ci_if_error: true
       - name: Create log file artifact
         uses: actions/upload-artifact@v1

.gitignore

@@ -21,6 +21,7 @@
 .settings
 .idea
 tags
+pythonenv*
 
 # Package files
 *.egg

.readthedocs.yaml

@@ -9,12 +9,16 @@ version: 2
 sphinx:
   configuration: docs/conf.py
 
-formats: all
+formats: htmlzip
 
 python:
-  version: 3.8
+  version: 3.7
   install:
-    - requirements: docs/requirements.txt
     - method: pip
       path: .
+      extras_requirements:
+        - config
+        - docs
+        - images
+        - social
   system_packages: true