Fix bump-my-version config to what derivepassphrase actually uses
Marco Ricci commited on 2025-06-14 19:05:26
Zeige 1 geänderte Dateien mit 9 Einfügungen und 9 Löschungen.
The version scheme did not match the actual pre-release version number formatting, the search-/replace-patterns overlapped, and the man pages were being searched for in the wrong directory.
- pyproject.toml 844cdc7..296f653
| ... | ... |
@@ -128,10 +128,10 @@ parse = '''(?x) |
| 128 | 128 |
)? |
| 129 | 129 |
''' |
| 130 | 130 |
serialize = [ |
| 131 |
- '{major}.{minor}.{patch}{pre_l}{pre_n}-{dev_t}{dev_n}',
|
|
| 131 |
+ '{major}.{minor}.{patch}{pre_l}{pre_n}.{dev_t}{dev_n}',
|
|
| 132 | 132 |
'{major}.{minor}.{patch}{pre_l}{pre_n}',
|
| 133 | 133 |
'{major}.{minor}.{patch}',
|
| 134 |
- '{major}.{minor}{pre_l}{pre_n}-{dev_t}{dev_n}',
|
|
| 134 |
+ '{major}.{minor}{pre_l}{pre_n}.{dev_t}{dev_n}',
|
|
| 135 | 135 |
'{major}.{minor}{pre_l}{pre_n}',
|
| 136 | 136 |
'{major}.{minor}',
|
| 137 | 137 |
] |
| ... | ... |
@@ -189,27 +189,27 @@ regex = true |
| 189 | 189 |
|
| 190 | 190 |
[[tool.bumpversion.files]] |
| 191 | 191 |
filename = 'pyproject.toml' |
| 192 |
-search = "version = '{current_version}'"
|
|
| 192 |
+search = "^ *version *= *'{current_version}'"
|
|
| 193 | 193 |
replace = "version = '{new_version}'"
|
| 194 | 194 |
regex = true |
| 195 | 195 |
|
| 196 | 196 |
[[tool.bumpversion.files]] |
| 197 | 197 |
filename = 'pyproject.toml' |
| 198 |
-search = "current_version = '{current_version}'"
|
|
| 198 |
+search = "^ *current_version *= *'{current_version}'"
|
|
| 199 | 199 |
replace = "current_version = '{new_version}'"
|
| 200 | 200 |
regex = true |
| 201 | 201 |
|
| 202 | 202 |
[[tool.bumpversion.files]] |
| 203 |
-glob = 'man/derivepassphrase*.1' |
|
| 203 |
+glob = 'share/man/man1/derivepassphrase*.1' |
|
| 204 | 204 |
regex = true |
| 205 |
-search = '^\.Dd \d\d\d\d-\d\d-\d\d' |
|
| 205 |
+search = '^\.Dd +\d\d\d\d-\d\d-\d\d' |
|
| 206 | 206 |
replace = '.Dd {now:%Y-%m-%d}'
|
| 207 | 207 |
|
| 208 | 208 |
[[tool.bumpversion.files]] |
| 209 |
-glob = 'man/derivepassphrase*.1' |
|
| 209 |
+glob = 'share/man/man1/derivepassphrase*.1' |
|
| 210 | 210 |
regex = true |
| 211 |
-search = '^\.Os derivepassphrase {current_version}'
|
|
| 212 |
-replace = '\.Os derivepassphrase {new_version}'
|
|
| 211 |
+search = '^\.Os +derivepassphrase +{current_version}'
|
|
| 212 |
+replace = '.Os derivepassphrase {new_version}'
|
|
| 213 | 213 |
|
| 214 | 214 |
[tool.coverage.html] |
| 215 | 215 |
directory = "html/coverage" |
| 216 | 216 |