Bump minversions, update CI (#240)

* Bump minversions, update CI

* Lots of clean-up

.github/workflows/spherical_geometry.yml

@@ -1,31 +1,36 @@
 name: Spherical Geometry CI
 
-# Change 'on' section and add code coverage.
-
 on:
   push:
     branches:
       - master
     tags:
       - "*"
   pull_request:
-    branches:
   schedule:
     # Run every Monday at 6am UTC
     - cron: '0 6 * * 1'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
 jobs:
   build:
     name: Python Testing ${{ matrix.python-version }}
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -35,46 +40,70 @@ jobs:
         python -m pip install -e .[test]
     - name: Test with pytest
       run: |
+        pip freeze
+        pytest
+
+  devdeps:
+    name: Python Testing with dev versions of dependencies
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.12'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install --pre --upgrade --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
+        python -m pip install --pre --upgrade --extra-index-url https://pypi.anaconda.org/astropy/simple astropy
+        python -m pip install -e .[test]
+    - name: Test with pytest
+      run: |
+        pip freeze
         pytest
 
   doc_build:
     name: Document Build
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.9
+        python-version: '3.11'
     - name: Install dependencies
       run: |
         sudo apt-get install graphviz texlive-latex-extra dvipng
         python -m pip install --upgrade pip
         python -m pip install -e .[docs]
     - name: Build documents with sphinx
       run: |
+        pip freeze
         sphinx-build docs build/docs
 
   code_coverage:
     name: Code Coverage Report
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.9
+        python-version: '3.11'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         python -m pip install -e .[test]
     - name: Test with pytest and code coverage
       run: |
+        pip freeze
         pytest --cov-report=xml --cov=. --cov-config=setup.cfg
     - name: Upload coverage to codecoverage
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3
       with:
         file: ./coverage.xml
 
@@ -83,11 +112,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: '3.11'
     - name: Install Dependencies
       run: |
         python -m pip install --upgrade pip

CHANGES.rst

@@ -4,8 +4,8 @@
 Release Notes
 =============
 
-1.2.24 (unreleased)
-===================
+1.3 (unreleased)
+================
 
 - Add documentation to ``polygon.py`` for the ``SphericalPolygon``
   method ``multi_union`` has exponential time behavior and cannot
@@ -18,6 +18,12 @@ Release Notes
   https://github.com/spacetelescope/spherical_geometry/issues/232
   is resolved. [#233]
 
+- Removed unused ``spherical_geometry.utils`` module. [#239]
+
+- Minimum supported version for Python is now 3.9. [#239]
+
+- Minimum supported version for NumPy is now 1.20. [#239]
+
 
 1.2.23 (10-October-2022)
 ========================

MANIFEST.in

@@ -2,12 +2,11 @@ include README.rst
 include CHANGES.rst
 
 include setup.cfg
+include pyproject.toml
 
-recursive-include *.pyx *.c *.pxd
+recursive-include *.c
 recursive-include docs *
 recursive-include licenses *
-recursive-include cextern *
-recursive-include scripts *
 
 prune build
 prune docs/_build

licenses/LICENSE.rst

@@ -1,4 +1,4 @@
-Copyright (C) 2011,2014 Association of Universities for Research in
+Copyright (C) 2011-2023 Association of Universities for Research in
 Astronomy (AURA)
 
 Redistribution and use in source and binary forms, with or without

pyproject.toml

@@ -1,2 +1,2 @@
 [build-system]
-requires = ["setuptools>=38.2.5", "setuptools_scm", "wheel", "oldest-supported-numpy"]
+requires = ["setuptools>=38.2.5", "setuptools_scm", "numpy>=1.25,<2"]

setup.cfg

@@ -1,16 +1,12 @@
-[build_sphinx]
-source-dir = docs
-build-dir = docs/_build
-all_files = 1
-
-[upload_docs]
-upload-dir = docs/_build/html
-show-response = 1
-
-[tools:pytest]
-minversion = 4.2
+[tool:pytest]
+minversion = 6
 junit_family = xunit2
 norecursedirs = .git build docs/_build
+xfail_strict = true
+filterwarnings =
+    error
+    ignore:numpy\.ndarray size changed:RuntimeWarning
+    ignore:numpy\.ufunc size changed:RuntimeWarning
 
 [metadata]
 package_name = spherical_geometry
@@ -32,4 +28,3 @@ omit =
     spherical_geometry/tests/*
     # And list again for running against installed versions
     */spherical_geometry/tests/*
-

setup.py

@@ -68,10 +68,7 @@ def qd_config(arg):
     exit(1)
 
 # Get some values from the setup.cfg
-try:
-    from ConfigParser import ConfigParser
-except ImportError:
-    from configparser import ConfigParser
+from configparser import ConfigParser
 conf = ConfigParser()
 conf.read(['setup.cfg'])
 metadata = dict(conf.items('metadata'))
@@ -134,9 +131,9 @@ def qd_config(arg):
     description=DESCRIPTION,
     install_requires=[
         'astropy>=5.0.4',
-        'numpy>=1.18',
+        'numpy>=1.20',
     ],
-    python_requiers='>=3.8',
+    python_requiers='>=3.9',
     extras_require={
         'test': [
             'pytest',

spherical_geometry/__init__.py

@@ -1,6 +1,4 @@
-from pkg_resources import get_distribution, DistributionNotFound
 try:
-    __version__ = get_distribution(__name__).version
-except DistributionNotFound:
-    # package is not installed
-    __version__ = 'unknown'
+    from .version import version as __version__
+except ImportError:
+    __version__ = ''

spherical_geometry/graph.py

@@ -6,16 +6,14 @@
 This contains the code that does the actual unioning of regions.
 """
 # TODO: Weak references for memory management problems?
-from __future__ import absolute_import, division, unicode_literals, print_function
 
 # STDLIB
-import itertools
+import weakref
 
 # THIRD-PARTY
 import numpy as np
 
 # LOCAL
-from .utils.compat import weakref
 from . import great_circle_arc as gca
 from . import vector
 from .polygon import (SingleSphericalPolygon, SphericalPolygon,

spherical_geometry/great_circle_arc.py

@@ -11,9 +11,6 @@
 section of those circles between two points on the unit sphere.
 """
 
-from __future__ import with_statement, division, absolute_import, unicode_literals
-
-import math
 from .vector import two_d
 
 # THIRD-PARTY

spherical_geometry/polygon.py

@@ -6,7 +6,6 @@
 The `spherical_geometry.polygon` module defines the `SphericalPolygon` class for
 managing polygons on the unit sphere.
 """
-from __future__ import division, print_function, unicode_literals, absolute_import
 
 # STDLIB
 from copy import copy, deepcopy

spherical_geometry/tests/test_basic.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import os
 import os.path
 import math

spherical_geometry/tests/test_intersection.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import
-
 # STDLIB
 import codecs
 import functools
@@ -8,10 +6,10 @@
 import os
 import random
 import sys
-import pytest
 
 # THIRD-PARTY
 import numpy as np
+import pytest
 from numpy.testing import assert_array_almost_equal
 
 # LOCAL
@@ -121,6 +119,7 @@ def test3():
     return [poly1, poly3]
 
 
+@pytest.mark.filterwarnings("ignore:CPERROR.*")
 def test4():
     from astropy.io import fits
     from astropy import wcs as pywcs

spherical_geometry/tests/test_union.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import
-
 # STDLIB
 import codecs
 import functools
@@ -11,6 +9,7 @@
 
 # THIRD-PARTY
 import numpy as np
+import pytest
 from numpy.testing import assert_array_almost_equal
 
 # LOCAL
@@ -113,6 +112,7 @@ def test2():
     return [poly1, poly2, poly3, poly4, poly5, poly6]
 
 
+@pytest.mark.filterwarnings("ignore:CPERROR.*")
 def test5():
     from astropy.io import fits
     from astropy import wcs as pywcs
@@ -139,6 +139,7 @@ def test6():
     null_union = chipA1.union(chipA2)
 
 
+@pytest.mark.filterwarnings("ignore:CPERROR.*")
 @union_test(0, 90)
 def test7():
     from astropy.io import fits