drop osx, add ci linting

Author: bjlittle

.cirrus.yml

@@ -9,6 +9,8 @@
 #
 container:
   image: python:3.8
+  cpu: 2
+  memory: 4G
 
 env:
   # Maximum cache period (in weeks) before forcing a new cache upload.
@@ -18,9 +20,32 @@ env:
   # Increment the build number to force new stratify cache upload.
   STRATIFY_CACHE_BUILD: "0"
   # Base environment conda packages to be installed.
-  MAMBA_CACHE_PACKAGES: "pip conda-lock"
+  MAMBA_CACHE_PACKAGES: "conda-lock"
   # Enable Cython code coverage.
   CYTHON_COVERAGE: "1"
+  # Increment the build number to force new pip cache upload.
+  PIP_CACHE_BUILD: "0"
+
+
+#
+# Linting
+#
+lint_task:
+  auto_cancellation: true
+  name: "${CIRRUS_OS}: black, flake8 and isort"
+  pip_cache:
+    folder: ~/.cache/pip
+    fingerprint_script:
+      - echo "${CIRRUS_TASK_NAME}"
+      - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${PIP_CACHE_BUILD}"
+  lint_script:
+    - pip list
+    - python -m pip install --editable .[lint]
+    - pip list
+    - black .
+    - flake8 .
+    - isort .
+
 
 #
 # Testing (Linux)
@@ -33,7 +58,7 @@ linux_task:
     env:
       PY_VER: "3.9"
       COVERAGE: "1"
-  name: "Linux: py${PY_VER}"
+  name: "${CIRRUS_OS}: py${PY_VER}"
   container:
     image: gcc:latest 
   env:
@@ -69,53 +94,6 @@ linux_task:
     - source ${HOME}/mambaforge/etc/profile.d/conda.sh >/dev/null 2>&1
     - conda activate py${PY_VER} >/dev/null 2>&1
     - python setup.py build_ext --inplace
-    - pip install --no-deps --editable .
+    - python -m pip install --no-deps --editable .
     - if [ -n "${COVERAGE}" ]; then pytest --cov-report=xml --cov; else pytest; fi
     - if [ -n "${COVERAGE}" ]; then codecov; fi
-
-#
-# Testing (macOS)
-#
-osx_task:
-  auto_cancellation: true
-  matrix:
-    env:
-      PY_VER: "3.8"
-  name: "OSX: py${PY_VER}"
-  osx_instance:
-    image: catalina-xcode
-  env:
-    PATH: ${HOME}/mambaforge/bin:${PATH}
-  mamba_cache:
-    folder: ${HOME}/mambaforge
-    fingerprint_script:
-      - wget --quiet https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-MacOSX-x86_64.sh -O mambaforge.sh
-      - echo "${CIRRUS_OS} $(shasum -a 256 mambaforge.sh)"
-      - echo "${MAMBA_CACHE_PACKAGES}"
-      - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${MAMBA_CACHE_BUILD}"
-    populate_script:
-      - bash mambaforge.sh -b -p ${HOME}/mambaforge
-      - conda config --set always_yes yes --set changeps1 no
-      - conda config --set show_channel_urls True
-      - conda config --add channels conda-forge
-      - conda install --quiet --name base ${MAMBA_CACHE_PACKAGES}
-  check_script:
-    - conda info --all
-    - conda list --name base
-  stratify_cache:
-    folder: ${HOME}/mambaforge/envs/py${PY_VER}
-    fingerprint_script:
-      - echo "${CIRRUS_OS} py${PY_VER} tests"
-      - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${STRATIFY_CACHE_BUILD}"
-      - cat ${CIRRUS_WORKING_DIR}/requirements/py$(echo ${PY_VER} | tr -d ".").yml
-    populate_script:
-      - conda-lock --mamba --platform osx-64 --file ${CIRRUS_WORKING_DIR}/requirements/py$(echo ${PY_VER} | tr -d ".").yml
-      - mamba create --yes --name py${PY_VER} --quiet --file conda-osx-64.lock
-      - cp conda-osx-64.lock ${HOME}/mambaforge/envs/py${PY_VER}
-  test_script:
-    - cat ${HOME}/mambaforge/envs/py${PY_VER}/conda-osx-64.lock >&2
-    - source ${HOME}/mambaforge/etc/profile.d/conda.sh >/dev/null 2>&1
-    - conda activate py${PY_VER} >/dev/null 2>&1
-    - python setup.py build_ext --inplace
-    - pip install --no-deps --editable .
-    - pytest

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
         # Don't commit to master branch.
     -   id: no-commit-to-branch
 -   repo: https://github.com/psf/black
-    rev: '21.5b1'
+    rev: '21.5b0'
     hooks:
     -   id: black
         # Force black to run on whole repo, using settings from pyproject.toml
@@ -34,6 +34,7 @@ repos:
     hooks:
     -   id: isort
         name: isort (python)
+        args: ["--profile", "black", "--filter-files"]
     -   id: isort
         name: isort (cython)
         types: [cython]

pyproject.toml

@@ -36,3 +36,5 @@ exclude = '''
 
 [tool.isort]
 profile = "black"
+skip_gitignore = "True"
+verbose = "True"

requirements/py38.yml

@@ -14,11 +14,14 @@ dependencies:
   - numpy
   - cython
 
-# Test dependencies.
+# Developer dependencies.
   - black=21.5b0
-  - codecov
   - flake8=3.9.2
   - isort=5.8.0
+  - pip
   - pre-commit
+
+# Test dependencies.
+  - codecov
   - pytest
   - pytest-cov

requirements/py39.yml

@@ -14,11 +14,14 @@ dependencies:
   - numpy
   - cython
 
-# Test dependencies.
+# Developer dependencies.
   - black=21.5b0
-  - codecov
   - flake8=3.8.2
   - isort=5.8.0
+  - pip
   - pre-commit
+
+# Test dependencies.
+  - codecov
   - pytest
   - pytest-cov

setup.cfg

@@ -35,10 +35,11 @@ install_requires =
     numpy
 
 [options.extras_require]
-dev =
+lint =
     black==21.5b0
     flake8==3.9.2
     isort==5.8.0
+dev =
     pre-commit
     pytest
     pytest-cov