Merge pull request #274 from duckinator/ci-cleanup

CI cleanup

.cirrus.yml

@@ -1,16 +1,19 @@
 Lint_task:
   container:
+    cpu: 1
+    memory: 512Mi
     image: python:3-slim
   install_script:
-    - pip3 install -U .[test]
+    - pip3 install -U .[lint]
   script:
-    - pylint --version
     - bork run lint
 
 Linux_task:
   alias: Linux tests
   allow_failures: $CIRRUS_TASK_NAME =~ '.*-rc-.*'
   container:
+    cpu: 1
+    memory: 512Mi
     matrix:
       - image: python:3.8-slim
       - image: python:3.9-slim
@@ -26,10 +29,23 @@ Linux_task:
 macOS_task:
   alias: macOS tests
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-sonoma-base:latest
-  install_script:
-    - brew install python3
-    - pip3 install -U .[test]
+    image: ghcr.io/cirruslabs/macos-runner:sonoma
+  env:
+    PATH: ${HOME}/.pyenv/shims:${PATH}
+    PYTHON: 3:latest
+  brew_update_script:
+    - brew update
+  brew_install_script:
+    # Per the pyenv homebrew recommendations.
+    #  https://github.com/pyenv/pyenv/wiki#suggested-build-environment
+    - brew install openssl readline sqlite3 xz zlib pyenv git
+  pyenv_install_script:
+    - pyenv install ${PYTHON}
+    - pyenv global 3
+    - pyenv rehash
+  pip_install_script:
+    - pip install -U --upgrade-strategy eager pip 'setuptools>61'
+    - pip install .[test]
   script:
     - python3 --version
     - pytest --verbose

CREDITS.md

@@ -20,8 +20,8 @@ Software and libraries:
 
 - [Python](https://python.org)
 - [pip](https://pip.pypa.io/)
-- [pylint](https://www.pylint.org/) and the [pytest-pylint](https://github.com/carsongee/pytest-pylint) integration
 - [pytest](https://pytest.org/)
+* [ruff](https://astral.sh/ruff)
 - [setuptools](https://github.com/pypa/setuptools) and [wheel](https://github.com/pypa/wheel)
 
 Services:

emanate/__init__.py

@@ -17,7 +17,7 @@
 
 # Set the module-level dunders suggested in PEP8
 __author__ = "Ellen Marie Dash"
-from .version import __version__
+from .version import __version__ as __version__
 
 @dataclass(frozen=True)
 class FilePair:

pyproject.toml

@@ -31,15 +31,14 @@ repository = "https://github.com/duckinator/emanate"
 documentation = "https://emanate-docs.netlify.app/cli.html"
 
 [project.optional-dependencies]
-bork = [
-    "bork~=7.0.1",
+lint = [
+    "bork",
+    "ruff"
 ]
 
 test = [
-    "emanate[bork]",
+    "bork",
     "pytest~=7.4",
-    "pylint~=3.0",
-    "pytest-pylint~=0.21.0",
     "mypy~=1.6.1",
     "pytest-mypy~=0.10.3",
 ]
@@ -70,9 +69,7 @@ github_repository = "duckinator/emanate"
 strip_zipapp_version = true
 
 [tool.bork.aliases]
-# Runs *only* pylint. (Not the actual tests.)
-lint = "python -m pytest -k 'pylint or mypy' --pylint --mypy --verbose"
-# Runs tests
+lint = "ruff check"
 test = "python -m pytest --verbose"
 #docs = "env PYTHONPATH=./ pdoc3 --html --output-dir ./html --force emanate"
 docs = "sphinx-build -b html -d build/doctrees docs/source/ docs/build/"