Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove bumpversion and use bump-my-version #380

Merged
merged 5 commits into from
Mar 6, 2024
Merged

Remove bumpversion and use bump-my-version #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
117318d
use bump-my-version instead of bumpversion
frances-h Mar 5, 2024
ffdfee1
include license-files
frances-h Mar 5, 2024
903aee6
remove pyproject.toml file specific option
frances-h Mar 5, 2024
65f1a8d
remove MANIFEST.in
frances-h Mar 6, 2024
2dc28b1
update MAKEFILE to point to pyproject.toml
frances-h Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions MANIFEST.in
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,23 +196,23 @@ git-push-tags-stable: ## Push tags and stable to github

.PHONY: bumpversion-release
bumpversion-release: ## Bump the version to the next release
bumpversion release
bump-my-version bump release

.PHONY: bumpversion-patch
bumpversion-patch: ## Bump the version to the next patch
bumpversion --no-tag patch
bump-my-version bump patch --no-tag

.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
Expand All @@ -222,7 +222,7 @@ bumpversion-revert: ## Undo a previous bumpversion-release

CLEAN_DIR := $(shell git status --short | grep -v ??)
CURRENT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
CURRENT_VERSION := $(shell grep "^current_version" setup.cfg | grep -o "dev[0-9]*")
CURRENT_VERSION := $(shell grep "^current_version" pyproject.toml | grep -o "dev[0-9]*")
CHANGELOG_LINES := $(shell git diff HEAD..origin/stable HISTORY.md 2>&1 | wc -l)

.PHONY: check-clean
Expand Down
55 changes: 53 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ classifiers = [
'Topic :: Scientific/Engineering :: Artificial Intelligence',
]
keywords = [ 'copulas' ]
version = '0.10.1.dev0'
dynamic = ["version"]
license = { text = 'BSL-1.1' }
requires-python = '>=3.8,<3.12'
readme = 'README.md'
Expand All @@ -41,6 +41,9 @@ dependencies = [
requires = ['setuptools', 'wheel']
build-backend = 'setuptools.build_meta'

[tool.setuptools.dynamic]
version = {attr = 'copulas.__version__'}

[project.optional-dependencies]
tutorials = [
'markupsafe<=2.0.1',
Expand All @@ -60,7 +63,7 @@ dev = [

# general
'pip>=9.0.1',
'bumpversion>=0.5.3,<0.6',
'bump-my-version>=0.18.3,<1',
'watchdog>=0.8.3,<0.11',

# docs
Expand Down Expand Up @@ -132,7 +135,55 @@ add-ignore = ['D107', 'D407', 'D417']

[tool.setuptools]
include-package-data = true
license-files = ['LICENSE']

[tool.setuptools.packages.find]
include = ['copulas', 'copulas.*']
namespaces = false

[tool.setuptools.package-data]
'*' = [
'AUTHORS.rst',
'CONTRIBUTING.rst',
'HISTORY.md',
'README.md',
'RELEASE.md',
'*.md',
'*.rst',
'conf.py',
'Makefile',
'make.bat',
'*.jpg',
'*.png',
'*.gif'
]
'tests' = ['*']

[tool.setuptools.exclude-package-data]
'*' = [
'* __pycache__',
'*.py[co]',
]

[tool.bumpversion]
current_version = "0.10.1.dev0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this means our version will live in the following places:

  • copulas/init.py
  • pyproject.toml

Will bump-my-version handle updating it in both places? Based on the code below, it seems like the answer is Yes but just double checking.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah exactly, I confirmed that both get updated when running bump-my-version bump

commit = true
tag = true
parse = '(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<candidate>\d+))?'
serialize = [
'{major}.{minor}.{patch}.{release}{candidate}',
'{major}.{minor}.{patch}'
]

[tool.bumpversion.parts.release]
optional_value = 'release'
values = [
'dev',
'release'
]

[[tool.bumpversion.files]]
filename = 'copulas/__init__.py'
search = "__version__ = '{current_version}'"
replace = "__version__ = '{new_version}'"

29 changes: 0 additions & 29 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,3 @@
[bumpversion]
current_version = 0.10.1.dev0
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<candidate>\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:copulas/__init__.py]
search = __version__ = '{current_version}'
replace = __version__ = '{new_version}'

[bdist_wheel]
universal = 1

[flake8]
max-line-length = 99
exclude = docs, .git, __pycache__, .ipynb_checkpoints
Expand Down
Loading