From f6b6144c16eb170f149c4f7d132da93912b4c19d Mon Sep 17 00:00:00 2001 From: "Jason A. Regina" Date: Thu, 21 Nov 2024 15:26:42 -0600 Subject: [PATCH] Update HT super package dependencies (#266) * lock versions of compatible subpackages, bump to 2.3.0 * remove deprecated packages add svi client * ignore deprec packages * update citation --- CITATION.cff | 4 ++-- Makefile | 6 +++--- pyproject.toml | 9 +++++---- src/hydrotools/_version.py | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 6a33f339..1b09bc89 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -8,6 +8,6 @@ authors: given-names: "Austin" orcid: "https://orcid.org/0000-0002-7670-1298" title: "OWPHydroTools" -version: 2.2.2 -date-released: 2021-12-15 +version: 2.3.0 +date-released: 2024-11-21 url: "https://github.com/noaa-owp/hydrotools" diff --git a/Makefile b/Makefile index 214b3f9d..f9f35ddd 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ PYTHON=$(PYENV)/bin/python3 NAMESPACE_DIR := ./python/ PACKAGE := hydrotools -SUBPACKAGES := _restclient[develop] nwis_client[develop] caches[develop] nwm_client_new[develop] events[develop] metrics[develop] nwm_client[develop] +SUBPACKAGES := _restclient[develop] nwis_client[develop] nwm_client_new[develop] events[develop] metrics[develop] svi_client[develop] # discard `extras_require` qualifies from subpackage names (e.g. [develop]) SUBPACKAGES_WITHOUT_EXTRA_REQUIRE = $(shell echo $(SUBPACKAGES) | sed 's|\[[^][]*\]||g') @@ -29,10 +29,10 @@ help: .DEFAULT_GOAL := help tests: install - $(PYTHON) -m pytest -s -m "not slow" + $(PYTHON) -m pytest -s -m "not slow" --ignore=./python/caches --ignore=./python/nwm_client all-tests: install - $(PYTHON) -m pytest -s + $(PYTHON) -m pytest -s --ignore=./python/caches --ignore=./python/nwm_client install: $(PYENV)/bin/activate $(PYTHON) -m pip install $(SUBPACKAGES_PATHS) diff --git a/pyproject.toml b/pyproject.toml index 50b3885b..ae1d898b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,10 +25,11 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "hydrotools.nwis_client>=3.2.1", - "hydrotools.nwm_client[gcp]>=5.0.3", - "hydrotools.events>=1.1.5", - "hydrotools.metrics>=1.2.3", + "hydrotools.nwis_client==3.4.1", + "hydrotools.nwm_client_new==7.4.4", + "hydrotools.events==1.1.7", + "hydrotools.metrics==1.3.5", + "hydrotools.svi_client==0.0.3" ] dynamic = ["version"] diff --git a/src/hydrotools/_version.py b/src/hydrotools/_version.py index f394e699..55e47090 100644 --- a/src/hydrotools/_version.py +++ b/src/hydrotools/_version.py @@ -1 +1 @@ -__version__ = "2.2.3" +__version__ = "2.3.0"