Skip to content

Commit d9858ce

Browse files
committed
fix docs and tasks
1 parent a8ecf81 commit d9858ce

3 files changed

Lines changed: 13 additions & 30 deletions

File tree

.bumpversion.cfg

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,6 @@ current_version = 0.4.2
33
message = Bump version to {new_version}
44
commit = True
55
tag = True
6-
parse = ^
7-
(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
8-
(?:
9-
(?P<release>rc)
10-
(?:(?P<rc>\d+(?:\.\d+)*))?
11-
)?
12-
serialize =
13-
{major}.{minor}.{patch}{release}{rc}
14-
{major}.{minor}.{patch}
15-
16-
[bumpversion:part:release]
17-
optional_value = final
18-
values =
19-
rc
20-
final
216

227
[bumpversion:file:setup.py]
238
search = version='{current_version}'
@@ -30,3 +15,7 @@ replace = release = '{new_version}'
3015
[bumpversion:file:src/compas_assembly/__init__.py]
3116
search = __version__ = "{current_version}"
3217
replace = __version__ = "{new_version}"
18+
19+
[bumpversion:file:CHANGELOG.md]
20+
search = Unreleased
21+
replace = [{new_version}] {now:%Y-%m-%d}

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def linkcode_resolve(domain, info):
179179
}
180180

181181
html_context = {}
182-
html_static_path = []
182+
html_static_path = sphinx_compas_theme.get_html_static_path()
183183
html_extra_path = []
184184
html_last_updated_fmt = ""
185185
html_copy_source = False

tasks.py

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -193,26 +193,20 @@ def prepare_changelog(ctx):
193193

194194

195195
@task(help={
196-
'release_type': 'Type of release follows semver rules. Must be one of: major, minor, patch, major-rc, minor-rc, patch-rc, rc, release.'})
196+
'release_type': 'Type of release follows semver rules. Must be one of: major, minor, patch.'})
197197
def release(ctx, release_type):
198198
"""Releases the project in one swift command!"""
199-
if release_type not in ('patch', 'minor', 'major', 'major-rc', 'minor-rc', 'patch-rc', 'rc', 'release'):
200-
raise Exit('The release type parameter is invalid.\nMust be one of: major, minor, patch, major-rc, minor-rc, patch-rc, rc, release')
201-
202-
is_rc = release_type.find('rc') >= 0
203-
release_type = release_type.split('-')[0]
199+
if release_type not in ('patch', 'minor', 'major'):
200+
raise Exit('The release type parameter is invalid.\nMust be one of: major, minor, patch.')
204201

205202
# Run checks
206-
ctx.run('invoke check')
203+
ctx.run('invoke check test')
207204

208205
# Bump version and git tag it
209-
if is_rc:
210-
ctx.run('bump2version %s --verbose' % release_type)
211-
elif release_type == 'release':
212-
ctx.run('bump2version release --verbose')
213-
else:
214-
ctx.run('bump2version %s --verbose --no-tag' % release_type)
215-
ctx.run('bump2version release --verbose')
206+
ctx.run('bump2version %s --verbose' % release_type)
207+
208+
# Prepare the change log for the next release
209+
prepare_changelog(ctx)
216210

217211

218212
@contextlib.contextmanager

0 commit comments

Comments
 (0)