Merge pull request #3 from pymt-lab/mdpiper/update-parameters

Update metadata and testing CI

.github/workflows/test.yml

@@ -20,17 +20,15 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.9]
+        python-version: ["3.11"]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: conda-incubator/setup-miniconda@v3
         with:
-          auto-update-conda: true
+          miniforge-version: latest
           python-version: ${{ matrix.python-version }}
-          channels: conda-forge
-          channel-priority: true
 
       - name: Show conda installation info
         run: |
@@ -39,18 +37,14 @@ jobs:
 
       - name: Install requirements
         run: |
-          conda install mamba
-          mamba install --file=requirements-build.txt --file=requirements-library.txt
-          mamba list
+          conda install --file=requirements-build.txt --file=requirements-library.txt --file=requirements-testing.txt
+          conda list
 
       - name: Build and install package
         run: |
           pip install -e .
 
-      - name: Install testing dependencies
-        run: mamba install --file=requirements-testing.txt
-
       - name: Test
         run: |
           python -c 'import pymt_geotiff'
-          bmi-test pymt_geotiff.bmi:GeoTiff --config-file=examples/bmi-geotiff.yaml --root-dir=examples -vvv
+          make test

Makefile

@@ -58,7 +58,7 @@ pretty:
 	black setup.py pymt_geotiff examples docs
 
 test: ## run tests quickly with the default Python
-	bmi-test pymt_geotiff.bmi:GeoTiff --config-file=examples/bmi-geotiff.yaml --root-dir=examples -vvv
+	bmi-test pymt_geotiff.bmi:GeoTiff --config-file=${PWD}/examples/bmi-geotiff.yaml --root-dir=examples -vvv
 
 test-all: ## run tests on every Python version with tox
 	tox

docs/conf.py

@@ -48,9 +48,9 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"pymt_geotiff"
-copyright = u"2021, Mark Piper"
-author = u"Mark Piper"
+project = "pymt_geotiff"
+copyright = "2021, Mark Piper"
+author = "Mark Piper"
 
 # The version info for the project you're documenting, acts as replacement
 # for |version| and |release|, also used in various other places throughout
@@ -149,8 +149,8 @@
     (
         master_doc,
         "pymt_geotiff.tex",
-        u"pymt_geotiff Documentation",
-        u"Mark Piper",
+        "pymt_geotiff Documentation",
+        "Mark Piper",
         "manual",
     ),
 ]
@@ -160,7 +160,7 @@
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [(master_doc, "pymt_geotiff", u"pymt_geotiff Documentation", [author], 1)]
+man_pages = [(master_doc, "pymt_geotiff", "pymt_geotiff Documentation", [author], 1)]
 
 
 # -- Options for Texinfo output ----------------------------------------
@@ -172,7 +172,7 @@
     (
         master_doc,
         "pymt_geotiff",
-        u"pymt_geotiff Documentation",
+        "pymt_geotiff Documentation",
         author,
         "pymt_geotiff",
         "One line description of project.",

examples/bmi-geotiff.yaml

@@ -1,2 +1,2 @@
 bmi-geotiff:
-  filename: https://github.com/mapbox/rasterio/raw/master/tests/data/RGB.byte.tif
+  filename: https://github.com/rasterio/rasterio/raw/refs/heads/main/tests/data/RGB.byte.tif

examples/pymt_geotiff-bmi_ex.py

@@ -1,4 +1,5 @@
 """An example of running the babelized GeoTiff library through its BMI."""
+
 import numpy as np
 
 from pymt_geotiff import GeoTiff

examples/pymt_geotiff-pymt_ex.py

@@ -1,4 +1,5 @@
 """Run the GeoTiff library in pymt."""
+
 import numpy as np
 from pymt.models import GeoTiff
 

meta/GeoTiff/parameters.yaml

@@ -3,4 +3,3 @@ filename:
   value:
     type: string
     default: https://csdms.colorado.edu/data/SRTMGL3_36.738884_-120.168457_38.091337_-118.465576.tif
-    units: 1

setup.py

@@ -16,7 +16,7 @@ def read(filename):
         return fp.read()
 
 
-long_description = u"\n\n".join(
+long_description = "\n\n".join(
     [read("README.rst"), read("CREDITS.rst"), read("CHANGES.rst")]
 )
 
@@ -33,12 +33,17 @@ def read(filename):
         "Development Status :: 4 - Beta",
         "Intended Audience :: Science/Research",
         "License :: OSI Approved :: MIT License",
-        "Operating System :: MacOS :: MacOS X",
-        "Operating System :: POSIX :: Linux",
-        "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.8",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Topic :: Scientific/Engineering :: Physics",
     ],
     keywords=["bmi", "pymt"],
+    requires_python=">=3.10",
     install_requires=open("requirements.txt", "r").read().splitlines(),
     packages=find_packages(),
     entry_points=entry_points,