Merge pull request #801 from Unidata/dependabot-github_actions-pypa-g…

…h-action-pypi-publish-1.11.0

MNT: (deps): Bump pypa/gh-action-pypi-publish from 1.8.10 to 1.11.0

.github/workflows/docs.yml

@@ -75,7 +75,6 @@ jobs:
       run: |
         sudo apt-get install libgeos-dev libproj-dev proj-bin
         python -m pip install --upgrade pip setuptools
-        python -m pip install --no-binary :all: shapely
         python -m pip install -c ci/${{ matrix.dep-versions }} numpy
         python -m pip install -r ci/doc_requirements.txt -r ci/extra_requirements.txt -c ci/${{ matrix.dep-versions }}
 

.github/workflows/release.yml

@@ -57,4 +57,4 @@ jobs:
         cp packages-*/* dist/
 
     - name: Publish Package
-      uses: pypa/gh-action-pypi-publish@v1.8.10
+      uses: pypa/gh-action-pypi-publish@v1.11.0

.github/workflows/tests-pypi.yml

@@ -28,9 +28,6 @@ jobs:
           - python-version: 3.9
             dep-versions: requirements.txt
             no-extras: 'No Extras'
-          - python-version: 3.9
-            dep-versions: Prerelease
-            no-extras: ''
 
     steps:
     # We check out only a limited depth and then pull tags to save time

ci/doc_requirements.txt

@@ -1,6 +1,6 @@
-cartopy==0.18.0
 matplotlib==3.5.3
 metpy==1.2.0
+pint==0.18
 scipy==1.7.3
 sphinx==5.2.3
 sphinx_rtd_theme==1.0.0

docs/conf.py

@@ -41,18 +41,18 @@
     'myst_parser'
 ]
 
-sphinx_gallery_conf = {
-    'doc_module': ('siphon',),
-    'reference_url': {
-        'siphon': None,
-        },
-    'examples_dirs': [os.path.join('..', 'examples')],
-    'gallery_dirs': ['examples'],
-    'filename_pattern': '\.py',
-    'backreferences_dir': 'api/generated',
-    'default_thumb_file': os.path.join('_static', 'siphon_150x150_white_bg.png'),
-    'abort_on_example_error': True
-}
+# sphinx_gallery_conf = {
+#     'doc_module': ('siphon',),
+#     'reference_url': {
+#         'siphon': None,
+#         },
+#     'examples_dirs': [os.path.join('..', 'examples')],
+#     'gallery_dirs': ['examples'],
+#     'filename_pattern': '\.py',
+#     'backreferences_dir': 'api/generated',
+#     'default_thumb_file': os.path.join('_static', 'siphon_150x150_white_bg.png'),
+#     'abort_on_example_error': True
+# }
 
 # Set up mapping for other projects' docs
 intersphinx_mapping = {

docs/index.rst

@@ -4,11 +4,12 @@
 
   installguide
   api/index
-  examples/index
   developerguide
   CONTRIBUTING
   citing
 
+..  examples/index
+
 ======
 Siphon
 ======
@@ -18,7 +19,7 @@ data services. Much of Siphon's current functionality focuses on access to
 data hosted on a `THREDDS Data Server`__. It also provides clients to a variety
 of simple web services.
 
-__ https://www.unidata.ucar.edu/software/thredds/current/tds/
+__ https://www.unidata.ucar.edu/software/tds/
 
 Siphon follows `semantic versioning <https://semver.org>`_ in its version number. With our
 current 0.x version, that implies that Siphon's APIs (application programming interfaces) are

examples/Basic_Usage.py

@@ -24,4 +24,4 @@
 # Basic HTTP authentication can also be used by using the HTTP session manager
 # and setting some default options for HTTP sessions
 session_manager.set_session_options(auth=('username', 'password'))
-cat = TDSCatalog('https://rda.ucar.edu/thredds/catalog.xml')
+cat = TDSCatalog('https://thredds.rda.ucar.edu/thredds/catalog/catalog.xml')

examples/ncss/NCSS_Cartopy_Example.py

@@ -111,7 +111,7 @@
 plt.colorbar(cf, ax=ax, fraction=0.032)
 
 # Make a title with the time value
-ax.set_title(f'Temperature forecast (\u00b0F) for {time_val:%d %B %Y %H:%MZ}',
+ax.set_title(f'Temperature forecast (\u00b0F) for {time_val: %d %B %Y %H%MZ}',
              fontsize=20)
 
 # Plot markers for each lat/long to show grid points for 0.25 deg GFS

pyproject.toml

@@ -0,0 +1,5 @@
+requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+version_scheme = "post-release"

setup.cfg

@@ -32,7 +32,6 @@ project_urls =
 package_dir =
     = src
 packages = find:
-setup_requires = setuptools_scm
 python_requires = >=3.6
 install_requires =
     beautifulsoup4>=4.6

setup.py

@@ -20,4 +20,4 @@
     print(error)  # noqa: T201
     sys.exit(1)
 
-setup(use_scm_version={'version_scheme': 'post-release'})
+setup()

src/siphon/cdmr/ncstream.py

@@ -140,7 +140,7 @@ def read_messages(fobj, magic_table):
         if func is not None:
             messages.append(func(fobj))
         else:
-            log.error('Unknown magic: ' + str(' '.join(f'{b:02x}'
+            log.error('Unknown magic: ' + str(' '.join(f'{b: 02x}'
                                                        for b in bytearray(magic))))
 
     return messages

src/siphon/http_util.py

@@ -490,7 +490,7 @@ def get(self, path, params=None):
             else:
                 text = resp.text
             raise requests.HTTPError(f'Error accessing {resp.request.url}\n'
-                                     f'Server Error ({resp.status_code:d}: {text})')
+                                     f'Server Error ({resp.status_code: d}: {text})')
         return resp
 
     def _get_metadata(self):

src/siphon/simplewebservice/iastate.py

@@ -176,7 +176,7 @@ def _get_data_raw(self, time, site_id, pressure=None):
         if not (json_data['profiles'] and json_data['profiles'][0]['profile']):
             message = 'No data available '
             if time is not None:
-                message += f'for {time:%Y-%m-%d %HZ} '
+                message += f'for {time: %Y-%m-%d %HZ} '
             if site_id is not None:
                 message += f'for station {site_id}'
             if pressure is not None:

tests/test_catalog.py

@@ -407,4 +407,4 @@ def test_nasa_hyrax_dataset():
 
     # Checks #gh-759
     assert len(cat.datasets) == 161
-    assert 'epic_1b_20240413222222_03.h5' in cat.datasets
+    assert 'epic_1b_20240413222222_03.h5' in cat.datasets