gwpy 3.0.10__tar.gz → 3.0.12__tar.gz

{gwpy-3.0.10 → gwpy-3.0.12}/.gitlab/ci/compatibility.yml

@@ -16,7 +16,7 @@ spec:
       description: "Extra options to pass to pytest"
       type: string
     minimum_python_version:
-      default: "3.8"
+      default: "3.9"
       description: "Python version for minimum dependency compatibility check"
       type: string
 
@@ -45,6 +45,14 @@ include:
       pip_options: "--upgrade --upgrade-strategy=eager --pre"
       pytest_options: $[[ inputs.pytest_options ]]
 
+  # configure dependency scanning
+  - component: gitlab.com/components/dependency-scanning/main@~latest
+    inputs:
+      # dependency-scanning needs to run _after_ the test job that generated
+      # the requirements.txt file
+      stage: $[[ inputs.stage ]]
+      job_name: "dependency-scanning"
+
 .compat_rules:
   rules:
     - if: '$CI_COMMIT_MESSAGE =~ /\[skip compat\]/'
@@ -70,10 +78,28 @@ compat_minimum:
     - sed -i -E
         -e 's/requires-python = "==/requires-python = ">=/'
         pyproject.toml
+    # use pip-compile to generate requirements.txt for dependency scanning
+    - python -m venv .piptools
+    - .piptools/bin/python -m pip install pip-tools
+    - .piptools/bin/pip-compile
+        --extra test
+        --output-file requirements.txt
+        --verbose
+    - rm -rf .piptools
+  artifacts:
+    paths:
+      - .coverage*
+      - requirements.txt
 
 # test against latest/pre-release versions
 compat_experimental:
   extends:
     - .compat_experimental
     - .compat_rules
-  image: python:3
+  image: python:3.12
+
+# run dependency scanning against minimum specified requirements
+# (most likely to highlight issues)
+dependency-scanning:
+  needs: ["compat_minimum"]
+  rules: !reference [.compat_rules, rules]

{gwpy-3.0.10 → gwpy-3.0.12}/.gitlab/ci/python-dist.yml

@@ -23,14 +23,15 @@ build:
   before_script:
     - python -m pip install
         build
-        setuptools
   script:
     # if running a default branch push pipeline, strip the +g<HASH> suffix
     # from the version to give something that test.pypi.org will accept
     - |
       if [ "${CI_COMMIT_TAG}" = "" ] && [ "${CI_PIPELINE_SOURCE}" = "push" ] && [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" ]; then
-        VERSION=$(python3 -c "from setuptools import setup; setup()" --version)
-        export SETUPTOOLS_SCM_PRETEND_VERSION=${VERSION%%+*}
+        python -m pip install -q setuptools setuptools-scm
+        echo "Real version is '$(python -m setuptools_scm)'";
+        export SETUPTOOLS_SCM_PRETEND_VERSION=$(python3 -c "from setuptools import setup; setup(use_scm_version={'local_scheme': 'no-local-version'})" --version);
+        echo "Pretending version is '${SETUPTOOLS_SCM_PRETEND_VERSION}'";
       fi
     # generate the distributions
     - python -m build . -o .

gwpy-3.0.12/.gitlab/ci/qa.yml

@@ -0,0 +1,109 @@
+# -- Quality Assurance jobs
+
+spec:
+  inputs:
+    stage:
+      default: test
+      description: "Pipeline stage in which to add jobs"
+      type: string
+    project_dir:
+      default: "."
+      description: "Project directory to scan"
+      type: string
+    requirements:
+      default: ""
+      description: "Extra requirements to install with pip"
+      type: string
+    ruff_options:
+      default: ""
+      description: "Extra options to pass to ruff check"
+      type: string
+    mypy_options:
+      default: ""
+      description: "Extra options to pass to mypy"
+      type: string
+
+---
+
+include:
+  - component: gitlab.com/components/sast/sast@~latest
+    inputs:
+      stage: $[[ inputs.stage ]]
+      run_advanced_sast: true
+    rules:
+      - if: '$GITLAB_FEATURES =~ /\bsast_advanced\b/'
+  - component: gitlab.com/components/sast/sast@~latest
+    inputs:
+      stage: $[[ inputs.stage ]]
+      run_advanced_sast: false
+    rules:
+      - if: '$GITLAB_FEATURES !~ /\bsast_advanced\b/'
+  - local: .gitlab/ci/rules.yml
+
+.qa:
+  extends: .rules_qa_security
+  stage: $[[ inputs.stage ]]
+  needs: []
+
+gitlab-advanced-sast:
+  needs: !reference [.qa, needs]
+  rules:
+    # skip if we just can't run advanced sast
+    - if: '$GITLAB_FEATURES !~ /\bsast_advanced\b/'
+      when: never
+    - !reference [.qa, rules]
+
+semgrep-sast:
+  needs: !reference [.qa, needs]
+  rules:
+    # skip if we can run advanced sast
+    - if: '$GITLAB_FEATURES =~ /\bsast_advanced\b/'
+      when: never
+    - !reference [.qa, rules]
+
+ruff:
+  extends: .qa
+  image: python
+  script:
+    - python -m pip install
+          ruff
+          $[[ inputs.requirements ]]
+    - python -m ruff check
+          $[[ inputs.ruff_options ]]
+          $[[ inputs.project_dir ]]
+          --exit-zero
+    - python -m ruff check
+          $[[ inputs.ruff_options ]]
+          $[[ inputs.project_dir ]]
+          --exit-zero
+          --output-format gitlab
+          --output-file gl-ruff.json
+  artifacts:
+    reports:
+      codequality: gl-ruff.json
+
+mypy:
+  extends: .qa
+  image: python
+  script:
+    - python -m pip install
+          mypy
+          mypy-gitlab-code-quality
+    # run mypy and print to console
+    - python -m mypy
+          $[[ inputs.mypy_options ]]
+          --install-types
+          --non-interactive
+          $[[ inputs.project_dir ]]
+      || exitcode="$?"
+    # run mypy again and format as code quality report
+    - python -m mypy
+          $[[ inputs.mypy_options ]]
+          --no-error-summary
+          $[[ inputs.project_dir ]]
+      | mypy-gitlab-code-quality > gl-mypy-code-quality.json || true
+    # propagate fatal exitcode
+    - if [ "${exitcode:-0}" -gt 1 ]; then exit ${exitcode}; fi
+  artifacts:
+    reports:
+      codequality: gl-mypy-code-quality.json

{gwpy-3.0.10 → gwpy-3.0.12}/.gitlab/ci/rules.yml

@@ -15,10 +15,15 @@ spec:
   rules:
     - if: $CI_COMMIT_TAG
 
-# default branch
+# default branch (all pipelines)
 .rules_default:
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+
+# default branch push (not schedules)
+.rules_default_push:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
 
 # schedules on default branch
 .rules_default_schedule:
@@ -54,7 +59,7 @@ spec:
 .rules_build:
   rules:
     - !reference [.rules_tag, rules]
-    - !reference [.rules_default, rules]
+    - !reference [.rules_default_push, rules]
     - !reference [.rules_merge_request, rules]
     - !reference [.rules_branch, rules]
 
@@ -68,3 +73,9 @@ spec:
 .rules_basic_test:
   rules:
     - !reference [.rules_branch, rules]
+
+.rules_qa_security:
+  rules:
+    - !reference [.rules_default, rules]
+    - !reference [.rules_nightly, rules]
+    - !reference [.rules_merge_request, rules]

{gwpy-3.0.10 → gwpy-3.0.12}/.gitlab/ci/test-job.yml

@@ -47,6 +47,10 @@ include:
     # store caches in .cache
     XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache"
   script:
+    # print some basic information about python
+    - python --version
+    - python -m site
+    - python -m sysconfig
     # create the cache directory (so that astropy will actually use it)
     # (this isn't just 'mkdir -p ...' because Windows)
     - python -c "import os;

{gwpy-3.0.10 → gwpy-3.0.12}/.gitlab/ci/test.yml

@@ -21,7 +21,7 @@ include:
   - local: .gitlab/ci/compatibility.yml
     inputs:
       stage: test
-      minimum_python_version: "3.8"
+      minimum_python_version: "3.9"
       pytest_options: "--color yes --cov gwpy --numprocesses auto gwpy/"
 
   # measure coverage over all jobs
@@ -35,7 +35,6 @@ include:
   parallel:
     matrix:
       - PYTHON_VERSION:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
@@ -49,6 +48,7 @@ include:
       - PYTHON_VERSION:
           - "3.10"
           - "3.11"
+          - "3.12"
 
 .brew:
   extends: .macos
@@ -115,6 +115,12 @@ python_test_macos:
   rules:
     - !reference [.macos, rules]
     - !reference [.rules_full_test, rules]
+  parallel:
+    matrix:
+      - PYTHON_VERSION:
+          - "3.10"
+          - "3.11"
+          #- "3.12" <-- cannot build ligo-segments on macOS
   before_script:
     # install Python using Homebrew
     - brew install python@${PYTHON_VERSION}
@@ -195,8 +201,6 @@ conda_test_linux:
     - !reference [.rules_full_test, rules]
   image: condaforge/miniforge3
   before_script:
-    # configure CVMFS
-    - bash -ex .gitlab/ci/init-cvmfs.sh
     # init conda
     - . $(conda info --base)/etc/profile.d/conda.sh
     # create test environment using pip2conda

{gwpy-3.0.10 → gwpy-3.0.12}/.gitlab/ci/twine.yml

@@ -13,6 +13,7 @@ include:
   - local: .gitlab/ci/rules.yml
 
 twine:
+  interruptible: false
   rules:
     - if: '$CI_COMMIT_MESSAGE =~ /\[skip deploy\]/'
       when: never
@@ -33,8 +34,6 @@ twine:
     PYPI_HOSTNAME: "pypi.org"
     # don't ask questions
     TWINE_NON_INTERACTIVE: "1"
-    # PyPI username
-    TWINE_USERNAME: "__token__"
   before_script:
     - python -m pip install id twine
   script:
@@ -42,12 +41,14 @@ twine:
     - python -m twine check *.tar.* *.whl
     # get API token
     - oidc_token=$(python -m id pypi)
-    - resp=$(curl -X POST https://${PYPI_HOSTNAME}.org/_/oidc/mint-token -d "{\"token\":\"${oidc_token}\"}")
+    - resp=$(curl -X POST https://${PYPI_HOSTNAME}/_/oidc/mint-token -d "{\"token\":\"${oidc_token}\"}")
     - api_token=$(python3 -c "import json,sys; data = json.load(sys.stdin); print(data['token'])" <<< "${resp}")
     # upload
     - python -m twine
         upload
-        --repository ${PYPI_REPOSITORY}
+        --username "__token__"
+        --password "${api_token}"
+        --repository "${PYPI_REPOSITORY}"
         ${TWINE_OPTIONS:-}
         *.tar.*
         *.whl
@@ -58,7 +59,7 @@ twine_test:
   rules:
     - if: '$CI_COMMIT_MESSAGE =~ /\[skip deploy\]/'
       when: never
-    - !reference [.rules_default, rules]
+    - !reference [.rules_default_push, rules]
   variables:
     PYPI_REPOSITORY: "testpypi"
     PYPI_HOSTNAME: "test.pypi.org"

{gwpy-3.0.10 → gwpy-3.0.12}/.gitlab-ci.yml

@@ -14,6 +14,20 @@ stages:
   - docs
   - deploy
 
+default:
+  # all jobs are, by default, interruptible
+  interruptible: true
+  # retry all jobs at most twice when gitlab-ci fails to start the job properly
+  # see https://docs.gitlab.com/ee/ci/yaml/#retry
+  retry:
+    max: 2
+    when:
+      - job_execution_timeout
+      - runner_system_failure
+      - stuck_or_timeout_failure
+  # no job should take more than an hour
+  timeout: 1h
+
 include:
   # -- Quality assurance checks
 

{gwpy-3.0.10 → gwpy-3.0.12}/CONTRIBUTING.md

@@ -130,7 +130,7 @@ branch:
 
 ### Python compatibility
 
-**GWpy code must be compatible with Python >= 3.8.**
+**GWpy code must be compatible with Python >= 3.9.**
 
 ### Style
 
@@ -138,11 +138,11 @@ This package follows [PEP 8](https://www.python.org/dev/peps/pep-0008/),
 and all code should adhere to that as far as is reasonable.
 
 The first stage in the automated testing of merge requests is a job that runs
-the [`flake8`](http://flake8.pycqa.org) linter, which checks the style of code
+the [Ruff](https://docs.astral.sh/ruff/) linter, which checks the style of code
 in the repo. You can run this locally before committing changes via:
 
 ```bash
-python3 -m flake8
+python -m ruff .
 ```
 
 ### Testing

{gwpy-3.0.10/gwpy.egg-info → gwpy-3.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: gwpy
-Version: 3.0.10
+Version: 3.0.12
 Summary: A python package for gravitational-wave astrophysics
 Author-email: Duncan Macleod <duncan.macleod@ligo.org>
 License: GPL-3.0-or-later
@@ -15,14 +15,13 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: astropy>=4.3.0
@@ -31,14 +30,15 @@ Requires-Dist: dqsegdb2
 Requires-Dist: gwdatafind>=1.1.0
 Requires-Dist: gwosc>=0.5.3
 Requires-Dist: h5py>=3.0.0
-Requires-Dist: ligo-segments>=1.0.0
+Requires-Dist: igwn-segments>=2.0.0
 Requires-Dist: ligotimegps>=1.2.1
 Requires-Dist: matplotlib>=3.3.0
-Requires-Dist: numpy>=1.19
+Requires-Dist: numpy>=1.19.5
+Requires-Dist: packaging>=24.1
 Requires-Dist: python-dateutil
 Requires-Dist: requests>=2.20.0
 Requires-Dist: scipy>=1.6.0
-Requires-Dist: tqdm>=4.10.0
+Requires-Dist: tqdm>=4.52.0
 Provides-Extra: test
 Requires-Dist: coverage[toml]>=5.0; extra == "test"
 Requires-Dist: pytest>=3.9.1; extra == "test"
@@ -70,7 +70,7 @@ Requires-Dist: uproot>=4.1.5; extra == "dev"
 Provides-Extra: conda
 Requires-Dist: lxml!=4.9.1; sys_platform == "win32" and extra == "conda"
 Requires-Dist: python-framel!=8.46.0,>=8.40.1; extra == "conda"
-Requires-Dist: python-ldas-tools-framecpp; sys_platform != "win32" and extra == "conda"
+Requires-Dist: python-ldas-tools-framecpp; (sys_platform != "win32" and python_version < "3.12") and extra == "conda"
 Requires-Dist: python-nds2-client; extra == "conda"
 
 GWpy is a collaboration-driven Python package providing tools for

{gwpy-3.0.10 → gwpy-3.0.12}/docs/conf.py

@@ -235,7 +235,7 @@ intersphinx_mapping = {
     'gwosc': ('https://gwosc.readthedocs.io/en/stable/', None),
     'h5py': ('https://docs.h5py.org/en/latest/', None),
     'ligo.skymap': ('https://lscsoft.docs.ligo.org/ligo.skymap/', None),
-    'ligo-segments': ('https://lscsoft.docs.ligo.org/ligo-segments/', None),
+    'igwn-segments': ('https://igwn-segments.readthedocs.io/en/stable/', None),
     'lscsoft-glue': ('https://lscsoft.docs.ligo.org/glue/', None),
     'matplotlib': ('https://matplotlib.org/', None),
     'numpy': ('https://numpy.org/doc/stable/', None),

{gwpy-3.0.10 → gwpy-3.0.12}/docs/install.rst

@@ -52,13 +52,13 @@ GWpy has the following strict requirements:
    |gwdatafind|_       ``>=1.1.0``
    |gwosc-mod|_        ``>=0.5.3``
    |h5py|_             ``>=3.0.0``
-   |ligo-segments|_    ``>=1.0.0``
+   |igwn-segments|_    ``>=2.0.0``
    |ligotimegps|_      ``>=1.2.1``
    |matplotlib|_       ``>=3.1.0``
-   |numpy|_            ``>=1.16.0``
+   |numpy|_            ``>=1.19.5``
    |dateutil|_
    |scipy|_            ``>=1.2.0``
-   |tqdm|_             ``>=4.10.0``
+   |tqdm|_             ``>=4.52.0``
    ==================  ===========================
 
 All of these will be installed using any of the above install methods.

{gwpy-3.0.10 → gwpy-3.0.12}/docs/references.rst

@@ -3,9 +3,6 @@
 .. |astropy| replace:: `astropy`
 .. _astropy: http://www.astropy.org/
 
-.. |CVMFS| replace:: CVMFS
-.. _CVMFS: https://cvmfs.readthedocs.io/
-
 .. |dateparser| replace:: `dateparser`
 .. _dateparser: https://dateparser.readthedocs.io
 
@@ -24,8 +21,8 @@
 .. |h5py| replace:: `h5py`
 .. _h5py: http://docs.h5py.org/en/latest/
 
-.. |ligo-segments| replace:: `ligo-segments`
-.. _ligo-segments: https://lscsoft.docs.ligo.org/ligo-segments/
+.. |igwn-segments| replace:: `igwn-segments`
+.. _igwn-segments: https://igwn-segments.readthedocs.io/
 
 .. |ligotimegps| replace:: `ligotimegps`
 .. _ligotimegps: https://github.com/gwpy/ligotimegps/
@@ -127,6 +124,12 @@
 .. |LIGO-T050017| replace:: LIGO-T050017
 .. _LIGO-T050017: https://dcc.ligo.org/LIGO-T050017/public
 
+.. |OSDF| replace:: OSDF
+.. _OSDF: https://osg-htc.org/services/osdf.html
+
+.. |OSDFl| replace:: the Open Science Data Federation (OSDF)
+.. _OSDF: https://osg-htc.org/services/osdf.html
+
 .. -- Event science summaries -------------------
 
 .. catalogues

{gwpy-3.0.10 → gwpy-3.0.12}/docs/segments/index.rst

@@ -25,7 +25,7 @@ The :class:`Segment` and :class:`SegmentList` classes
 
 GWpy provides a number of classes for generating and manipulating such
 segments, enhancing the functionality provided by the (excellent)
-:mod:`ligo.segments` package.
+|igwn-segments|_ package.
 All credits for their usefulness go to the authors of that package.
 
 These basic objects are as follows:

{gwpy-3.0.10 → gwpy-3.0.12}/docs/timeseries/io.rst

@@ -45,7 +45,8 @@ are archived in :ref:`GWF <gwpy-timeseries-io-gwf>` files stored at the
 relevant observatory.
 These data are available locally to authenticated users of the associated
 computing centres (typically collaboration members), but are also
-distributed using |CVMFS|_ and are available remotely using :ref:`gwpy-external-nds2`.
+distributed as part of |OSDFl|_ and are available remotely using
+:ref:`gwpy-external-nds2`.
 Access to these data is restricted to active collaboration members.
 
 Additionally |GWOSCl|_ hosts publicly-accessible 'open' data, with *event*

{gwpy-3.0.10 → gwpy-3.0.12}/gwpy/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.0.10'
-__version_tuple__ = version_tuple = (3, 0, 10)
+__version__ = version = '3.0.12'
+__version_tuple__ = version_tuple = (3, 0, 12)

{gwpy-3.0.10 → gwpy-3.0.12}/gwpy/io/datafind.py

@@ -22,7 +22,7 @@ Automatic discovery of file paths for both LIGO and Virgo index solutions
 (``gwdatafind`` or ``ffl``, respectvely) is supported.
 
 The functions in this module are highly reliant on having local access to
-files (either directly, or via NFS, or CVMFS).
+files (either directly, or via NFS/fuse).
 
 Data discovery using the DataFind service requires the `gwdatafind` Python
 package (a dependency of ``gwpy``), and either the ``GW_DATAFIND_SERVER``
@@ -45,7 +45,7 @@ from unittest import mock
 
 import gwdatafind
 
-from ligo.segments import segment as LigoSegment
+from igwn_segments import segment as LigoSegment
 
 from ..time import to_gps
 from . import ffldatafind

{gwpy-3.0.10 → gwpy-3.0.12}/gwpy/io/ffldatafind.py

@@ -32,7 +32,7 @@ from collections import defaultdict
 from functools import lru_cache
 from warnings import warn
 
-from ligo.segments import (
+from igwn_segments import (
     segment,
     segmentlist,
 )

{gwpy-3.0.10 → gwpy-3.0.12}/gwpy/io/tests/test_datafind.py

@@ -27,7 +27,6 @@ import pytest
 import gwdatafind
 
 from ...testing.errors import (
-    pytest_skip_cvmfs_read_error,
     pytest_skip_network_error,
 )
 from ...testing.utils import (
@@ -76,30 +75,6 @@ def _mock_gwdatafind(func):
     return wrapper
 
 
-def _gwosc_gwdatafind(func):
-    """Decorate a function to use the GWOSC GWDataFind server.
-
-    That server returns paths from CVMFS (``/cvmfs/gwosc.osgstorage.org``) so
-    we need to add various protections.
-    """
-    @mock.patch.dict(  # point GWDataFind at GWOSC server
-        "os.environ",
-        {"GWDATAFIND_SERVER": "datafind.gwosc.org:80"},
-    )
-    @pytest_skip_cvmfs_read_error  # skip CVMFS problems
-    @pytest_skip_network_error  # skip network problems
-    @pytest.mark.skipif(  # skip missing CVMFS repo
-        not os.path.isdir('/cvmfs/gwosc.osgstorage.org/'),
-        reason="GWOSC CVMFS repository not available",
-    )
-    @pytest.mark.cvmfs  # mark test as requiring cvmfs
-    @pytest.mark.requires("LDAStools.frameCPP")  # skip if no frameCPP
-    def wrapper(*args, **kwargs):
-        return func(*args, **kwargs)
-
-    return wrapper
-
-
 # -- tests --------------------------------------------------------------------
 
 @mock.patch.dict("os.environ", clear=True)
@@ -207,34 +182,6 @@ def test_find_best_frametype():
     ) == 'HW100916'
 
 
-@_gwosc_gwdatafind
-def test_find_best_frametype_with_gaps():
-    """Test that `find_best_frametype` works across gaps.
-
-    It tries to find something that covers at least some of the gap.
-    """
-    assert io_datafind.find_best_frametype(
-        "L1:GWOSC-4KHZ_R1_STRAIN",
-        1187733504,
-        1187733504 + 4097,  # one second too long
-    ) == "L1_GWOSC_O2_4KHZ_R1"
-
-
-@_gwosc_gwdatafind
-def test_find_best_frametype_with_gaps_multiple():
-    """Test that `find_best_frametype` works across gaps with multiple
-    channels.
-    """
-    assert io_datafind.find_best_frametype(
-        ("L1:GWOSC-4KHZ_R1_STRAIN", "L1:GWOSC-4KHZ_R1_DQMASK"),
-        1187733504,
-        1187733504 + 4097,  # one second too long
-    ) == {
-        "L1:GWOSC-4KHZ_R1_STRAIN": "L1_GWOSC_O2_4KHZ_R1",
-        "L1:GWOSC-4KHZ_R1_DQMASK": "L1_GWOSC_O2_4KHZ_R1",
-    }
-
-
 @pytest.mark.requires("LDAStools.frameCPP")
 @pytest_skip_network_error
 @pytest.mark.skipif(

{gwpy-3.0.10 → gwpy-3.0.12}/gwpy/plot/axes.py

@@ -39,6 +39,8 @@ from matplotlib.collections import PolyCollection
 from matplotlib.lines import Line2D
 from matplotlib.projections import register_projection
 
+from packaging.version import Version
+
 from . import (Plot, colorbar as gcbar)
 from .colors import format_norm
 from .gps import GPS_SCALES
@@ -47,6 +49,8 @@ from ..time import to_gps
 
 __author__ = 'Duncan Macleod <duncan.macleod@ligo.org>'
 
+matplotlib_version = Version(matplotlib_version)
+
 
 def log_norm(func):
     """Wrap ``func`` to handle custom gwpy keywords for a LogNorm colouring
@@ -86,7 +90,7 @@ def restore_grid(func):
     automatically removed a grid on a set of Axes. This decorator just
     undoes that.
     """
-    if matplotlib_version >= "3.7.0":
+    if matplotlib_version >= Version("3.7.0"):
         return func
 
     @wraps(func)
@@ -162,7 +166,7 @@ class Axes(_Axes):
         super().__init__(*args, **kwargs)
 
         # handle Series in `ax.plot()`
-        if matplotlib_version >= "3.8.0":
+        if matplotlib_version >= Version("3.8.0"):
             self._get_lines = PlotArgsProcessor()
         else:
             self._get_lines = PlotArgsProcessor(self)