Temporary fix for version dependency issues

.github/workflows/main.yml

@@ -16,44 +16,51 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        os: ["ubuntu-latest", "windows-latest"]
+        python-version: ["3.9", "3.10", "3.11"]
+        include:
+          - python-version: "3.9"
+            os: "macos-13"
+          - python-version: "3.10"
+            os: "macos-13"
+          - python-version: "3.11"
+            os: "macos-latest"
 
     name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         architecture: 'x64'
 
-    - name: Install standard and test dependencies on Mac/Linux
-      if: ${{ matrix.os != 'windows-latest' }}
-      run: pip install build coverage coveralls flake8 numpy pytest
-
-    - name: Install standard and test dependencies on Windows
+    - name: Install Windows-specific dependencies for non-pip install
       if: ${{ matrix.os == 'windows-latest' }}
       run: |
            choco install ninja mingw
            choco install rtools --no-progress
            echo "c:\rtools40\ucrt64\bin;" >> $env:GITHUB_PATH
            gfortran --version
-           pip install coverage coveralls flake8 meson-python numpy pytest scipy
+           pip install flake8 meson-python pytest pytest-cov pytest-xdist scipy
+           pip install "numpy>=1.19.5,<2"
 
     - name: Install on Linux
       if: ${{ matrix.os == 'ubuntu-latest' }}
+      run: pip install .[test]
+
+    - name: Install on MacOS-13
+      if: ${{ matrix.os == 'macos-13' }}
       run: |
-          python -m build .
-          pip install .
+          brew reinstall gcc@14
+          CC=/usr/local/bin/gcc-14 pip install .[test]
 
-    - name: Install on MacOS
+    - name: Install on MacOS-Latest
       if: ${{ matrix.os == 'macos-latest' }}
       run: |
-          brew reinstall gcc
-          CC=/usr/local/bin/gcc-12 python -m build .
-          CC=/usr/local/bin/gcc-12 pip install .
+          brew reinstall gcc@14
+          CC=/opt/homebrew/bin/gcc-14 pip install .[test]
 
     - name: Install on Windows
       if: ${{ matrix.os == 'windows-latest' }}
@@ -73,33 +80,27 @@ jobs:
       if: ${{ matrix.os != 'windows-latest' }}
       run: |
            cd ..
-           coverage run --rcfile=apexpy/setup.cfg -m pytest
+           coverage run -m pytest
+           coverage report
+           coverage xml
+           mv coverage.xml apexpy/.
 
     - name: Run unit and integration tests on Windows
       if: ${{ matrix.os == 'windows-latest' }}
       run: |
            cd ..
-           coverage run --rcfile=apexpy\setup.cfg -m pytest
-
-    - name: Publish results to coveralls upon success on Mac/Linux
-      if: ${{ matrix.os != 'windows-latest' }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-           cd ..
-           coverage combine
-           coverage report -m
-           coveralls --rcfile=apexpy/setup.cfg --service=github
+           coverage run -m pytest
+           coverage report
+           coverage xml
+           mv coverage.xml apexpy\.
 
-    - name: Publish results to coveralls upon success on Windows
-      if: ${{ matrix.os == 'windows-latest' }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-           cd ..
-           coverage combine
-           coverage report -m
-           coveralls --rcfile=apexpy\setup.cfg --service=github
+    - name: Publish results to coveralls upon success
+      uses: coverallsapp/github-action@v2
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        flag-name: run=${{ join(matrix.*, '-') }}
+        parallel: true
+        format: cobertura
 
     - name: Create a Windows wheel
       if: ${{ matrix.os == 'windows-latest' }}
@@ -112,3 +113,15 @@ jobs:
       with:
          path: dist/*.whl
          if-no-files-found: warn
+
+  finish:
+    name: Finish Coverage Analysis
+    needs: build
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    steps:
+    - name: Coveralls Finished
+      uses: coverallsapp/github-action@v2
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        parallel-finished: true

.readthedocs.yml

@@ -0,0 +1,21 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+   configuration: docs/conf.py
+
+# Declare the Python requirements required to build your docs
+# This method avoids a local build of the package
+python:
+   install:
+    - requirements: docs/requirements.txt

CHANGELOG.rst

@@ -2,8 +2,10 @@
 Changelog
 =========
 
-2.X.X (2023-XX-XX)
------------------
+2.0.2 (2024-11-XX)
+------------------
+* Updated supported Python versions (3.9-3.11)
+* Added a ReadTheDocs yaml
 * Migrate to using importlib to keep track of package data files
 
 2.0.1 (2023-04-11)

apexpy/tests/test_Apex.py

@@ -168,7 +168,7 @@ def copy_file(self, original, max_attempts=100):
             except Exception:
                 pass
 
-        return
+        return self.temp_file
 
     def test_default_datafile(self):
         """Test that the class initializes with the default datafile."""
@@ -185,11 +185,12 @@ def test_custom_datafile(self):
         del apex_out_orig
 
         # Create copy of datafile
-        self.copy_file(original_file)
+        custom_file = self.copy_file(original_file)
 
-        self.apex_out = apexpy.Apex(datafile=self.temp_file)
-        assert self.apex_out.datafile == self.temp_file
+        apex_out = apexpy.Apex(datafile=custom_file)
+        assert apex_out.datafile == custom_file
 
+        os.remove(custom_file)
         return
 
     def test_init_with_bad_datafile(self):
@@ -201,8 +202,8 @@ def test_init_with_bad_datafile(self):
 
     def test_default_fortranlib(self):
         """Test that the class initializes with the default fortranlib."""
-        self.apex_out = apexpy.Apex()
-        assert os.path.isfile(self.apex_out.fortranlib)
+        apex_out = apexpy.Apex()
+        assert os.path.isfile(apex_out.fortranlib)
         return
 
     def test_custom_fortranlib(self):
@@ -214,11 +215,12 @@ def test_custom_fortranlib(self):
         del apex_out_orig
 
         # Create copy of datafile
-        self.copy_file(original_lib)
+        custom_lib = self.copy_file(original_lib)
 
-        self.apex_out = apexpy.Apex(fortranlib=self.temp_file)
-        assert self.apex_out.fortranlib == self.temp_file
+        apex_out = apexpy.Apex(fortranlib=custom_lib)
+        assert apex_out.fortranlib == custom_lib
 
+        os.remove(custom_lib)
         return
 
     def test_init_with_bad_fortranlib(self):
@@ -230,8 +232,8 @@ def test_init_with_bad_fortranlib(self):
 
     def test_igrf_fn(self):
         """Test the default igrf_fn."""
-        self.apex_out = apexpy.Apex()
-        assert os.path.isfile(self.apex_out.igrf_fn)
+        apex_out = apexpy.Apex()
+        assert os.path.isfile(apex_out.igrf_fn)
         return
 
     def test_repr_eval(self):

docs/installation.rst

@@ -13,9 +13,9 @@ The recommended (and most straightforward) method for users to install
 
     pip install apexpy
 
-You should be able to import :py:mod:`apexpy` and run basic conversions as shown in the
-examples.  If you get errors or warnings upon importing, see below for more
-advanced options and troubleshooting.
+You should be able to import :py:mod:`apexpy` and run basic conversions as shown
+in the examples.  If you get errors or warnings upon importing, see below for
+more advanced options and troubleshooting.
 
 
 .. _installation-tested:
@@ -26,7 +26,10 @@ Tested environments
 The package has been tested with the following setups (others might work, too):
 
 * Windows (64 bit Python), Linux (64 bit), and Mac (64 bit)
-* Python 3.7, 3.8, 3.9, 3.10
+* Python 3.9, 3.10, 3.11
+
+Note that :py:mod:`apexpy` is NOT currently compatable with Python 3.12 or 
+`NumPy 2.0 <https://numpy.org/doc/stable/numpy_2_0_migration_guide.html#numpy-2-migration-guide>`_.  
 
 
 Advanced Installation

pyproject.toml

@@ -17,11 +17,11 @@ description = "A Python wrapper for Apex coordinates"
 maintainers = [
     {name = "Angeline G. Burrell", email = "[email protected]"},
 ]
-requires-python = ">=3.7"
+requires-python = ">=3.9,<3.12"
 dependencies = [
     # TODO: update to "pin-compatible" once possible, see
     # https://github.com/FFY00/meson-python/issues/29
-    "numpy>=1.19.5",
+    "numpy>=1.19.5,<2",
 ]
 readme = "README.rst"
 keywords = [
@@ -43,10 +43,9 @@ classifiers = [
     "Programming Language :: Fortran",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Software Development :: Libraries",
     "Topic :: Scientific/Engineering :: Physics",
@@ -64,9 +63,11 @@ apexpy = {reference = 'apexpy.__main__:main', type = 'console'}
 
 [project.optional-dependencies]
 test = [
+  "coverage",
+  "flake8",
   "pytest",
   "pytest-cov",
-  "pytest-xdist",
+  "pytest-xdist"
   ]
 doc = ["sphinx>=1.3", "sphinx-rtd-theme"]
 

setup.cfg

@@ -27,10 +27,9 @@ classifiers =
   Operating System :: MacOS :: MacOS X
   Programming Language :: Python
   Programming Language :: Python :: 3
-  Programming Language :: Python :: 3.7
-  Programming Language :: Python :: 3.8
   Programming Language :: Python :: 3.9
   Programming Language :: Python :: 3.10
+  Programming Language :: Python :: 3.11
   Programming Language :: Python :: Implementation :: CPython
   Topic :: Scientific/Engineering :: Physics
   Topic :: Utilities