Merge pull request #142 from aaraney/move_versioning_inside_package

Move package/subpackage version inside package source
NOAA-OWP · Oct 29, 2021 · 5a55567 · 5a55567
2 parents 14a70cf + 0871dd7
commit 5a55567
Show file tree

Hide file tree

Showing 24 changed files with 35 additions and 8 deletions.
diff --git a/python/_restclient/setup.cfg b/python/_restclient/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = hydrotools._restclient
-version = 3.0.4
+version = attr: hydrotools._restclient._version.__version__
 author = Austin Raney
 author_email = [email protected]
 description = General REST api client with built in request caching and retries.

diff --git a/python/_restclient/src/hydrotools/_restclient/__init__.py b/python/_restclient/src/hydrotools/_restclient/__init__.py
@@ -1,3 +1,6 @@
+# removing __version__ import will cause build to fail. see: https://github.com/pypa/setuptools/issues/1724#issuecomment-627241822
+from ._version import __version__
+
 from ._restclient import RestClient
 from .utilities import Alias, AliasGroup
 from .urllib import Url, Variadic

diff --git a/python/_restclient/src/hydrotools/_restclient/_version.py b/python/_restclient/src/hydrotools/_restclient/_version.py
@@ -0,0 +1 @@
+__version__ = "3.0.4"
diff --git a/python/caches/setup.cfg b/python/caches/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = hydrotools.caches
-version = 0.1.3
+version = attr: hydrotools.caches._version.__version__
 author = Jason A. Regina
 author_email = [email protected]
 description = Variety of object caching utilities for OWPHydroTools.

diff --git a/python/caches/src/hydrotools/caches/__init__.py b/python/caches/src/hydrotools/caches/__init__.py
@@ -0,0 +1,2 @@
+# removing __version__ import will cause build to fail. see: https://github.com/pypa/setuptools/issues/1724#issuecomment-627241822
+from ._version import __version__
diff --git a/python/caches/src/hydrotools/caches/_version.py b/python/caches/src/hydrotools/caches/_version.py
@@ -0,0 +1 @@
+__version__ = "0.1.3"
diff --git a/python/events/setup.cfg b/python/events/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = hydrotools.events
-version = 1.1.5
+version = attr: hydrotools.events.event_detection._version.__version__
 author = Jason A. Regina
 author_email = [email protected]
 description = Various methods to support event-based evaluations.

diff --git a/python/events/src/hydrotools/events/event_detection/__init__.py b/python/events/src/hydrotools/events/event_detection/__init__.py
@@ -0,0 +1,2 @@
+# removing __version__ import will cause build to fail. see: https://github.com/pypa/setuptools/issues/1724#issuecomment-627241822
+from ._version import __version__
diff --git a/python/events/src/hydrotools/events/event_detection/_version.py b/python/events/src/hydrotools/events/event_detection/_version.py
@@ -0,0 +1 @@
+__version__ = "1.1.5"
diff --git a/python/gcp_client/setup.cfg b/python/gcp_client/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = hydrotools.gcp_client
-version = 4.1.2
+version = attr: hydrotools.gcp_client._version.__version__
 author = Jason A. Regina
 author_email = [email protected]
 description = Retrieve National Water Model data from Google Cloud Platform.

diff --git a/python/gcp_client/src/hydrotools/gcp_client/__init__.py b/python/gcp_client/src/hydrotools/gcp_client/__init__.py
@@ -1,3 +1,6 @@
+# removing __version__ import will cause build to fail. see: https://github.com/pypa/setuptools/issues/1724#issuecomment-627241822
+from ._version import __version__
+
 from .gcp import NWMDataService
 import warnings
 

diff --git a/python/gcp_client/src/hydrotools/gcp_client/_version.py b/python/gcp_client/src/hydrotools/gcp_client/_version.py
@@ -0,0 +1 @@
+__version__ = "4.1.2"
diff --git a/python/metrics/setup.cfg b/python/metrics/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = hydrotools.metrics
-version = 1.0.3
+version = attr: hydrotools.metrics._version.__version__
 author = Jason A. Regina
 author_email = [email protected]
 description = Variety of standard model evaluation metrics.

diff --git a/python/metrics/src/hydrotools/metrics/__init__.py b/python/metrics/src/hydrotools/metrics/__init__.py
@@ -0,0 +1,2 @@
+# removing __version__ import will cause build to fail. see: https://github.com/pypa/setuptools/issues/1724#issuecomment-627241822
+from ._version import __version__
diff --git a/python/metrics/src/hydrotools/metrics/_version.py b/python/metrics/src/hydrotools/metrics/_version.py
@@ -0,0 +1 @@
+__version__ = "1.0.3"
diff --git a/python/nwis_client/setup.cfg b/python/nwis_client/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = hydrotools.nwis_client
-version = 3.0.6
+version = attr: hydrotools.nwis_client._version.__version__
 author = Austin Raney
 author_email = [email protected]
 description = A convenient interface to the USGS NWIS Instantaneous Values (IV) REST Service API.

diff --git a/python/nwis_client/src/hydrotools/nwis_client/__init__.py b/python/nwis_client/src/hydrotools/nwis_client/__init__.py
@@ -1 +1,4 @@
+# removing __version__ import will cause build to fail. see: https://github.com/pypa/setuptools/issues/1724#issuecomment-627241822
+from ._version import __version__
+
 from .iv import IVDataService
diff --git a/python/nwis_client/src/hydrotools/nwis_client/_version.py b/python/nwis_client/src/hydrotools/nwis_client/_version.py
@@ -0,0 +1 @@
+__version__ = "3.0.6"
diff --git a/python/nwm_client/setup.cfg b/python/nwm_client/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = hydrotools.nwm_client
-version = 5.0.1
+version = attr: hydrotools.nwm_client._version.__version__
 author = Jason A. Regina
 author_email = [email protected]
 description = Retrieve National Water Model data from various sources.

diff --git a/python/nwm_client/src/hydrotools/nwm_client/__init__.py b/python/nwm_client/src/hydrotools/nwm_client/__init__.py
@@ -0,0 +1,2 @@
+# removing __version__ import will cause build to fail. see: https://github.com/pypa/setuptools/issues/1724#issuecomment-627241822
+from ._version import __version__
diff --git a/python/nwm_client/src/hydrotools/nwm_client/_version.py b/python/nwm_client/src/hydrotools/nwm_client/_version.py
@@ -0,0 +1 @@
+__version__ = "5.0.1"
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = hydrotools
-version = 2.1.2
+version = attr: hydrotools._version.__version__
 author = Jason A. Regina and Austin Raney
 author_email = [email protected]
 description = Suite of tools for retrieving USGS NWIS observations and evaluating National Water Model (NWM) data.

diff --git a/src/hydrotools/__init__.py b/src/hydrotools/__init__.py
@@ -0,0 +1,2 @@
+# removing __version__ import will cause build to fail. see: https://github.com/pypa/setuptools/issues/1724#issuecomment-627241822
+from ._version import __version__
diff --git a/src/hydrotools/_version.py b/src/hydrotools/_version.py
@@ -0,0 +1 @@
+__version__ = "2.1.2"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# removing __version__ import will cause build to fail. see: https://github.com/pypa/setuptools/issues/1724#issuecomment-627241822
		from ._version import __version__