Skip to content

Commit 3793cd7

Browse files
revert non-working bumpversion prerelease schema
1 parent 79e1c31 commit 3793cd7

File tree

4 files changed

+7
-33
lines changed

4 files changed

+7
-33
lines changed

.bumpversion.cfg

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,6 @@
22
current_version = 3.9.30
33
commit = True
44
tag = True
5-
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<prerelease_label>[a-z]+)\.(?P<prerelease>\d+))?
6-
serialize =
7-
{major}.{minor}.{patch}-{prerelease_label}.{prerelease}
8-
{major}.{minor}.{patch}
9-
10-
[bumpversion:part:prerelease]
11-
first_value = 0
12-
13-
[bumpversion:part:prerelease_label]
14-
optional_value = rc
15-
values =
16-
alpha
17-
beta
18-
rc
195

206
[bumpversion:file:setup.py]
217
search = version='{current_version}'
@@ -30,10 +16,8 @@ search = /v{current_version}...main
3016
replace = /v{new_version}...main
3117

3218
[bumpversion:file:docs/conf.py]
33-
search = version = '{current_version}'
34-
release = '{current_version}'
35-
replace = version = '{new_version}'
36-
release = '{new_version}'
19+
search = version = release = '{current_version}'
20+
replace = version = release = '{new_version}'
3721

3822
[bumpversion:file:src/geophires_x/__init__.py]
3923
search = __version__ = '{current_version}'
@@ -42,5 +26,3 @@ replace = __version__ = '{new_version}'
4226
[bumpversion:file:.cookiecutterrc]
4327
search = version: {current_version}
4428
replace = version: {new_version}
45-
46-
[bumpversion:part:release]

CONTRIBUTING.rst

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -278,16 +278,9 @@ Then push both commits and tags to your fork:
278278
Writing objects: 100% (1/1), 205 bytes | 205.00 KiB/s, done.
279279
Total 1 (delta 0), reused 0 (delta 0), pack-reused 0
280280
To github.com:softwareengineerprogrammer/python-geophires-x-nrel.git
281-
* [new tag] v3.2.3-alpha.0 -> v3.2.3-alpha.0
281+
* [new tag] v3.2.3 -> v3.2.3
282282
283-
Once the alpha version builds successfully in GitHubActions and you're ready to release it as v3.2.3:
284-
285-
.. code-block::
286-
287-
(venv) ➜ python-geophires-x git:(main) bumpversion release
288-
(venv) ➜ python-geophires-x git:(main) git push && git push fork --tags
289-
290-
Once a version bump is merged into the main repository with a Pull Request, tags must be manually pushed (GitHub `doesn't include tags in PRs <https://stackoverflow.com/questions/12278660/adding-tags-to-a-pull-request>`__):
283+
Once a version bump is merged into the main repository with a Pull Request, tag must be manually pushed (GitHub `doesn't include tags in PRs <https://stackoverflow.com/questions/12278660/adding-tags-to-a-pull-request>`__):
291284

292285
.. code-block::
293286

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ Free software: `MIT license <LICENSE>`__
5858
:alt: Supported implementations
5959
:target: https://pypi.org/project/geophires-x
6060

61-
.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v/v/v3.9.30...main.svg.svg
61+
.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.9.30.svg
6262
:alt: Commits since latest release
63-
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v/v/v3.9.30...main.svg...main
63+
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.9.30...main
6464

6565
.. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat
6666
:target: https://nrel.github.io/GEOPHIRES-X

docs/conf.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
year = '2025'
1919
author = 'NREL'
2020
copyright = f'{year}, {author}'
21-
version = '3.9.30'
22-
release = '3.9.30'
21+
version = release = '3.9.30'
2322

2423
pygments_style = 'trac'
2524
templates_path = ['./templates']

0 commit comments

Comments
 (0)