From 825a57e9cf4f3cdeecf710de0c79ad6e48d79f81 Mon Sep 17 00:00:00 2001 From: Romain Hugonnet Date: Sun, 3 Sep 2023 17:50:21 -0800 Subject: [PATCH] Use setuptools_scm --- .gitignore | 3 +++ dev-environment.yml | 1 - environment.yml | 1 - pyproject.toml | 12 +++++++++++- requirements.txt | 1 - setup.cfg | 2 +- xdem/__version__.py | 5 ++++- 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 43917d7e..1655b4ad 100644 --- a/.gitignore +++ b/.gitignore @@ -141,6 +141,9 @@ dmypy.json # Pyre type checker .pyre/ +# Version file +xdem/__version__.py + # Example data downloaded/produced during tests examples/data/Longyearbyen/data/ examples/data/Longyearbyen/processed/ diff --git a/dev-environment.yml b/dev-environment.yml index 944bb045..ba049963 100644 --- a/dev-environment.yml +++ b/dev-environment.yml @@ -3,7 +3,6 @@ channels: - conda-forge dependencies: - python>=3.8 - - proj>=7.2 - geopandas>=0.10.0 - fiona - shapely diff --git a/environment.yml b/environment.yml index ed7afa66..507289c8 100644 --- a/environment.yml +++ b/environment.yml @@ -3,7 +3,6 @@ channels: - conda-forge dependencies: - python>=3.8 - - proj>=7.2 - geopandas>=0.10.0 - fiona - shapely diff --git a/pyproject.toml b/pyproject.toml index 9068b964..084db2e3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,16 @@ [build-system] # Minimum requirements for the build system to execute. -requires = ["setuptools", "wheel"] +requires = [ + "setuptools>=42", + "setuptools_scm[toml]>=6.2", + "wheel", +] +build-backend = "setuptools.build_meta" + +# Write version to file +[tool.setuptools_scm] +write_to = "xdem/__version__.py" +fallback_version = "0.0.1" [tool.black] target_version = ['py36'] diff --git a/requirements.txt b/requirements.txt index f30d1bf1..6c32f3f5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ # This file is auto-generated from environment.yml, do not modify. # See that file for comments about the need/usage of each dependency. -proj>=7.2 geopandas>=0.10.0 fiona shapely diff --git a/setup.cfg b/setup.cfg index 341c9f83..5704196c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] author = The GlacioHack Team name = xdem -version = attr: xdem.__version__ +version = 0.0.13 description = Analysis of digital elevation models (DEMs) keywords = dem, elevation, geoutils, xarray long_description = file: README.md diff --git a/xdem/__version__.py b/xdem/__version__.py index 4ae81f3d..2f9b9904 100755 --- a/xdem/__version__.py +++ b/xdem/__version__.py @@ -1 +1,4 @@ -__version__ = "0.0.13" +# file generated by setuptools_scm +# don't change, don't track in version control +__version__ = version = '0.0.14.dev14+g4c8c9fc.d20230904' +__version_tuple__ = version_tuple = (0, 0, 14, 'dev14', 'g4c8c9fc.d20230904')