Skip to content

Commit 15e5d34

Browse files
committed
Merge remote-tracking branch 'origin/master' into development
# Conflicts: # CHANGELOG.md
2 parents c5e9fea + 2492a02 commit 15e5d34

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.gitlab-ci.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@ stages:
55
- build
66
- deploy
77

8-
before_script:
9-
- apk --no-cache add gettext
8+
.set_version: &set_version |
9+
apk --no-cache add gettext
10+
VERSION=$(echo ${CI_COMMIT_REF_NAME} | sed "s/v//")
11+
export VERSION=$VERSION
12+
envsubst '${VERSION}' < setup.py > setup.py.new
13+
mv setup.py.new setup.py
1014

1115

1216
###################
@@ -25,10 +29,7 @@ unit-tests:
2529
build-package:
2630
stage: build
2731
script:
28-
- VERSION=$(echo ${CI_COMMIT_REF_NAME} | sed "s/v//")
29-
- export VERSION=$VERSION
30-
- envsubst '${VERSION}' < setup.py > setup.py.new
31-
- mv setup.py.new setup.py
32+
- *set_version
3233
- python3 setup.py sdist bdist_wheel
3334
artifacts:
3435
paths:
@@ -38,16 +39,14 @@ build-package:
3839
- master
3940
- tags
4041

42+
4143
###################
4244
# Deploy
4345
###################
4446
deploy-package:
4547
stage: deploy
4648
script:
47-
- VERSION=$(echo ${CI_COMMIT_REF_NAME} | sed "s/v//")
48-
- export VERSION=$VERSION
49-
- envsubst '${VERSION}' < setup.py > setup.py.new
50-
- mv setup.py.new setup.py
49+
- *set_version
5150
- echo -e "$PYPI" > ~/.pypirc
5251
- pip install twine
5352
- twine upload dist/* -r pypi

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
3333
- Get all transactions API
3434
- Tests
3535

36+
[1.0.1]: https://github.com/OpenFuturePlatform/open-api-python-sdk/compare/v1.0.1...v1.0.0
3637
[1.0.2]: https://github.com/OpenFuturePlatform/open-api-python-sdk/compare/v2.0.0...v1.0.1
3738
[1.0.1]: https://github.com/OpenFuturePlatform/open-api-python-sdk/compare/v1.0.1...v1.0.0
3839
[1.0.0]: https://github.com/OpenFuturePlatform/open-api-python-sdk/compare/e8d583f41e071d56dbc6dcf924bcc3a35c85b302...v1.0.0

0 commit comments

Comments
 (0)