From 028fd98717bb30d07fd50f5b6e2443d55da042e3 Mon Sep 17 00:00:00 2001 From: tsutterley Date: Thu, 17 Aug 2023 08:28:36 -0700 Subject: [PATCH 01/10] chore: bump version to 2.0.7 docs: slimmer build to prevent RTD overutilization --- doc/source/release_notes/release-v2.0.7.rst | 10 ++++++++++ requirements.txt | 2 -- version.txt | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 doc/source/release_notes/release-v2.0.7.rst diff --git a/doc/source/release_notes/release-v2.0.7.rst b/doc/source/release_notes/release-v2.0.7.rst new file mode 100644 index 00000000..5c52715b --- /dev/null +++ b/doc/source/release_notes/release-v2.0.7.rst @@ -0,0 +1,10 @@ +################## +`Release v2.0.7`__ +################## + +* ``feat``: added model parameters for CATS2008-v2023 (`#229 `_) +* ``refactor``: changed ESR netCDF4 format to TMD3 format (`#229 `_) +* ``fix``: remove possible `crs` variables from output netCDF4 fields list (`#229 `_) +* ``ci``: bump actions to python 3.11 (`#229 `_) + +.. __: https://github.com/tsutterley/pyTMD/releases/tag/2.0.7 diff --git a/requirements.txt b/requirements.txt index 28ab2556..378807cc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,3 @@ -gdal -h5py lxml netCDF4 numpy diff --git a/version.txt b/version.txt index 157e54f3..f1547e6d 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.0.6 +2.0.7 From b7faaef0c39d60144777ef25eaca97fb7af11243 Mon Sep 17 00:00:00 2001 From: tsutterley Date: Thu, 17 Aug 2023 08:44:46 -0700 Subject: [PATCH 02/10] docs: switch to RTD `build.os` https://blog.readthedocs.com/use-build-os-config/ --- readthedocs.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/readthedocs.yml b/readthedocs.yml index 88553a1b..9579c428 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -7,10 +7,9 @@ version: 2 # Configuration for the documentation build process build: - image: latest -python: - version: 3.7 - system_packages: true + os: "ubuntu-22.04" + tools: + python: "miniconda3-4.7" # Build documentation in the docs/ directory with Sphinx sphinx: From 3dd61571d8cf83d059475d4ebd662f1d8fc1eae3 Mon Sep 17 00:00:00 2001 From: tsutterley Date: Thu, 17 Aug 2023 09:01:51 -0700 Subject: [PATCH 03/10] docs: slimmer environment --- doc/environment.yml | 2 -- pyTMD/tools.py | 22 +++++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/doc/environment.yml b/doc/environment.yml index e7a8b5d7..be77567f 100644 --- a/doc/environment.yml +++ b/doc/environment.yml @@ -8,8 +8,6 @@ dependencies: - graphviz - jplephem - lxml - - matplotlib - - notebook - numpy - numpydoc - pip diff --git a/pyTMD/tools.py b/pyTMD/tools.py index c5cf1be5..73e4a650 100644 --- a/pyTMD/tools.py +++ b/pyTMD/tools.py @@ -1,7 +1,7 @@ #!/usr/bin/env python u""" tools.py -Written by Tyler Sutterley (05/2023) +Written by Tyler Sutterley (08/2023) Jupyter notebook, user interface and plotting tools PYTHON DEPENDENCIES: @@ -17,6 +17,7 @@ https://github.com/matplotlib/matplotlib UPDATE HISTORY: + Updated 08/2023: place matplotlib within try/except statements Updated 05/2023: don't set a default directory for tide models Updated 04/2023: using pathlib to define and expand paths Updated 01/2023: use debug level logging instead of import warnings @@ -33,14 +34,6 @@ import logging import datetime import numpy as np -import matplotlib -matplotlib.rcParams['axes.linewidth'] = 2.0 -matplotlib.rcParams["animation.html"] = "jshtml" -import matplotlib.cm as cm -import matplotlib.colorbar -import matplotlib.animation -import matplotlib.pyplot as plt -import matplotlib.colors as colors import pyTMD.io.model # attempt imports @@ -56,6 +49,17 @@ import ipywidgets except (ImportError, ModuleNotFoundError) as exc: logging.debug("ipywidgets not available") +try: + import matplotlib + matplotlib.rcParams['axes.linewidth'] = 2.0 + matplotlib.rcParams["animation.html"] = "jshtml" + import matplotlib.cm as cm + import matplotlib.colorbar + import matplotlib.animation + import matplotlib.pyplot as plt + import matplotlib.colors as colors +except (ImportError, ModuleNotFoundError) as exc: + logging.debug("matplotlib not available") try: import pyproj except (ImportError, ModuleNotFoundError) as exc: From b927d010e58d5cfd74b66a46f1368eac72e8cbca Mon Sep 17 00:00:00 2001 From: tsutterley Date: Thu, 17 Aug 2023 09:03:28 -0700 Subject: [PATCH 04/10] Update environment.yml --- doc/environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/environment.yml b/doc/environment.yml index be77567f..e20592ac 100644 --- a/doc/environment.yml +++ b/doc/environment.yml @@ -6,7 +6,6 @@ dependencies: - fontconfig - freetype - graphviz - - jplephem - lxml - numpy - numpydoc From ddf79750fc67fbb22fafcaec5c180560c48a409b Mon Sep 17 00:00:00 2001 From: tsutterley Date: Thu, 17 Aug 2023 09:19:15 -0700 Subject: [PATCH 05/10] docs: add RTD fixes to release notes --- doc/source/release_notes/release-v2.0.7.rst | 1 + pyTMD/io/OTIS.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/source/release_notes/release-v2.0.7.rst b/doc/source/release_notes/release-v2.0.7.rst index 5c52715b..6179bc7e 100644 --- a/doc/source/release_notes/release-v2.0.7.rst +++ b/doc/source/release_notes/release-v2.0.7.rst @@ -6,5 +6,6 @@ * ``refactor``: changed ESR netCDF4 format to TMD3 format (`#229 `_) * ``fix``: remove possible `crs` variables from output netCDF4 fields list (`#229 `_) * ``ci``: bump actions to python 3.11 (`#229 `_) +* ``docs``: docs: `switch to RTD `_ ``build.os`` (`#230 `_) .. __: https://github.com/tsutterley/pyTMD/releases/tag/2.0.7 diff --git a/pyTMD/io/OTIS.py b/pyTMD/io/OTIS.py index dee0c72f..592d6524 100644 --- a/pyTMD/io/OTIS.py +++ b/pyTMD/io/OTIS.py @@ -180,8 +180,8 @@ def extract_constants( Tide model file type to read - ``'ATLAS'``: reading a global solution with localized solutions - - ``'TMD3'``: combined global or local netCDF4 solution - ``'OTIS'``: combined global or local solution + - ``'TMD3'``: combined global or local netCDF4 solution apply_flexure: bool, default False Apply ice flexure scaling factor to height constituents @@ -485,8 +485,8 @@ def read_constants( Tide model file type to read - ``'ATLAS'``: reading a global solution with localized solutions - - ``'TMD3'``: combined global or local netCDF4 solution - ``'OTIS'``: combined global or local solution + - ``'TMD3'``: combined global or local netCDF4 solution apply_flexure: bool, default False Apply ice flexure scaling factor to height constituents @@ -1101,8 +1101,8 @@ def read_constituents( Tide model file type to read - ``'ATLAS'``: reading a global solution with localized solutions - - ``'TMD3'``: combined global or local netCDF4 solution - ``'OTIS'``: combined global or local solution + - ``'TMD3'``: combined global or local netCDF4 solution Returns ------- From d5f319425144140fbc9a4e2380cbe239ef09e630 Mon Sep 17 00:00:00 2001 From: tsutterley Date: Thu, 17 Aug 2023 09:35:55 -0700 Subject: [PATCH 06/10] Update release-v2.0.7.rst --- doc/source/release_notes/release-v2.0.7.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/release_notes/release-v2.0.7.rst b/doc/source/release_notes/release-v2.0.7.rst index 6179bc7e..5bdc64f8 100644 --- a/doc/source/release_notes/release-v2.0.7.rst +++ b/doc/source/release_notes/release-v2.0.7.rst @@ -6,6 +6,6 @@ * ``refactor``: changed ESR netCDF4 format to TMD3 format (`#229 `_) * ``fix``: remove possible `crs` variables from output netCDF4 fields list (`#229 `_) * ``ci``: bump actions to python 3.11 (`#229 `_) -* ``docs``: docs: `switch to RTD `_ ``build.os`` (`#230 `_) +* ``docs``: `switch to RTD `_ ``build.os`` configuration (`#230 `_) .. __: https://github.com/tsutterley/pyTMD/releases/tag/2.0.7 From 238ad59754d30c7087223cefc1650b567f6a2bff Mon Sep 17 00:00:00 2001 From: tsutterley Date: Thu, 17 Aug 2023 13:08:16 -0700 Subject: [PATCH 07/10] refactor: place PyYAML behind try/except statement to reduce build size --- doc/source/release_notes/release-v1.0.2.7.rst | 2 +- doc/source/release_notes/release-v1.0.2.9.rst | 4 +-- doc/source/release_notes/release-v1.0.5.rst | 2 +- doc/source/release_notes/release-v1.0.7.rst | 2 +- doc/source/release_notes/release-v1.1.3.rst | 2 +- doc/source/release_notes/release-v2.0.0.rst | 4 +-- doc/source/release_notes/release-v2.0.1.rst | 28 +++++++++---------- doc/source/release_notes/release-v2.0.2.rst | 2 +- doc/source/release_notes/release-v2.0.3.rst | 4 +-- doc/source/release_notes/release-v2.0.4.rst | 2 +- doc/source/release_notes/release-v2.0.5.rst | 2 +- doc/source/release_notes/release-v2.0.7.rst | 5 ++-- pyTMD/spatial.py | 6 +++- requirements.txt | 1 - 14 files changed, 35 insertions(+), 31 deletions(-) diff --git a/doc/source/release_notes/release-v1.0.2.7.rst b/doc/source/release_notes/release-v1.0.2.7.rst index 3e2bf474..c6b3957e 100644 --- a/doc/source/release_notes/release-v1.0.2.7.rst +++ b/doc/source/release_notes/release-v1.0.2.7.rst @@ -2,7 +2,7 @@ `Release v1.0.2.7`__ #################### -- Added download CATS2008 and read program check +- Added download `CATS2008` and read program check - Added comparison with Antarctic tide gauges (AntTG) and RMS values from `King et al. (2011) `_ - Updated testing suite to directly call Matlab program through ``octave`` (and ``oct2py``) - Will compare the python and matlab versions for most Antarctic station sites diff --git a/doc/source/release_notes/release-v1.0.2.9.rst b/doc/source/release_notes/release-v1.0.2.9.rst index 457e8b60..c51fbbf6 100644 --- a/doc/source/release_notes/release-v1.0.2.9.rst +++ b/doc/source/release_notes/release-v1.0.2.9.rst @@ -2,8 +2,8 @@ `Release v1.0.2.9`__ #################### -- added test for GOT models using perth3 outputs from GOT4.7 -- GOT4.7 tide model data is stored on s3 +- added test for GOT models using perth3 outputs from `GOT4.7` +- `GOT4.7` tide model data is stored on s3 - convert times for FES models to Dynamic time (`TT`) - add equilibrium tide program - add program for calculating equilibrium tides for Operation IceBridge diff --git a/doc/source/release_notes/release-v1.0.5.rst b/doc/source/release_notes/release-v1.0.5.rst index 38fa6bad..b895c27c 100644 --- a/doc/source/release_notes/release-v1.0.5.rst +++ b/doc/source/release_notes/release-v1.0.5.rst @@ -6,7 +6,7 @@ - ``fix``: Operation IceBridge functions for geotrajectory outputs - ``feat``: try to get grid mapping attributes from netCDF4 and HDF5 - ``refactor``: adjust longitude convention based on model longitude -- ``feat``: add TPXO9-atlas-v5 to standard models +- ``feat``: add `TPXO9-atlas-v5` to standard models - ``feat``: add tide program for ATL10 freeboard files - ``feat``: added function to calculate a tidal time series diff --git a/doc/source/release_notes/release-v1.0.7.rst b/doc/source/release_notes/release-v1.0.7.rst index 514cc950..6073052f 100644 --- a/doc/source/release_notes/release-v1.0.7.rst +++ b/doc/source/release_notes/release-v1.0.7.rst @@ -8,7 +8,7 @@ - ``feat``: added Greenland 1km model (`Gr1kmTM`) to list of models - ``feat``: added field_mapping options to netCDF4 and HDF5 reads - ``refactor``: changed keyword arguments to camel case -- ``refactor``: use pypi versions of ICESat-2 and ATM1b tools +- ``refactor``: use ``pypi`` versions of ICESat-2 and ATM1b tools - ``docs``: add paragraph about delta times .. __: https://github.com/tsutterley/pyTMD/releases/tag/1.0.7 diff --git a/doc/source/release_notes/release-v1.1.3.rst b/doc/source/release_notes/release-v1.1.3.rst index c7650f4b..2c174c46 100644 --- a/doc/source/release_notes/release-v1.1.3.rst +++ b/doc/source/release_notes/release-v1.1.3.rst @@ -2,7 +2,7 @@ `Release v1.1.3`__ ################## -- ``docs``: use sphinx-argparse v0.4.0 +- ``docs``: use ``sphinx-argparse`` v0.4.0 - ``refactor``: use f-strings for ascii and verbose output - ``chore``: automatic time and bulletin updates diff --git a/doc/source/release_notes/release-v2.0.0.rst b/doc/source/release_notes/release-v2.0.0.rst index c49d3e7f..dc89f34b 100644 --- a/doc/source/release_notes/release-v2.0.0.rst +++ b/doc/source/release_notes/release-v2.0.0.rst @@ -2,7 +2,7 @@ `Release v2.0.0`__ ################## -- ``refactor``: single implicit import of pyTMD tools (`#130 `_) +- ``refactor``: single implicit import of ``pyTMD`` tools (`#130 `_) - ``refactor``: reorganization of tide model readers under ``io`` (`#132 `_) - ``refactor``: placed interpolation routines into new module (`#141 `_) - ``refactor``: move ``model`` class to ``io`` @@ -15,7 +15,7 @@ - ``docs``: update documentation for new structure - ``docs``: standardized citation format throughout docstrings - ``docs``: add release notes for all prior public releases -- ``docs``: add new pyTMD logo +- ``docs``: add new ``pyTMD`` logo - ``test``: read header from OPT test file and compare more variables - ``test``: add tests for ``io`` methods diff --git a/doc/source/release_notes/release-v2.0.1.rst b/doc/source/release_notes/release-v2.0.1.rst index de4db3a5..2625f0c2 100644 --- a/doc/source/release_notes/release-v2.0.1.rst +++ b/doc/source/release_notes/release-v2.0.1.rst @@ -2,19 +2,19 @@ `Release v2.0.1`__ ################## -* feat: default geotiff output as cog -* feat: added default field mapping for reading from netCDF4/HDF5 (`#152 `_) -* feat: split netCDF4 output for ``grid`` and ``drift`` types to address `#154 `_ (`#159 `_) -* feat: use debug level logging instead of import warnings in ``tools.py`` to address `#156 `_ (`#159 `_) -* feat: add ``time series`` type to address `#153 `_ (`#162 `_) -* fix: verify warnings have type and only show once `#146 `_ (`#147 `_) -* fix: pin ``scipy`` to 1.9.3 for `scipy/scipy#17716 `_ (`#147 `_) -* fix: use default context from ``utilities`` module (`#147 `_) -* fix: include more possible dimension names for ``grid`` and ``time series`` outputs (`#163 `_) -* test: add default field mapping test (`#152 `_) -* test: validate gridded and time series netCDF/HDF5 io (`#163 `_) -* docs: update documentation colors to match new logo -* docs: don't have metavar for ``--tide`` to address `#155 `_ (`#159 `_) -* docs: updated v2 link for Arc2km to address `#157 `_ (`#159 `_) +* ``feat``: default geotiff output as cog +* ``feat``: added default field mapping for reading from netCDF4/HDF5 (`#152 `_) +* ``feat``: split netCDF4 output for ``grid`` and ``drift`` types to address `#154 `_ (`#159 `_) +* ``feat``: use debug level logging instead of import warnings in ``tools.py`` to address `#156 `_ (`#159 `_) +* ``feat``: add ``time series`` type to address `#153 `_ (`#162 `_) +* ``fix``: verify warnings have type and only show once `#146 `_ (`#147 `_) +* ``fix``: pin ``scipy`` to 1.9.3 for `scipy/scipy#17716 `_ (`#147 `_) +* ``fix``: use default context from ``utilities`` module (`#147 `_) +* ``fix``: include more possible dimension names for ``grid`` and ``time series`` outputs (`#163 `_) +* ``test``: add default field mapping test (`#152 `_) +* ``test``: validate gridded and time series netCDF/HDF5 io (`#163 `_) +* ``docs``: update documentation colors to match new logo +* ``docs``: don't have metavar for ``--tide`` to address `#155 `_ (`#159 `_) +* ``docs``: updated v2 link for Arc2km to address `#157 `_ (`#159 `_) .. __: https://github.com/tsutterley/pyTMD/releases/tag/2.0.1 diff --git a/doc/source/release_notes/release-v2.0.2.rst b/doc/source/release_notes/release-v2.0.2.rst index fa214904..6544522f 100644 --- a/doc/source/release_notes/release-v2.0.2.rst +++ b/doc/source/release_notes/release-v2.0.2.rst @@ -2,7 +2,7 @@ `Release v2.0.2`__ ################## -* ``chore``: bump scipy pin to 1.10.1 to address `#148 `_ (`#167 `_) +* ``chore``: bump ``scipy`` pin to 1.10.1 to address `#148 `_ (`#167 `_) * ``refactor``: remove deprecated functions (`#171 `_) .. __: https://github.com/tsutterley/pyTMD/releases/tag/2.0.2 diff --git a/doc/source/release_notes/release-v2.0.3.rst b/doc/source/release_notes/release-v2.0.3.rst index 37cc8099..597d94dc 100644 --- a/doc/source/release_notes/release-v2.0.3.rst +++ b/doc/source/release_notes/release-v2.0.3.rst @@ -7,7 +7,7 @@ * ``feat``: added option to change IERS mean or secular pole convention (`#176 `_) * ``feat``: added 2018 IERS secular pole convention (`#176 `_) * ``feat``: set ellipsoid name and output units as ``constants`` attributes (`#176 `_) -* ``feat``: add ``'HAMTIDE11'`` model to address `#179 `_ (`#180 `_) +* ``feat``: add `HAMTIDE11` model to address `#179 `_ (`#180 `_) * ``feat``: adding work for computing solid earth tides (`#186 `_) * ``feat``: add solid Earth tide (SET) correction program for files (`#186 `_) * ``feat``: add function for phase angles (`#186 `_) @@ -15,7 +15,7 @@ * ``refactor``: renamed coordinate reference system conversion functions (`#174 `_) * ``refactor``: mapping notebooks for matplotlib 3.5 (`#182 `_) * ``fix``: setting directories for ``FES`` currents within ``model`` class (`#182 `_) -* ``fix``: check if datetime before converting to seconds (`#186 `_) +* ``fix``: check if ``datetime`` before converting to seconds (`#186 `_) * ``fix``: copy inputs in cartesian to not modify original arrays (`#186 `_) * ``docs``: remove deprecated ``.rst`` files (`#174 `_) * ``docs``: update documentation to denote new solid Earth tide (SET) functionality (`#186 `_) diff --git a/doc/source/release_notes/release-v2.0.4.rst b/doc/source/release_notes/release-v2.0.4.rst index 31b9fcb5..51d1281b 100644 --- a/doc/source/release_notes/release-v2.0.4.rst +++ b/doc/source/release_notes/release-v2.0.4.rst @@ -40,7 +40,7 @@ * ``test``: add test for more derived attributes in model (`#188 `_) * ``test``: parse all multiple file types for constituent names (`#190 `_) * ``test``: test permanent tide conversion in solid earth (`#190 `_) -* ``test``: get IODEM3 from AWS s3 (NSIDC is currently down) (`#192 `_) +* ``test``: get `IODEM3` from AWS s3 (NSIDC is currently down) (`#192 `_) * ``test``: add ``timescale`` checks for conversions and constants (`#198 `_) * ``test``: add test for leap seconds in ``timescale`` (`#198 `_) diff --git a/doc/source/release_notes/release-v2.0.5.rst b/doc/source/release_notes/release-v2.0.5.rst index cc1195f6..48771470 100644 --- a/doc/source/release_notes/release-v2.0.5.rst +++ b/doc/source/release_notes/release-v2.0.5.rst @@ -8,7 +8,7 @@ * ``feat``: add functions to retrieve and revoke Earthdata tokens (`#209 `_) * ``fix``: don't set a default directory in ``tools`` for `#202 `_ (`#203 `_) * ``fix``: setting path to output file in scripts where not defined as an argument -* ``fix``: extract variables for FES2012 ocean tide (`#212 `_) +* ``fix``: extract variables for `FES2012` ocean tide (`#212 `_) * ``docs``: update solid earth section (`#205 `_) * ``test``: add a time zone case to parsing (`#203 `_) diff --git a/doc/source/release_notes/release-v2.0.7.rst b/doc/source/release_notes/release-v2.0.7.rst index 5bdc64f8..245f6367 100644 --- a/doc/source/release_notes/release-v2.0.7.rst +++ b/doc/source/release_notes/release-v2.0.7.rst @@ -2,8 +2,9 @@ `Release v2.0.7`__ ################## -* ``feat``: added model parameters for CATS2008-v2023 (`#229 `_) -* ``refactor``: changed ESR netCDF4 format to TMD3 format (`#229 `_) +* ``feat``: added model parameters for `CATS2008-v2023` (`#229 `_) +* ``refactor``: changed ``ESR`` netCDF4 format to ``TMD3`` format (`#229 `_) +* ``refactor``: place more imports behind try/except statements to reduce RTD build size (`#230 `_) * ``fix``: remove possible `crs` variables from output netCDF4 fields list (`#229 `_) * ``ci``: bump actions to python 3.11 (`#229 `_) * ``docs``: `switch to RTD `_ ``build.os`` configuration (`#230 `_) diff --git a/pyTMD/spatial.py b/pyTMD/spatial.py index 4549dbc2..e5fbea1b 100644 --- a/pyTMD/spatial.py +++ b/pyTMD/spatial.py @@ -23,6 +23,7 @@ UPDATE HISTORY: Updated 08/2023: remove possible crs variables from output fields list + place PyYAML behind try/except statement to reduce build size Updated 05/2023: use datetime parser within pyTMD.time module Updated 04/2023: copy inputs in cartesian to not modify original arrays added iterative methods for converting from cartesian to geodetic @@ -70,7 +71,6 @@ import copy import gzip import uuid -import yaml import logging import pathlib import datetime @@ -91,6 +91,10 @@ import netCDF4 except (ImportError, ModuleNotFoundError) as exc: logging.debug("netCDF4 not available") +try: + import yaml +except (ImportError, ModuleNotFoundError) as exc: + logging.debug("PyYAML not available") def case_insensitive_filename(filename: str | pathlib.Path): """ diff --git a/requirements.txt b/requirements.txt index 378807cc..11623e1f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,5 @@ netCDF4 numpy pyproj python-dateutil -pyyaml scipy>=1.10.1 setuptools_scm From 2a60c8bd80ea4e77048129f52c4916b8a86265cc Mon Sep 17 00:00:00 2001 From: tsutterley Date: Thu, 17 Aug 2023 14:38:42 -0700 Subject: [PATCH 08/10] ci: try build with mamba --- .github/workflows/auto-update-bulletin-a.yml | 18 +++++++++++------- .github/workflows/auto-update-files.yml | 18 +++++++++++------- .github/workflows/python-request.yml | 18 +++++++++++------- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/.github/workflows/auto-update-bulletin-a.yml b/.github/workflows/auto-update-bulletin-a.yml index 7827137b..ce10c5d5 100644 --- a/.github/workflows/auto-update-bulletin-a.yml +++ b/.github/workflows/auto-update-bulletin-a.yml @@ -25,16 +25,20 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up conda ${{ matrix.python-version }} - uses: conda-incubator/setup-miniconda@v2 + - name: Set up mamba ${{ matrix.python-version }} + uses: mamba-org/setup-micromamba@v1 with: - auto-update-conda: true - python-version: ${{ matrix.python-version }} - activate-environment: pyTMD + micromamba-version: '1.3.1-0' environment-file: environment.yml - - name: Create conda Test Environment + init-shell: bash + environment-name: pyTMD + cache-environment: true + post-cleanup: 'all' + create-args: >- + python=${{ matrix.python-version }} + - name: Create mamba Test Environment run: | - conda install flake8 pytest pytest-cov cython + mamba install flake8 pytest pytest-cov cython - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names diff --git a/.github/workflows/auto-update-files.yml b/.github/workflows/auto-update-files.yml index bd9e5ae9..078bdc8c 100644 --- a/.github/workflows/auto-update-files.yml +++ b/.github/workflows/auto-update-files.yml @@ -25,16 +25,20 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up conda ${{ matrix.python-version }} - uses: conda-incubator/setup-miniconda@v2 + - name: Set up mamba ${{ matrix.python-version }} + uses: mamba-org/setup-micromamba@v1 with: - auto-update-conda: true - python-version: ${{ matrix.python-version }} - activate-environment: pyTMD + micromamba-version: '1.3.1-0' environment-file: environment.yml - - name: Create conda Test Environment + init-shell: bash + environment-name: pyTMD + cache-environment: true + post-cleanup: 'all' + create-args: >- + python=${{ matrix.python-version }} + - name: Create mamba Test Environment run: | - conda install flake8 pytest pytest-cov cython + mamba install flake8 pytest pytest-cov cython - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names diff --git a/.github/workflows/python-request.yml b/.github/workflows/python-request.yml index e9cbd34d..26def25b 100644 --- a/.github/workflows/python-request.yml +++ b/.github/workflows/python-request.yml @@ -26,16 +26,20 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up conda ${{ matrix.python-version }} - uses: conda-incubator/setup-miniconda@v2 + - name: Set up mamba ${{ matrix.python-version }} + uses: mamba-org/setup-micromamba@v1 with: - auto-update-conda: true - python-version: ${{ matrix.python-version }} - activate-environment: pyTMD + micromamba-version: '1.3.1-0' environment-file: environment.yml - - name: Create conda Test Environment + init-shell: bash + environment-name: pyTMD + cache-environment: true + post-cleanup: 'all' + create-args: >- + python=${{ matrix.python-version }} + - name: Create mamba Test Environment run: | - conda install openblas-devel flake8 pytest pytest-cov cython jplephem octave oct2py + mamba install openblas-devel flake8 pytest pytest-cov cython jplephem octave oct2py - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names From c2e5f4b5faa45920178a99ecc0e62dd85b328151 Mon Sep 17 00:00:00 2001 From: tsutterley Date: Thu, 17 Aug 2023 14:45:57 -0700 Subject: [PATCH 09/10] additional args in build --- .github/workflows/auto-update-bulletin-a.yml | 7 ++++--- .github/workflows/auto-update-files.yml | 7 ++++--- .github/workflows/python-request.yml | 11 ++++++++--- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.github/workflows/auto-update-bulletin-a.yml b/.github/workflows/auto-update-bulletin-a.yml index ce10c5d5..633c68fe 100644 --- a/.github/workflows/auto-update-bulletin-a.yml +++ b/.github/workflows/auto-update-bulletin-a.yml @@ -36,9 +36,10 @@ jobs: post-cleanup: 'all' create-args: >- python=${{ matrix.python-version }} - - name: Create mamba Test Environment - run: | - mamba install flake8 pytest pytest-cov cython + flake8 + pytest + pytest-cov + cython - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names diff --git a/.github/workflows/auto-update-files.yml b/.github/workflows/auto-update-files.yml index 078bdc8c..0aaf3c1c 100644 --- a/.github/workflows/auto-update-files.yml +++ b/.github/workflows/auto-update-files.yml @@ -36,9 +36,10 @@ jobs: post-cleanup: 'all' create-args: >- python=${{ matrix.python-version }} - - name: Create mamba Test Environment - run: | - mamba install flake8 pytest pytest-cov cython + flake8 + pytest + pytest-cov + cython - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names diff --git a/.github/workflows/python-request.yml b/.github/workflows/python-request.yml index 26def25b..316e2b5b 100644 --- a/.github/workflows/python-request.yml +++ b/.github/workflows/python-request.yml @@ -36,10 +36,15 @@ jobs: cache-environment: true post-cleanup: 'all' create-args: >- + openblas-devel python=${{ matrix.python-version }} - - name: Create mamba Test Environment - run: | - mamba install openblas-devel flake8 pytest pytest-cov cython jplephem octave oct2py + flake8 + pytest + pytest-cov + cython + jplephem + octave + oct2py - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names From 205edbbab0984cfd2dc3a38dd9f5f217ab0da4e4 Mon Sep 17 00:00:00 2001 From: tsutterley Date: Thu, 17 Aug 2023 14:50:30 -0700 Subject: [PATCH 10/10] Update python-request.yml --- .github/workflows/python-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-request.yml b/.github/workflows/python-request.yml index 316e2b5b..fe074fc7 100644 --- a/.github/workflows/python-request.yml +++ b/.github/workflows/python-request.yml @@ -36,7 +36,7 @@ jobs: cache-environment: true post-cleanup: 'all' create-args: >- - openblas-devel + blas python=${{ matrix.python-version }} flake8 pytest