Skip to content

Commit 2b75bd0

Browse files
committed
fix version and pip uninstall for publish
1 parent ce84e06 commit 2b75bd0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ops/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ publish:
7474
- name: pypyr.steps.cmd
7575
description: --> uninstall current version of package before attempting to reinstall from pypi
7676
in:
77-
cmd: echo pip uninstall {package_name}
77+
cmd: echo pip uninstall -y {package_name}
7878
- name: pypyr.steps.contextcopy
7979
in:
8080
contextCopy:
@@ -119,7 +119,7 @@ get_version:
119119
version_module = importlib.import_module(context['version_module_name'])
120120
if context.get('is_version_module_loaded'):
121121
importlib.reload(version_module)
122-
context['version'] = f'v{version_module.__version__}'
122+
context['version'] = f'{version_module.__version__}'
123123
context['is_version_module_loaded'] = True
124124
- name: pypyr.steps.echo
125125
in:

ops/tag.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ steps:
2121
- name: pypyr.steps.cmd
2222
in:
2323
cmd:
24-
run: git tag -l "{version}"
24+
run: git tag -l "v{version}"
2525
save: True
2626
- name: pypyr.steps.stopstepgroup
2727
description: --> check if tag already exists
28-
run: !py cmdOut['stdout'].rstrip('\r\n') == version
28+
run: !py cmdOut['stdout'].rstrip('\r\n') == f'v{version}'
2929
- name: pypyr.steps.cmd
3030
comment: tag current HEAD
3131
description: --> create new tag for release
3232
in:
33-
cmd: git tag "{version}"
33+
cmd: git tag "v{version}"
3434
- name: pypyr.steps.call
3535
comment: set git info only on ci, not local dev.
3636
run: '{isCi}'

0 commit comments

Comments
 (0)