From 350a5d07b0dc7a36250cd0d5326023ad846af3e1 Mon Sep 17 00:00:00 2001 From: Rambaud Pierrick <12rambau@users.noreply.github.com> Date: Thu, 18 Jan 2024 13:17:14 +0000 Subject: [PATCH 1/5] chore: set back commitizen hook --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9cf9d448..ec869aeb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,11 +7,11 @@ repos: - id: black stages: [commit] - # - repo: "https://github.com/commitizen-tools/commitizen" - # rev: "v2.18.0" - # hooks: - # - id: commitizen - # stages: [commit-msg] + - repo: "https://github.com/commitizen-tools/commitizen" + rev: "v2.18.0" + hooks: + - id: commitizen + stages: [commit-msg] # - repo: "https://github.com/kynan/nbstripout" # rev: "0.5.0" From 243d77bc52f745ef802d913bb2b7e837d8adc6b2 Mon Sep 17 00:00:00 2001 From: Rambaud Pierrick <12rambau@users.noreply.github.com> Date: Thu, 18 Jan 2024 13:21:43 +0000 Subject: [PATCH 2/5] feat: move to hatchlings for packaging --- pyproject.toml | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 83f044d5..64f4bd49 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,18 @@ [build-system] -requires = ["setuptools>=61.2", "wheel"] -build-backend = "setuptools.build_meta" +requires = ["hatchling"] +build-backend = "hatchling.build" [project] name = "geetools" version = "0.6.14" description = "A collection of tools to work with Google Earth Engine Python API" -keywords = ["python", "geospatial", "remote-sensing", "google-earth-engine", "earthengine"] +keywords = [ + "python", + "geospatial", + "remote-sensing", + "google-earth-engine", + "earthengine" +] classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", @@ -39,7 +45,7 @@ file = "README.md" content-type = "text/markdown" [project.urls] -github = "https://github.com/gee-community/gee_tools" +Homepage = "https://github.com/gee-community/gee_tools" [project.optional-dependencies] "dev" = [ @@ -67,12 +73,16 @@ doc = [ "jupyter-sphinx", ] -[tool.setuptools] -include-package-data = true +[tool.hatch.build.targets.wheel] +only-include = ["geetools"] -[tool.setuptools.packages.find] -include = ["geetools*"] -exclude = ["tests*", "docs*"] +[tool.hatch.envs.default] +dependencies = [ + "pre-commit", + "commitizen", + "nox" +] +post-install-commands = ["pre-commit install"] [tool.licensecheck] using = "PEP631:test;dev;doc" @@ -101,4 +111,4 @@ convention = "google" testpaths = "tests" [tool.coverage.run] -source = ["geetools"] \ No newline at end of file +source = ["geetools"] From 2ba3a77abe37ffced2a44f5fe0c1977a11ca48fd Mon Sep 17 00:00:00 2001 From: Rambaud Pierrick <12rambau@users.noreply.github.com> Date: Thu, 18 Jan 2024 13:22:46 +0000 Subject: [PATCH 3/5] chore: add commitizen for version management --- pyproject.toml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 64f4bd49..d6b197ef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -112,3 +112,13 @@ testpaths = "tests" [tool.coverage.run] source = ["geetools"] + +[tool.commitizen] +tag_format = "v$major.$minor.$patch$prerelease" +update_changelog_on_bump = false +version = "0.6.14" +version_files = [ + "pyproject.toml:version", + "geetools/__init__.py:__version__", + "docs/conf.py:release", +] From 9245a18774569591c165c88b716ab995ac2cd03d Mon Sep 17 00:00:00 2001 From: Rambaud Pierrick <12rambau@users.noreply.github.com> Date: Thu, 18 Jan 2024 13:24:00 +0000 Subject: [PATCH 4/5] =?UTF-8?q?bump:=20version=200.6.14=20=E2=86=92=200.7.?= =?UTF-8?q?0a0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/conf.py | 2 +- geetools/__init__.py | 2 +- pyproject.toml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index c9b208df..a74402cc 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ project = "geetools" author = "Rodrigo E. Principe" copyright = f"2017-{datetime.now().year}, {author}" -release = "0.6.14" +release = "0.7.0a0" # -- General configuration ----------------------------------------------------- extensions = [ diff --git a/geetools/__init__.py b/geetools/__init__.py index e50e5ac8..23de3d44 100644 --- a/geetools/__init__.py +++ b/geetools/__init__.py @@ -48,7 +48,7 @@ __title__ = "geetools" __summary__ = "A set of useful tools to use with Google Earth Engine Python" "API" __uri__ = "http://geetools.readthedocs.io" -__version__ = "0.6.14" +__version__ = "0.7.0a0" __author__ = "Rodrigo E. Principe" __email__ = "fitoprincipe82@gmail.com" diff --git a/pyproject.toml b/pyproject.toml index d6b197ef..eb7de436 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "geetools" -version = "0.6.14" +version = "0.7.0a0" description = "A collection of tools to work with Google Earth Engine Python API" keywords = [ "python", @@ -116,7 +116,7 @@ source = ["geetools"] [tool.commitizen] tag_format = "v$major.$minor.$patch$prerelease" update_changelog_on_bump = false -version = "0.6.14" +version = "0.7.0a0" version_files = [ "pyproject.toml:version", "geetools/__init__.py:__version__", From cb1835dfda2dc3c78f829ce8f0063b72ebf7f571 Mon Sep 17 00:00:00 2001 From: Rambaud Pierrick <12rambau@users.noreply.github.com> Date: Thu, 18 Jan 2024 13:24:20 +0000 Subject: [PATCH 5/5] =?UTF-8?q?bump:=20version=200.7.0a0=20=E2=86=92=201.0?= =?UTF-8?q?.0a0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/conf.py | 2 +- geetools/__init__.py | 2 +- pyproject.toml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index a74402cc..332b5fa6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ project = "geetools" author = "Rodrigo E. Principe" copyright = f"2017-{datetime.now().year}, {author}" -release = "0.7.0a0" +release = "1.0.0a0" # -- General configuration ----------------------------------------------------- extensions = [ diff --git a/geetools/__init__.py b/geetools/__init__.py index 23de3d44..90bfba1a 100644 --- a/geetools/__init__.py +++ b/geetools/__init__.py @@ -48,7 +48,7 @@ __title__ = "geetools" __summary__ = "A set of useful tools to use with Google Earth Engine Python" "API" __uri__ = "http://geetools.readthedocs.io" -__version__ = "0.7.0a0" +__version__ = "1.0.0a0" __author__ = "Rodrigo E. Principe" __email__ = "fitoprincipe82@gmail.com" diff --git a/pyproject.toml b/pyproject.toml index eb7de436..3da946a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "geetools" -version = "0.7.0a0" +version = "1.0.0a0" description = "A collection of tools to work with Google Earth Engine Python API" keywords = [ "python", @@ -116,7 +116,7 @@ source = ["geetools"] [tool.commitizen] tag_format = "v$major.$minor.$patch$prerelease" update_changelog_on_bump = false -version = "0.7.0a0" +version = "1.0.0a0" version_files = [ "pyproject.toml:version", "geetools/__init__.py:__version__",