Fix Windows CI builds

.github/workflows/continuous-integration.yml

@@ -7,15 +7,22 @@ on:
   pull_request:
 
 jobs:
-  build:
-    name: build
+  test:
+    name: test
     runs-on: ${{ matrix.os }}
     strategy:
       # Allow other matrix jobs to complete if 1 fails
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8"]
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version:
+          - "3.6"
+          - "3.7"
+          - "3.8"
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+
     steps:
       - uses: actions/checkout@v2
 
@@ -24,15 +31,38 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Cache dependencies
+      - name: Cache dependencies (Linux)
+        if: startsWith(runner.os, 'Linux')
         uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           # Cache based on OS, Python version, and dependency hash
-          key: pip-${{ runner.os }}-python${{ matrix.python-version }}-${{ hashFiles('requirements-dev.txt') }}
+          key: test-${{ runner.os }}-python${{ matrix.python-version }}-${{ hashFiles('requirements-test.txt') }}
+
+      - name: Cache dependencies (macOS)
+        if: startsWith(runner.os, 'macOS')
+        uses: actions/cache@v2
+        with:
+          path: ~/Library/Caches/pip
+          # Cache based on OS, Python version, and dependency hash
+          key: test-${{ runner.os }}-python${{ matrix.python-version }}-${{ hashFiles('requirements-test.txt') }}
+
+      - name: Cache dependencies (Windows)
+        if: startsWith(runner.os, 'Windows')
+        uses: actions/cache@v2
+        with:
+          path: ~\AppData\Local\pip\Cache
+          # Cache based on OS, Python version, and dependency hash
+          key: test-${{ runner.os }}-python${{ matrix.python-version }}-${{ hashFiles('requirements-test.txt') }}
+
+      - name: Install dependencies
+        run: |
+          pip install -r requirements-test.txt
+          pip install -e ".[validation]"
 
-      - name: Execute linters and test suites
-        run: ./scripts/cibuild
+      - name: Execute test suite
+        run: ./scripts/test
+        shell: bash
 
       - name: Upload All coverage to Codecov
         uses: codecov/codecov-action@v1
@@ -42,14 +72,51 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml
           fail_ci_if_error: false 
-  vanilla:
+  lint:
     runs-on: ubuntu-latest
+    strategy:
+      # Allow other matrix jobs to complete if 1 fails
+      fail-fast: false
+      matrix:
+        python-version:
+          - "3.6"
+          - "3.7"
+          - "3.8"
+
     steps:
       - uses: actions/checkout@v2
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          # Cache based on OS, Python version, and dependency hash
+          key: lint-${{ runner.os }}-python${{ matrix.python-version }}-${{ hashFiles('requirements-test.txt') }}
+
+      - name: Install dependencies
+        run: |
+          pip install -r requirements-test.txt
+          pip install -e .
+
+      - name: Execute linters & type checkers
+        run: ./scripts/lint
+
+  vanilla:
+    runs-on: ubuntu-latest
+    steps:  
+      - uses: actions/checkout@v2
+
       - uses: actions/setup-python@v2
         with:
           python-version: "3.8"
+
       - name: Install without orjson
         run: pip install '.[validation]'
+
       - name: Run unittests
         run: python -m unittest discover tests

requirements-dev.txt

@@ -1,19 +1,10 @@
-mypy==0.790
-flake8==3.8.*
-black==21.4b2
-
-codespell==1.17.1
 ipython==7.16.1
-jsonschema==3.2.0
-pylint==1.9.1
 Sphinx==3.5.4
 sphinx-autobuild==0.7.1
 sphinxcontrib-fulltoc==1.2.0
 nbsphinx==0.7.1
-coverage==5.2.*
 
 # https://github.com/pydata/xarray/issues/5299#issuecomment-840730954
 jinja2<3.0
 
-# optional dependencies
-orjson==3.5.2
+-r ./requirements-test.txt

requirements-test.txt

@@ -0,0 +1,12 @@
+mypy==0.812
+flake8==3.8.*
+black==21.4b2
+
+codespell==1.17.1
+
+jsonschema==3.2.0
+pylint==1.9.1
+coverage==5.2.*
+
+# optional dependencies
+orjson==3.5.2

scripts/lint

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -e
+
+echo
+echo " -- CHECKING TYPES WITH PYRIGHT --"
+echo
+
+scripts/pyright pystac tests
+
+echo
+echo " -- LINTING WITH FLAKE8 --"
+echo
+
+flake8 pystac tests
+
+echo
+echo " -- CHECKING FORMAT WITH BLACK --"
+echo
+
+black --check pystac
+black --check tests
+
+echo
+echo " -- CHECKING SPELLING WITH CODESPELL --"
+echo
+
+# Code spelling
+codespell -I .codespellignore -f \
+    pystac/*.py pystac/**/*.py \
+    tests/*.py tests/**/*.py \
+    docs/*.rst docs/**/*.rst \
+    docs/*.ipynb docs/**/*.ipynb \
+    scripts/* \
+    *.py \
+    *.md

scripts/test

@@ -2,60 +2,14 @@
 
 set -e
 
-if [[ -n "${CI}" ]]; then
-    set -x
+if [[ -z ${CI} ]]; then
+    source ./scripts/lint
 fi
 
-function usage() {
-    echo -n \
-        "Usage: $(basename "$0")
-Execute project linters and test suites.
-"
-}
+echo
+echo " -- RUNNING UNIT TESTS --"
+echo
 
-if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
-    if [ "${1:-}" = "--help" ]; then
-        usage
-    else
-        echo
-        echo " -- CHECKING TYPES WITH PYRIGHT --"
-        echo
-
-        scripts/pyright pystac tests
-
-        echo
-        echo " -- LINTING WITH FLAKE8 --"
-        echo
-
-        flake8 pystac tests
-
-        echo
-        echo " -- CHECKING FORMAT WITH BLACK --"
-        echo
-
-        black --check pystac
-        black --check tests
-
-        echo
-        echo " -- CHECKING SPELLING WITH CODESPELL --"
-        echo
-
-        # Code spelling
-        codespell -I .codespellignore -f \
-            pystac/*.py pystac/**/*.py \
-            tests/*.py tests/**/*.py \
-            docs/*.rst docs/**/*.rst \
-            docs/*.ipynb docs/**/*.ipynb \
-            scripts/* \
-            *.py \
-            *.md
-
-        echo
-        echo " -- RUNNING UNIT TESTS --"
-        echo
-
-        # Test suite with coverage enabled
-        coverage run --source=pystac/ -m unittest discover tests/
-        coverage xml
-    fi
-fi
+# Test suite with coverage enabled
+coverage run --source=pystac/ -m unittest discover tests/
+coverage xml