From 54e437c84899b2048cf2e7af767c832aced06400 Mon Sep 17 00:00:00 2001 From: R-Palazzo Date: Mon, 4 Mar 2024 13:32:30 +0000 Subject: [PATCH 01/10] update pyproject.toml --- pyproject.toml | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7df2e65..2b9f322 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,3 @@ -[build-system] -requires = ['setuptools', 'wheel'] -build-backend = 'setuptools.build_meta' - [project] name = 'deepecho' description = 'Create sequential synthetic data of mixed types using a GAN.' @@ -19,7 +15,7 @@ classifiers = [ 'Topic :: Scientific/Engineering :: Artificial Intelligence', ] keywords = ['deepecho', 'DeepEcho'] -version = '0.5.1.dev0' +dynamic = ["version"] license = { text = 'BSL-1.1' } requires-python = '>=3.8,<3.12' readme = 'README.md' @@ -99,11 +95,35 @@ dev = [ [tool.setuptools] include-package-data = true +license-files = ['LICENSE'] [tool.setuptools.packages.find] include = ['deepecho', 'deepecho.*'] namespaces = false +[tool.setuptools.package-data] +"*" = [ + '*.txt', + '*.md', + '*.rst', + 'README.md', + 'docs/*', + 'Makefile', + 'make.bat', + '*.jpg', + '*.png', + '*.gif', +] + +[tool.setuptools.exclude-package-data] +"*" = [ + '* __pycache__', + '*.py[co]', +] + +[tool.setuptools.dynamic] +version = {attr = 'deepecho.version.__version__'} + [tool.isort] include_trailing_comment = true line_length = 99 @@ -114,3 +134,7 @@ use_parentheses = true [tool.pytest.ini_options] collect_ignore = ['pyproject.toml'] + +[build-system] +requires = ['setuptools', 'wheel'] +build-backend = 'setuptools.build_meta' From 46f5c2f402c40f3596b0b8b794675d596eb05591 Mon Sep 17 00:00:00 2001 From: R-Palazzo Date: Mon, 4 Mar 2024 13:33:00 +0000 Subject: [PATCH 02/10] update setup.cgf --- deepecho/version.py | 2 ++ setup.cfg | 29 ----------------------------- 2 files changed, 2 insertions(+), 29 deletions(-) create mode 100644 deepecho/version.py diff --git a/deepecho/version.py b/deepecho/version.py new file mode 100644 index 0000000..fa62472 --- /dev/null +++ b/deepecho/version.py @@ -0,0 +1,2 @@ +"""Deepecho versions.""" +__version__ = '0.5.1' diff --git a/setup.cfg b/setup.cfg index 0fc6494..47cc2d5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,32 +1,3 @@ -[bumpversion] -current_version = 0.5.1.dev0 -commit = True -tag = True -parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?P\d+))? -serialize = - {major}.{minor}.{patch}.{release}{candidate} - {major}.{minor}.{patch} - -[bumpversion:part:release] -optional_value = release -first_value = dev -values = - dev - release - -[bumpversion:part:candidate] - -[bumpversion:file:pyproject.toml] -search = version='{current_version}' -replace = version='{new_version}' - -[bumpversion:file:deepecho/__init__.py] -search = __version__ = '{current_version}' -replace = __version__ = '{new_version}' - -[bdist_wheel] -universal = 1 - [flake8] max-line-length = 99 exclude = docs, .tox, .git, __pycache__, .ipynb_checkpoints From 0c92ab059ac65a57784dfdb5f5b1940c31928056 Mon Sep 17 00:00:00 2001 From: R-Palazzo Date: Mon, 4 Mar 2024 13:54:46 +0000 Subject: [PATCH 03/10] version folder --- deepecho/{version.py => version/__init__.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename deepecho/{version.py => version/__init__.py} (100%) diff --git a/deepecho/version.py b/deepecho/version/__init__.py similarity index 100% rename from deepecho/version.py rename to deepecho/version/__init__.py From 98a3a81b1af57522ec149155e6acad9830e15c70 Mon Sep 17 00:00:00 2001 From: R-Palazzo Date: Mon, 4 Mar 2024 13:55:07 +0000 Subject: [PATCH 04/10] docstring --- deepecho/version/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deepecho/version/__init__.py b/deepecho/version/__init__.py index fa62472..37a3baf 100644 --- a/deepecho/version/__init__.py +++ b/deepecho/version/__init__.py @@ -1,2 +1,2 @@ -"""Deepecho versions.""" +"""Deepecho version.""" __version__ = '0.5.1' From 20f0db8ce1e69e4c913d102d4d6258abd6b0669d Mon Sep 17 00:00:00 2001 From: R-Palazzo Date: Mon, 4 Mar 2024 15:10:04 +0000 Subject: [PATCH 05/10] update makefile --- Makefile | 12 ++++++------ deepecho/version/__init__.py | 2 -- pyproject.toml | 35 +++++++++++++++++++++++++++++++++-- 3 files changed, 39 insertions(+), 10 deletions(-) delete mode 100644 deepecho/version/__init__.py diff --git a/Makefile b/Makefile index 9800c77..cb18c82 100644 --- a/Makefile +++ b/Makefile @@ -167,34 +167,34 @@ publish: dist publish-confirm ## package and upload a release bumpversion-release: ## Merge main to stable and bumpversion release git checkout stable || git checkout -b stable git merge --no-ff main -m"make release-tag: Merge branch 'main' into stable" - bumpversion release + bump-my-version bump release git push --tags origin stable .PHONY: bumpversion-release-test bumpversion-release-test: ## Merge main to stable and bumpversion release git checkout stable || git checkout -b stable git merge --no-ff main -m"make release-tag: Merge branch 'main' into stable" - bumpversion release --no-tag + bump-my-version bump release --no-tag @echo git push --tags origin stable .PHONY: bumpversion-patch bumpversion-patch: ## Merge stable to main and bumpversion patch git checkout main git merge stable - bumpversion --no-tag patch + bump-my-version bump patch --no-tag git push .PHONY: bumpversion-candidate bumpversion-candidate: ## Bump the version to the next candidate - bumpversion candidate --no-tag + bump-my-version bump candidate --no-tag .PHONY: bumpversion-minor bumpversion-minor: ## Bump the version the next minor skipping the release - bumpversion --no-tag minor + bump-my-version bump minor --no-tag .PHONY: bumpversion-major bumpversion-major: ## Bump the version the next major skipping the release - bumpversion --no-tag major + bump-my-version bump major --no-tag .PHONY: bumpversion-revert bumpversion-revert: ## Undo a previous bumpversion-release diff --git a/deepecho/version/__init__.py b/deepecho/version/__init__.py deleted file mode 100644 index 37a3baf..0000000 --- a/deepecho/version/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -"""Deepecho version.""" -__version__ = '0.5.1' diff --git a/pyproject.toml b/pyproject.toml index 2b9f322..22bd50c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,7 +52,7 @@ dev = [ # general 'setuptools<49.2', - 'bumpversion>=0.5.3,<0.6', + 'bump-my-version>=0.18.3,<1', 'pip>=9.0.1', 'watchdog>=0.8.3,<0.11', @@ -122,7 +122,7 @@ namespaces = false ] [tool.setuptools.dynamic] -version = {attr = 'deepecho.version.__version__'} +version = {attr = 'deepecho.__version__'} [tool.isort] include_trailing_comment = true @@ -135,6 +135,37 @@ use_parentheses = true [tool.pytest.ini_options] collect_ignore = ['pyproject.toml'] +[tool.bumpversion] +current_version = '0.5.1' +parse = '(?P\\d+)\\.(?P\\d+)\\.(?P\\d+)' +serialize = [ + '{major}.{minor}.{patch}-{release}{candidate}', + '{major}.{minor}.{patch}' +] +search = '{current_version}' +replace = '{new_version}' +regex = false +ignore_missing_version = false +tag = true +sign_tags = false +tag_name = 'v{new_version}' +tag_message = 'Bump version: {current_version} → {new_version}' +allow_dirty = false +commit = true +message = 'Bump version: {current_version} → {new_version}' +commit_args = '' + +[tool.bumpversion.parts.release] +values = [ + 'dev', + 'release' +] +optional_value = 'release' + +[tool.bumpversion.files] +pyproject.toml = {search = 'current_version="{current_version}"', replace = 'current_version="{new_version}"'} +"deepecho/__init__.py" = {search = '__version__ = "{current_version}"', replace = '__version__ = "{new_version}"'} + [build-system] requires = ['setuptools', 'wheel'] build-backend = 'setuptools.build_meta' From 5a8119b77dfbbcff3bf5777b703f5a48d71e5874 Mon Sep 17 00:00:00 2001 From: R-Palazzo Date: Tue, 5 Mar 2024 16:05:06 +0000 Subject: [PATCH 06/10] update pyproject --- pyproject.toml | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 22bd50c..088016c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ classifiers = [ 'Topic :: Scientific/Engineering :: Artificial Intelligence', ] keywords = ['deepecho', 'DeepEcho'] -dynamic = ["version"] +version = '0.5.1.dev0' license = { text = 'BSL-1.1' } requires-python = '>=3.8,<3.12' readme = 'README.md' @@ -103,17 +103,22 @@ namespaces = false [tool.setuptools.package-data] "*" = [ - '*.txt', + 'AUTHORS.rst', + 'CONTRIBUTING.rst', + 'HISTORY.md', + 'LICENSE', + 'README.md', + 'deepecho/data/demo.csv', '*.md', '*.rst', - 'README.md', - 'docs/*', + 'conf.py', 'Makefile', 'make.bat', '*.jpg', '*.png', - '*.gif', + '*.gif' ] +"tests" = ["*"] [tool.setuptools.exclude-package-data] "*" = [ @@ -121,9 +126,6 @@ namespaces = false '*.py[co]', ] -[tool.setuptools.dynamic] -version = {attr = 'deepecho.__version__'} - [tool.isort] include_trailing_comment = true line_length = 99 @@ -136,11 +138,11 @@ use_parentheses = true collect_ignore = ['pyproject.toml'] [tool.bumpversion] -current_version = '0.5.1' -parse = '(?P\\d+)\\.(?P\\d+)\\.(?P\\d+)' +current_version = '0.5.1.dev0' +parse = '(?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?P\d+))?' serialize = [ - '{major}.{minor}.{patch}-{release}{candidate}', - '{major}.{minor}.{patch}' + '{major}.{minor}.{patch}.{release}{candidate}', + '{major}.{minor}.{patch}' ] search = '{current_version}' replace = '{new_version}' @@ -156,15 +158,22 @@ message = 'Bump version: {current_version} → {new_version}' commit_args = '' [tool.bumpversion.parts.release] +first_value = 'dev' +optional_value = 'release' values = [ 'dev', 'release' ] -optional_value = 'release' -[tool.bumpversion.files] -pyproject.toml = {search = 'current_version="{current_version}"', replace = 'current_version="{new_version}"'} -"deepecho/__init__.py" = {search = '__version__ = "{current_version}"', replace = '__version__ = "{new_version}"'} +[[tool.bumpversion.files]] +filename = "pyproject.toml" +search = "version = '{current_version}'" +replace = "version = '{new_version}'" + +[[tool.bumpversion.files]] +filename = "sdgym/__init__.py" +search = "__version__ = '{current_version}'" +replace = "__version__ = '{new_version}'" [build-system] requires = ['setuptools', 'wheel'] From 359856ddf0f19d4bda2eb7fa474c1000e9849b95 Mon Sep 17 00:00:00 2001 From: R-Palazzo Date: Tue, 5 Mar 2024 16:10:59 +0000 Subject: [PATCH 07/10] remove manifest --- MANIFEST.in | 12 ------------ pyproject.toml | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 2978997..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,12 +0,0 @@ -include AUTHORS.rst -include CONTRIBUTING.rst -include HISTORY.md -include LICENSE -include README.md -include deepecho/data/demo.csv - -recursive-include tests * -recursive-exclude * __pycache__ -recursive-exclude * *.py[co] - -recursive-include docs *.md *.rst conf.py Makefile make.bat *.jpg *.png *.gif diff --git a/pyproject.toml b/pyproject.toml index 088016c..153b645 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -171,7 +171,7 @@ search = "version = '{current_version}'" replace = "version = '{new_version}'" [[tool.bumpversion.files]] -filename = "sdgym/__init__.py" +filename = "deepecho/__init__.py" search = "__version__ = '{current_version}'" replace = "__version__ = '{new_version}'" From b1fa6997cb79ea650de9656f4258a35d72c8ff9b Mon Sep 17 00:00:00 2001 From: R-Palazzo Date: Tue, 5 Mar 2024 17:01:48 +0000 Subject: [PATCH 08/10] update pyproject version --- pyproject.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 153b645..88a1c1e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ classifiers = [ 'Topic :: Scientific/Engineering :: Artificial Intelligence', ] keywords = ['deepecho', 'DeepEcho'] -version = '0.5.1.dev0' +dynamic = ['version'] license = { text = 'BSL-1.1' } requires-python = '>=3.8,<3.12' readme = 'README.md' @@ -108,7 +108,6 @@ namespaces = false 'HISTORY.md', 'LICENSE', 'README.md', - 'deepecho/data/demo.csv', '*.md', '*.rst', 'conf.py', @@ -118,6 +117,9 @@ namespaces = false '*.png', '*.gif' ] +"deepecho" = [ + 'deepecho/data/demo.csv' +] "tests" = ["*"] [tool.setuptools.exclude-package-data] @@ -126,6 +128,9 @@ namespaces = false '*.py[co]', ] +[tool.setuptools.dynamic] +version = {attr = 'deepecho.__version__'} + [tool.isort] include_trailing_comment = true line_length = 99 @@ -165,11 +170,6 @@ values = [ 'release' ] -[[tool.bumpversion.files]] -filename = "pyproject.toml" -search = "version = '{current_version}'" -replace = "version = '{new_version}'" - [[tool.bumpversion.files]] filename = "deepecho/__init__.py" search = "__version__ = '{current_version}'" From aa05c206af1bfb7ebdbd38ea9e834a19510ac42a Mon Sep 17 00:00:00 2001 From: R-Palazzo Date: Tue, 5 Mar 2024 17:50:44 +0000 Subject: [PATCH 09/10] fix readme 1 --- pyproject.toml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 88a1c1e..5a6b2e6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -115,10 +115,8 @@ namespaces = false 'make.bat', '*.jpg', '*.png', - '*.gif' -] -"deepecho" = [ - 'deepecho/data/demo.csv' + '*.gif', + '*.csv', ] "tests" = ["*"] From 906a1348c88d5e5da308c7b52430d179d791bd93 Mon Sep 17 00:00:00 2001 From: R-Palazzo Date: Tue, 5 Mar 2024 18:48:43 +0000 Subject: [PATCH 10/10] fix readme workflow 2 --- pyproject.toml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5a6b2e6..89acad6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -102,11 +102,10 @@ include = ['deepecho', 'deepecho.*'] namespaces = false [tool.setuptools.package-data] -"*" = [ +'*' = [ 'AUTHORS.rst', 'CONTRIBUTING.rst', 'HISTORY.md', - 'LICENSE', 'README.md', '*.md', '*.rst', @@ -115,13 +114,13 @@ namespaces = false 'make.bat', '*.jpg', '*.png', - '*.gif', - '*.csv', + '*.gif' ] -"tests" = ["*"] +'deepecho' = ['data/demo.csv'] +'tests' = ['*'] [tool.setuptools.exclude-package-data] -"*" = [ +'*' = [ '* __pycache__', '*.py[co]', ]