From 604b0c178db122534a37144f0dc4b8e6198e4f87 Mon Sep 17 00:00:00 2001 From: Lucas Coppio Date: Mon, 3 Oct 2022 18:02:14 -0300 Subject: [PATCH 1/2] fix(setup.cfg): Fixed dependency that would require dist-info folder to be present in the project to load __version__ variable with current version of the code --- pyproj/__init__.py | 3 +-- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pyproj/__init__.py b/pyproj/__init__.py index 053674783..633753363 100644 --- a/pyproj/__init__.py +++ b/pyproj/__init__.py @@ -28,7 +28,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ -import importlib.metadata import warnings import pyproj.network @@ -67,7 +66,7 @@ transform, ) -__version__ = importlib.metadata.version(__package__) +__version__ = "3.4.2.dev0" __all__ = [ "Proj", "Geod", diff --git a/setup.cfg b/setup.cfg index 5ad038fc3..15ab8d194 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = pyproj -version = 3.4.1.dev0 +version = attr: pyproj.__version__ description = Python interface to PROJ (cartographic projections and coordinate transformations library) long_description = file: README.md long_description_content_type = text/markdown From 2ef4235837cfa40d063714b65f5ecc94557ffb65 Mon Sep 17 00:00:00 2001 From: Lucas Coppio Date: Mon, 3 Oct 2022 18:08:48 -0300 Subject: [PATCH 2/2] chore: Update history.rst to reflect bug fix, changed version to 3.4.1.dev1 --- docs/history.rst | 4 ++++ pyproj/__init__.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/history.rst b/docs/history.rst index aacb49268..09359e89c 100644 --- a/docs/history.rst +++ b/docs/history.rst @@ -4,6 +4,10 @@ Change Log Latest ------- +3.4.1 +----- +- BUG: Changed so that the setup.cfg depends on the version code in the __init__.py instead of the other way around (issuue #1155) + 3.4.0 ----- - WHL: Python 3.11 Wheels (issue #1110) diff --git a/pyproj/__init__.py b/pyproj/__init__.py index 633753363..99e644b29 100644 --- a/pyproj/__init__.py +++ b/pyproj/__init__.py @@ -66,7 +66,7 @@ transform, ) -__version__ = "3.4.2.dev0" +__version__ = "3.4.1.dev1" __all__ = [ "Proj", "Geod",