Merge 9315920 into 0041bf5

.github/workflows/ci.yaml

@@ -44,7 +44,8 @@ jobs:
         shell: bash -l {0}
         run: |
           python -m pip install \
-          -f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com \
+          -f https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/ \
+          --trusted-host pypi.anaconda.org \
           --no-deps --pre --upgrade \
           numpy \
           pandas; \
@@ -61,6 +62,9 @@ jobs:
         shell: bash -l {0}
         run: |
           pip install --no-deps -e .
+          # pip forces non-wheel builds if we provide --cython-coverage as a --build-option
+          # and that's way too slow
+          python setup.py build_ext --inplace --cython-coverage --force
 
       - name: Run unit tests
         shell: bash -l {0}
@@ -73,3 +77,19 @@ jobs:
           flags: unittests
           file: ./coverage.xml
           env_vars: OS,PYTHON_VERSION,UNSTABLE
+
+      - name: Coveralls Parallel
+        uses: AndreMiras/coveralls-python-action@develop
+        with:
+          flag-name: run-${{ matrix.test_number }}
+          parallel: true
+        if: runner.os == 'Linux'
+
+  coveralls:
+    needs: [test]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls Finished
+        uses: AndreMiras/coveralls-python-action@develop
+        with:
+          parallel-finished: true

.github/workflows/deploy-sdist.yaml

@@ -1,25 +0,0 @@
-name: Deploy sdist
-
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v3
-
-      - name: Create sdist
-        shell: bash -l {0}
-        run: python setup.py sdist
-
-      - name: Publish package to PyPI
-        if: github.event.action == 'published'
-        uses: pypa/gh-action-pypi-publish@v1.8.10
-        with:
-          user: __token__
-          password: ${{ secrets.pypi_password }}

.github/workflows/deploy.yaml

@@ -0,0 +1,76 @@
+name: Build Package
+
+
+on:
+  push:
+  pull_request:
+  release:
+    types:
+      - published
+
+jobs:
+  build_sdist:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v3
+
+      - name: Create sdist
+        shell: bash -l {0}
+        run: |
+          python -m pip install -q build
+          python -m build -s
+
+      - name: Upload sdist to build artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: sdist
+          path: dist/*.tar.gz
+
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, windows-2019, macOS-11]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v2.12.0
+        env:
+          CIBW_SKIP: "cp36-* cp37-* cp38-* pp* *-i686"
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: wheels
+          path: ./wheelhouse/*.whl
+
+  upload_to_pypi:
+    needs: [build_sdist, build_wheels]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download sdist artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: sdist
+          path: dist
+      - name: Download wheels artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: wheels
+          path: dist
+      - name: Publish package to Test PyPI
+        if: github.event.action != 'published' && github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
+        uses: pypa/gh-action-pypi-publish@v1.4.1
+        with:
+          user: __token__
+          password: ${{ secrets.test_pypi_password }}
+          repository_url: https://test.pypi.org/legacy/
+      - name: Publish package to PyPI
+        if: github.event.action == 'published'
+        uses: pypa/gh-action-pypi-publish@v1.4.1
+        with:
+          user: __token__
+          password: ${{ secrets.pypi_password }}

.gitignore

@@ -42,4 +42,5 @@ nosetests.xml
 .ropeproject
 
 # sphinx
-doc/_build
+doc/_build
+doc/api/*.rst

.readthedocs.yml

@@ -4,8 +4,16 @@ build:
   os: "ubuntu-20.04"
   tools:
     python: "3.10"
+  jobs:
+    post_install:
+      - python -c "import os; print(os.getcwd()); import sys; print(sys.path)"
+      - python setup.py build_ext --inplace
+      - cd doc
+      - python -c "import sys; print(sys.path); import trollimage.tests; print(trollimage.tests.__file__)"
+      - python -c "import trollimage.tests.test_colormap"
 sphinx:
   configuration: doc/conf.py
+  fail_on_warning: true
 python:
   install:
     - requirements: rtd_requirements.txt

LICENSE_RIO_COLOR.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Mapbox
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

MANIFEST.in

@@ -1,4 +1,5 @@
 include LICENSE.txt
+include LICENSE_RIO_COLOR.txt
 include README.rst
 include versioneer.py
 include trollimage/version.py

doc/Makefile

@@ -35,6 +35,7 @@ help:
 
 clean:
 	-rm -rf $(BUILDDIR)/*
+	-rm -rf api/*.rst
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html

doc/colormap.rst

@@ -57,9 +57,7 @@ Now applying a palette to the data, with sharp edges::
 API
 ===
 
-.. automodule:: trollimage.colormap
-   :members:
-   :undoc-members:
+See the :class:`~trollimage.Colormap` API documentation.
 
 Default Colormaps
 =================

doc/conf.py

@@ -11,41 +11,13 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 from trollimage import __version__
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 # sys.path.insert(0, os.path.abspath('.'))
 
-
-class Mock(object):
-    def __init__(self, *args, **kwargs):
-        pass
-
-    def __call__(self, *args, **kwargs):
-        return Mock()
-
-    @classmethod
-    def __getattr__(cls, name):
-        if name in ('__file__', '__path__'):
-            return '/dev/null'
-        elif name[0] == name[0].upper():
-            mockType = type(name, (), {})
-            mockType.__module__ = __name__
-            return mockType
-        elif name == "inf":
-            return 0
-        else:
-            return Mock()
-
-
-MOCK_MODULES = ['Image']
-for mod_name in MOCK_MODULES:
-    sys.modules[mod_name] = Mock()
-
-
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -54,7 +26,11 @@ def __getattr__(cls, name):
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
-              'sphinx.ext.napoleon']
+              'sphinx.ext.napoleon', 'sphinxcontrib.apidoc']
+# API docs
+apidoc_module_dir = "../trollimage"
+apidoc_output_dir = "api"
+apidoc_excluded_paths = []
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -247,9 +223,9 @@ def __getattr__(cls, name):
 
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3', None),
-    'numpy': ('https://docs.scipy.org/doc/numpy', None),
-    'scipy': ('https://docs.scipy.org/doc/scipy/reference', None),
-    'xarray': ('https://xarray.pydata.org/en/stable', None),
+    'numpy': ('https://numpy.org/doc/stable', None),
+    'scipy': ('https://docs.scipy.org/doc/scipy/', None),
+    'xarray': ('https://docs.xarray.dev/en/stable', None),
     'dask': ('https://dask.pydata.org/en/latest', None),
     'rasterio': ('https://rasterio.readthedocs.io/en/latest', None),
 }

doc/index.rst

@@ -13,10 +13,8 @@ Contents:
    :maxdepth: 2
 
    installation
-   image
-   xrimage
-   colorspaces
    colormap
+   API <api/modules>
 
 
 Indices and tables

pyproject.toml

@@ -0,0 +1,8 @@
+[build-system]
+requires = ["setuptools", "wheel", "oldest-supported-numpy", "Cython", "versioneer"]
+build-backend = "setuptools.build_meta"
+
+[tool.coverage.run]
+relative_files = true
+plugins = ["Cython.Coverage"]
+omit = ["trollimage/version.py", "versioneer.py"]

rtd_requirements.txt

@@ -2,8 +2,10 @@ pillow
 rasterio
 xarray
 dask[array]
-docutils<0.18
-sphinx>=5,<6
-sphinx-rtd-theme>=1.1.0,<2.0
+docutils
+sphinx>=7,<8
+sphinx-rtd-theme>=1.2.0,<2.0
+sphinxcontrib-apidoc
+pytest
 
 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability

setup.cfg

@@ -9,15 +9,12 @@ universal=1
 max-line-length = 120
 exclude = 
     doc/conf.py
+    trollimage/version.py
+    versioneer.py
 
 [versioneer]
 VCS = git
 style = pep440
 versionfile_source = trollimage/version.py
-versionfile_build =
+versionfile_build = trollimage/version.py
 tag_prefix = v
-
-[coverage:run]
-omit =
-    trollimage/version.py
-    versioneer.py