Merge branch 'master' into request-verify

Author: tomkralidis

.github/workflows/main.yml

@@ -4,13 +4,13 @@ on: [ push, pull_request ]
 
 jobs:
   main:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         python-version: ["3.12"]
     steps:
     - uses: actions/checkout@master
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       name: Setup Python ${{ matrix.python-version }}
       with:
         python-version: ${{ matrix.python-version }}
@@ -19,15 +19,15 @@ jobs:
     - name: Install requirements 📦
       run: |
         pip3 install -e .
-        pip3 install -r requirements.txt
-        pip3 install -r requirements-dev.txt
-        pip3 install -r docs/requirements.txt
+        pip3 install ".[dev]"
+        pip3 install ".[docs]"
+        pip3 install ".[test]"
     - name: run tests ⚙️
-      run: python3 -m pytest
+      run: pytest tests/
     - name: run tests in offline mode
       if: matrix.python-version == '3.12'
       run: |
-          python3 -m pytest \
+          pytest tests/\
             -m "not online" \
             --disable-socket \
             --deselect="tests/doctests/wcs_thredds.txt::wcs_thredds.txt" \
@@ -45,4 +45,4 @@ jobs:
     - name: build docs 🏗️
       run: cd docs && make html
     - name: run flake8 ⚙️
-      run: flake8 owslib
+      run: flake8 owslib/

.github/workflows/windows.yml

@@ -10,16 +10,17 @@ jobs:
         python-version: ["3.12"]
     steps:
     - uses: actions/checkout@master
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       name: Setup Python ${{ matrix.python-version }}
       with:
         python-version: ${{ matrix.python-version }}
 
     - name: Install requirements 📦
       run: |
         pip install -e .
-        pip install -r requirements.txt
-        pip install -r requirements-dev.txt
+        pip install ".[dev]"
+        pip install ".[docs]"
+        pip install ".[test]"
 
     - name: run tests ⚙️
-      run: python -m pytest
+      run: pytest tests/

MANIFEST.in

@@ -1,5 +1,2 @@
-include LICENSE
-include *.md
-include *.rst
-include *.txt
-recursive-exclude tests *
+# this file controls the contents of sdist
+prune tests

README.md

@@ -31,7 +31,7 @@ pip3 install OWSLib
 
 ### Dependencies
 
-Dependencies are listed in [requirements.txt](requirements.txt). Dependencies
+Dependencies are listed in [pyproject.toml](pyproject.toml). Dependencies
 are automatically installed during OWSLib installation.
 
 ### Installing OWSLib
@@ -147,8 +147,8 @@ Releasing
 
 ```bash
   # update version
-  vi owslib/__init__.py
-  git commit -m 'update release version' owslib/__init__.py
+  vi pyproject.toml  # update [project]/version
+  git commit -m 'update release version' owslib/pyproject.toml
   # push changes
   git push origin master
   git tag -a x.y.z -m 'tagging OWSLib release x.y.z'

docs/source/_static/iem_goes_ir.png

@@ -10,14 +10,45 @@ You can find out about software metrics at the OWSLib OpenHub page at https://ww
 Testing
 -------
 
+Create a virtual environment and install OWSLib with the development dependencies:
+
 .. code-block:: bash
 
-    # install requirements
-    pip3 install -r requirements.txt
-    pip3 install -r requirements-dev.txt # needed for tests only
+    python3 -m venv owslibenv
+    source owslibenv/bin/activate
+
+    git clone https://github.com/geopython/OWSLib.git
+    cd OWSLib
+
+    pip install -e ".[dev]"
+
+Run the test suite:
+
+.. code-block:: bash
 
-    # run tests
     python3 -m pytest
 
-    # linting
-    flake8 owslib/wmts.py
+Run linting:
+
+.. code-block:: bash
+
+    flake8 owslib/
+
+Documentation
+-------------
+
+To build the documentation locally:
+
+.. code-block:: bash
+
+    pip install -e ".[docs]"
+    cd docs && make html
+
+Release
+-------
+
+To install the release tooling:
+
+.. code-block:: bash
+
+    pip install -e ".[release]"

docs/source/_static/jpl_mosaic_visb.jpg

@@ -9,71 +9,66 @@ Find out what a WMS has to offer. Service metadata:
 .. code-block:: python
 
   >>> from owslib.wms import WebMapService
-  >>> wms = WebMapService('http://wms.jpl.nasa.gov/wms.cgi', version='1.1.1')
+  >>> wms = WebMapService('https://mesonet.agron.iastate.edu/cgi-bin/mapserv/mapserv?map=/opt/iem/data/wms/goes/west_ir.map&SERVICE=WMS&REQUEST=GetCapabilities')
   >>> wms.identification.type
   'OGC:WMS'
   >>> wms.identification.version
   '1.1.1'
   >>> wms.identification.title
-  'JPL Global Imagery Service'
+  'IEM GOES IR WMS Service'
   >>> wms.identification.abstract
-  'WMS Server maintained by JPL, worldwide satellite imagery.'
+  'IEM generated CONUS composite of GOES IR Satellite.'
 
 Available layers:
 
 .. code-block:: python
 
   >>> list(wms.contents)
-  ['global_mosaic', 'global_mosaic_base', 'us_landsat_wgs84', 'srtm_mag', 'daily_terra_721', 'daily_aqua_721', 'daily_terra_ndvi', 'daily_aqua_ndvi', 'daily_terra', 'daily_aqua', 'BMNG', 'modis', 'huemapped_srtm', 'srtmplus', 'worldwind_dem', 'us_ned', 'us_elevation', 'us_colordem']
+  ['goes_west_ir', 'west_ir_4km', 'west_ir_4km_gray']
 
 Details of a layer:
 
 .. code-block:: python
 
-  >>> wms['global_mosaic'].title
-  'WMS Global Mosaic, pan sharpened'
-  >>> wms['global_mosaic'].queryable
+  >>> wms['goes_west_ir'].title
+  'IEM GOES IR WMS Service'
+  >>> wms['goes_west_ir'].queryable
   0
-  >>> wms['global_mosaic'].opaque
+  >>> wms['goes_west_ir'].opaque
   0
-  >>> wms['global_mosaic'].boundingBox
-  >>> wms['global_mosaic'].boundingBoxWGS84
-  (-180.0, -60.0, 180.0, 84.0)
-  >>> wms['global_mosaic'].crsOptions
-  ['EPSG:4326', 'AUTO:42003']
-  >>> wms['global_mosaic'].styles
-  {'pseudo_bright': {'title': 'Pseudo-color image (Uses IR and Visual bands, 542 mapping), gamma 1.5'}, 'pseudo': {'title': '(default) Pseudo-color image, pan sharpened (Uses IR and Visual bands, 542 mapping), gamma 1.5'}, 'visual': {'title': 'Real-color image, pan sharpened (Uses the visual bands, 321 mapping), gamma 1.5'}, 'pseudo_low': {'title': 'Pseudo-color image, pan sharpened (Uses IR and Visual bands, 542 mapping)'}, 'visual_low': {'title': 'Real-color image, pan sharpened (Uses the visual bands, 321 mapping)'}, 'visual_bright': {'title': 'Real-color image (Uses the visual bands, 321 mapping), gamma 1.5'}}
+  >>> wms['goes_west_ir'].boundingBox
+  (-126.0, 24.0, -66.0, 50.0, 'EPSG:4326')
+  >>> wms['goes_west_ir'].boundingBoxWGS84
+  (-126.0, 24.0, -66.0, 50.0)
+  >>> wms['goes_west_ir'].crsOptions
+  ['EPSG:3857', 'EPSG:4326']
 
 Available methods, their URLs, and available formats:
 
 .. code-block:: python
 
   >>> [op.name for op in wms.operations]
-  ['GetCapabilities', 'GetMap']
+  ['GetCapabilities', 'GetMap', 'GetFeatureInfo', 'DescribeLayer', 'GetLegendGraphic', 'GetStyles']
   >>> wms.getOperationByName('GetMap').methods
-  {'Get': {'url': 'http://wms.jpl.nasa.gov/wms.cgi?'}}
+  [{'type': 'Get', 'url': 'https://mesonet.agron.iastate.edu/cgi-bin/mapserv/mapserv?map=/opt/iem/data/wms/goes/west_ir.map&SERVICE=WMS&'}, {'type': 'Post', 'url': 'https://mesonet.agron.iastate.edu/cgi-bin/mapserv/mapserv?map=/opt/iem/data/wms/goes/west_ir.map&SERVICE=WMS&'}]
   >>> wms.getOperationByName('GetMap').formatOptions
-  ['image/jpeg', 'image/png', 'image/geotiff', 'image/tiff']
+  ['image/png', 'image/jpeg', 'image/png; mode=8bit', 'image/vnd.jpeg-png', 'image/vnd.jpeg-png8', 'application/x-pdf', 'image/svg+xml', 'image/tiff', 'application/json']
 
 That's everything needed to make a request for imagery:
 
 .. code-block:: python
 
-  >>> img = wms.getmap(   layers=['global_mosaic'],
-  ...                     styles=['visual_bright'],
-  ...                     srs='EPSG:4326',
-  ...                     bbox=(-112, 36, -106, 41),
-  ...                     size=(300, 250),
-  ...                     format='image/jpeg',
-  ...                     transparent=True
-  ...                     )
-  >>> out = open('jpl_mosaic_visb.jpg', 'wb')
-  >>> out.write(img.read())
-  >>> out.close()
+  >>> img = wms.getmap(layers=['goes_west_ir'],
+                       size=(300, 250),
+                       bbox=(-126, 24, -66, 50),
+                       srs='EPSG:4326',
+                       format='image/png')
+  >>> with open('iem_goes_ir.png', 'wb') as fh:
+  ...     fh.write(img.read())
 
 Result:
 
-.. image:: _static/jpl_mosaic_visb.jpg
+.. image:: _static/iem_goes_ir.png
    :width: 300px
    :height: 250px
    :alt: WMS GetMap generated by OWSLib

docs/source/development.rst

@@ -1 +1,12 @@
-__version__ = '0.35.0'
+# -*- coding: ISO-8859-15 -*-
+# =============================================================================
+# Copyright (c) 2026 Tom Kralidis
+#
+# Authors : Tom Kralidis <tomkralidis@gmail.com>
+#
+# Contact email: tomkralidis@gmail.com
+# =============================================================================
+
+from owslib.util import get_package_version
+
+__version__ = get_package_version()

docs/source/usage.rst

@@ -849,15 +849,26 @@ def __init__(self, record):
         for i in record.findall(util.nspath_eval('dc:rights', namespaces)):
             self.rights.append(util.testXMLValue(i))
 
-        val = record.find(util.nspath_eval('dct:spatial', namespaces))
-        self.spatial = util.testXMLValue(val)
-
         val = record.find(util.nspath_eval('ows:BoundingBox', namespaces))
         if val is not None:
             self.bbox = ows.BoundingBox(val, namespaces['ows'])
         else:
             self.bbox = None
 
+        val = record.find(util.nspath_eval('dct:spatial', namespaces))
+        self.spatial = None
+        if val is not None:
+            val = util.testXMLValue(val)
+            bbox_tokens = val.split(',')
+            if len(bbox_tokens) == 4:
+                self.bbox = ows.BoundingBox(None, namespaces['ows'])
+                self.bbox.minx = bbox_tokens[0]
+                self.bbox.miny = bbox_tokens[1]
+                self.bbox.maxx = bbox_tokens[2]
+                self.bbox.maxy = bbox_tokens[3]
+            else:
+                self.spatial = val
+
         val = record.find(util.nspath_eval('ows:WGS84BoundingBox', namespaces))
         if val is not None:
             self.bbox_wgs84 = ows.WGS84BoundingBox(val, namespaces['ows'])