diff --git a/.bumpversion.cfg b/.bumpversion.cfg deleted file mode 100644 index 264c7ef13..000000000 --- a/.bumpversion.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[bumpversion] -current_version = 0.0.5 -commit = False -tag = False -commit_args = -s - -[bumpversion:file:csp/__init__.py] -search = __version__ = "{current_version}" -replace = __version__ = "{new_version}" - -[bumpversion:file:setup.py] -search = version="{current_version}" -replace = version="{new_version}" - -[bumpversion:file:pyproject.toml] -search = version = "{current_version}" -replace = version = "{new_version}" - -[bumpversion:file:CMakeLists.txt] -search = project(csp VERSION "{current_version}") -replace = project(csp VERSION "{new_version}") diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0cf431d9e..46ae9b4dd 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,7 +2,6 @@ * @robambalu @AdamGlustein @svatasoiu @alexddobkin # Packaging code -.bumpversion.cfg @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807 conda @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807 CMakeLists.txt @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807 Makefile @robambalu @AdamGlustein @svatasoiu @alexddobkin @ptomecek @timkpaine @czgdp1807 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5ace4600a..42cac77c9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,3 +4,13 @@ updates: directory: "/" schedule: interval: "weekly" + labels: + - "part: github_actions" + + - package-ecosystem: "pip" + directory: "/" + schedule: + interval: "monthly" + labels: + - "lang: python" + - "part: dependencies" diff --git a/Makefile b/Makefile index d37aa8f64..32827d4eb 100644 --- a/Makefile +++ b/Makefile @@ -124,16 +124,16 @@ dockerdown: ## spin up docker compose services for adapter testing .PHONY: show-version patch minor major show-version: - @ bump2version --dry-run --allow-dirty pyproject.toml --list | grep current | awk -F= '{print $$2}' + @ bump-my-version show current_version patch: - bump2version patch + bump-my-version bump patch minor: - bump2version minor + bump-my-version bump minor major: - bump2version major + bump-my-version bump major ######## # DIST # diff --git a/conda/dev-environment-unix.yml b/conda/dev-environment-unix.yml index 65d72f4f5..fa98ea589 100644 --- a/conda/dev-environment-unix.yml +++ b/conda/dev-environment-unix.yml @@ -6,7 +6,7 @@ dependencies: - bison - brotli - build - - bump2version>=1 + - bump-my-version - cmake - codespell>=2.2.6,<2.3 - compilers diff --git a/conda/dev-environment-win.yml b/conda/dev-environment-win.yml index 5610ce3f7..004d42f6b 100644 --- a/conda/dev-environment-win.yml +++ b/conda/dev-environment-win.yml @@ -5,7 +5,7 @@ channels: dependencies: - brotli - build - - bump2version>=1 + - bump-my-version - cmake - codespell>=2.2.6,<2.3 - compilers diff --git a/docs/wiki/dev-guides/Release-Process.md b/docs/wiki/dev-guides/Release-Process.md index 8b8c05507..7db551a52 100644 --- a/docs/wiki/dev-guides/Release-Process.md +++ b/docs/wiki/dev-guides/Release-Process.md @@ -72,7 +72,7 @@ your users. ### Preparing and tagging a release Follow these steps when it's time to tag a new release. Before doing -this, you will need to ensure `bump2version` is installed into your +this, you will need to ensure `bump-my-version` is installed into your development environment. > \[!NOTE\] @@ -89,7 +89,7 @@ development environment. ``` 1. Make a branch and update version numbers in your local clone using - the `bump2version` integration in the Makefile. + the `bump-my-version` integration in the Makefile. First, make a branch that will be pushed to the main `csp` repository. Using a name like `release/v0.3.4` should avoid any @@ -99,7 +99,7 @@ development environment. git checkout -b release/v0.x.x ``` - You can update the version number in the codebase using `bump2version`. For a + You can update the version number in the codebase using `bump-my-version`. For a bugfix release, you would do: ```bash @@ -127,7 +127,7 @@ development environment. 1. Tag the release - Use the version number `bump2version` generated and make sure the + Use the version number `bump-my-version` generated and make sure the tag name begins with a `v`. ```bash diff --git a/pyproject.toml b/pyproject.toml index 48d48d1ef..f74addef6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ Tracker = "https://github.com/point72/csp/issues" [project.optional-dependencies] develop = [ # build/dist - "bump2version>=1.0.0", + "bump-my-version", "build", "ruamel.yaml", "scikit-build", @@ -109,6 +109,32 @@ slack = [ "slack-sdk>=3", ] +[tool.bumpversion] +current_version = "0.0.5" +commit = false +tag = false +commit_args = "-s" + +[[tool.bumpversion.files]] +filename = "csp/__init__.py" +search = '__version__ = "{current_version}"' +replace = '__version__ = "{new_version}"' + +[[tool.bumpversion.files]] +filename = "setup.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 = "CMakeLists.txt" +search = 'project(csp VERSION "{current_version}")' +replace = 'project(csp VERSION "{new_version}")' + [tool.check-manifest] ignore = []