diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index f3b422037..000000000 --- a/MANIFEST.in +++ /dev/null @@ -1,10 +0,0 @@ -include CONTRIBUTING.rst -include HISTORY.md -include LICENSE -include README.md - -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/Makefile b/Makefile index 25b7c2143..457409f18 100644 --- a/Makefile +++ b/Makefile @@ -183,34 +183,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 --no-tag patch 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 --no-tag minor .PHONY: bumpversion-major bumpversion-major: ## Bump the version the next major skipping the release - bumpversion --no-tag major + bump-my-version bump --no-tag major .PHONY: bumpversion-revert bumpversion-revert: ## Undo a previous bumpversion-release diff --git a/pyproject.toml b/pyproject.toml index 73b6ad5be..f62ce14a6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,3 @@ -[build-system] -requires = ['setuptools', 'wheel'] -build-backend = 'setuptools.build_meta' - [project] name = 'sdv' description = 'Generate synthetic data for single table, multi table and sequential data' @@ -19,7 +15,7 @@ classifiers = [ 'Topic :: Scientific/Engineering :: Artificial Intelligence', ] keywords = ['sdv', 'synthetic-data', 'synhtetic-data-generation', 'timeseries', 'single-table', 'multi-table'] -version = '1.10.1.dev0' +dynamic = ['version'] license = { text = 'BSL-1.1' } requires-python = '>=3.8,<3.12' readme = 'README.md' @@ -66,7 +62,7 @@ dev = [ 'sdv[test]', # general - 'bumpversion>=0.5.3,<0.6', + 'bump-my-version>=0.18.3,<1', 'pip>=9.0.1', 'watchdog>=0.8.3,<0.9', @@ -122,12 +118,70 @@ dev = [ [tool.setuptools] include-package-data = true +license-files = ['LICENSE'] [tool.setuptools.packages.find] include = ['sdv', 'sdv.*'] -exclude = ['sdv.transformers.addons.*'] namespaces = false +[tool.setuptools.package-data] +'*' = [ + 'CONTRIBUTING.rst', + 'HISTORY.md', + 'README.md', + '*.md', + '*.rst', + 'conf.py', + 'Makefile', + 'make.bat', + '*.jpg', + '*.png', + '*.gif' +] +'tests' = ['*'] + +[tool.setuptools.exclude-package-data] +'*' = [ + '* __pycache__', + '*.py[co]', +] + +[tool.setuptools.dynamic] +version = {attr = 'sdv.__version__'} + +[tool.bumpversion] +current_version = '1.10.1.dev0' +parse = '(?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?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] +first_value = 'dev' +optional_value = 'release' +values = [ + 'dev', + 'release' +] + +[[tool.bumpversion.files]] +filename = "sdv/__init__.py" +search = "__version__ = '{current_version}'" +replace = "__version__ = '{new_version}'" + [tool.isort] line_length = 99 lines_between_types = 0 @@ -142,4 +196,6 @@ add-ignore = ['D105', 'D107', 'D407', 'D417'] [tool.pytest.ini_options] addopts = "--ignore=pyproject.toml" - +[build-system] +requires = ['setuptools', 'wheel'] +build-backend = 'setuptools.build_meta' diff --git a/setup.cfg b/setup.cfg index 632f0f6d0..ff4e9883c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,32 +1,3 @@ -[bumpversion] -current_version = 1.10.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:sdv/__init__.py] -search = __version__ = '{current_version}' -replace = __version__ = '{new_version}' - -[bdist_wheel] -universal = 1 - [flake8] max-line-length = 99 inline-quotes = single