Minor fixes

.github/workflows/release.yaml

@@ -1,8 +1,13 @@
-
----
 name: Release
 
-on: [push]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  release:
+    types:
+      - published
 
 jobs:
   release:
@@ -18,11 +23,23 @@ jobs:
       - uses: actions/setup-python@v5
       - name: Install dependencies
         run: |
-          python -m pip install -U pip wheel setuptools setuptools-scm twine      
-        # python -m pip install -U pip wheel "setuptools<66.0.0" setuptools-scm twine
+          python -m pip install -U build check-manifest pip pytest setuptools setuptools-scm twine wheel
       - name: Build distributions
-        run: python setup.py sdist bdist_wheel
+        run: python -m build --sdist --wheel . --outdir dist
+
+      - name: CheckFiles
+        run: |
+          ls dist
+          check-manifest --verbose
+
+      - name: Test wheels
+        run: >
+          cd dist
+          && python -m twine check *
+          && python -m pip install *.whl
+          && cp --recursive ../tests .
+          && python -m pytest -rxs tests
 
       - name: Publish to PyPI
-        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+        if: success() && github.event_name == 'release'
         uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/test.yaml

@@ -17,36 +17,33 @@ jobs:
       fail-fast: false
       matrix:
         os: ["macos-latest", "ubuntu-latest", "windows-latest"]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: [ "3.8", "3.9", "3.10" ,"3.11", "3.12" ]
+    defaults:
+      run:
+        shell: bash -l {0}
+
     steps:
       - uses: actions/checkout@v4
-      - name: Cache conda
-        uses: actions/cache@v4
-        env:
-          # Increase this value to reset cache if ci/environment.yml has not changed
-          CACHE_NUMBER: 0
-        with:
-          path: ~/conda_pkgs_dir
-          key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/environment-py${{ matrix.python-version }}.yml') }}
-      - uses: conda-incubator/setup-miniconda@v3
+
+      - name: Setup Micromamba ${{ matrix.python-version }}
+        uses: mamba-org/setup-micromamba@v1
         with:
-          # mamba-version: "*" # activate this to build with mamba.
-          python-version: ${{ matrix.python-version }}
-          miniforge-variant: Mambaforge
-          channels: conda-forge, defaults # These need to be specified to use mamba
-          channel-priority: true
-          environment-file: ci/environment-py${{ matrix.python-version }}.yml
+          environment-name: TEST
+          init-shell: bash
+          create-args: >-
+            python=${{ matrix.python-version }} pip
+            --file requirements.txt
+            pytest codecov pytest-cov
+            --channel conda-forge
 
-          activate-environment: test_env_cmocean
-          use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
       - name: Set up conda environment
-        shell: bash -l {0}
         run: |
           python -m pip install -e . --no-deps --force-reinstall
+
       - name: Run Tests
-        shell: bash -l {0}
         run: |
-          pytest --cov=./ --cov-report=xml
+          python -m pytest -rxs --cov=./ --cov-report=xml
+
       - name: Upload code coverage to Codecov
         uses: codecov/codecov-action@v4
         with:

.gitignore

@@ -1,3 +1,4 @@
+cmocean/_version.py
 cmocean/rgb/drafts/
 dist
 *.pyc

MANIFEST.in

@@ -2,3 +2,8 @@ include README.md
 include *.txt
 recursive-include cmocean *.txt
 recursive-include cmocean *.py
+
+recursive-exclude cmocean/rgb *.jscm
+prune docs
+prune figures
+exclude cmocean/_version.py

pyproject.toml

@@ -0,0 +1,61 @@
+[build-system]
+build-backend = "setuptools.build_meta"
+requires = [
+  "setuptools>=42",
+  "setuptools_scm",
+  "wheel",
+]
+
+[project]
+name = "cmocean"
+description = "Colormaps for Oceanography"
+readme = "README.md"
+license = {file = "LICENSE.txt"}
+maintainers = [
+    {name = "Kristen Thyng", email = "[email protected]"},
+]
+requires-python = ">=3.8"
+classifiers = [
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+]
+dynamic = [
+  "dependencies",
+  "version",
+]
+[project.optional-dependencies]
+tests = [
+  "pytest",
+]
+plots = [
+  "colorspacious",
+  "viscm",
+]
+
+[project.urls]
+documentation = "https://matplotlib.org/cmocean/"
+homepage = "https://github.com/matplotlib/cmocean"
+repository = "https://github.com/matplotlib/cmocean"
+
+[tool.setuptools]
+packages = ["cmocean"]
+include-package-data = true
+
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements.txt"]}
+
+[tool.setuptools_scm]
+write_to = "cmocean/_version.py"
+write_to_template = "__version__ = '{version}'"
+tag_regex = "^(?P<prefix>v)?(?P<version>[^\\+]+)(?P<suffix>.*)?$"
+
+[tool.pytest.ini_options]
+filterwarnings = [
+    "error:::cmocean.*",
+    "ignore::UserWarning",
+    "ignore::RuntimeWarning",
+]

requirements.txt

@@ -1,2 +1,3 @@
 matplotlib
 numpy
+packaging