From 3c3ce382b6b9018be20f8aaf03dc421df3b17331 Mon Sep 17 00:00:00 2001 From: Mauko Quiroga Date: Fri, 19 Oct 2018 20:35:40 +0200 Subject: [PATCH 1/3] Test against the packaged version --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1cae0f71..aaad07eb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,6 +28,7 @@ jobs: key: v1-py2-{{ checksum "setup.py" }} paths: - /tmp/venv/country_template + - dist - save_cache: key: v1-py2-{{ .Revision }} @@ -101,6 +102,7 @@ jobs: key: v1-py3-{{ checksum "setup.py" }} paths: - /tmp/venv/country_template + - dist - save_cache: key: v1-py3-{{ .Revision }} From f1e9eab86f2fb657aa94b732868432e186a41506 Mon Sep 17 00:00:00 2001 From: Mauko Quiroga Date: Tue, 30 Oct 2018 16:15:08 +0100 Subject: [PATCH 2/3] Cleanup CircleCI config --- .circleci/config.yml | 26 ++++++++++++-------------- .circleci/publish-python-package.sh | 3 --- 2 files changed, 12 insertions(+), 17 deletions(-) delete mode 100755 .circleci/publish-python-package.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index aaad07eb..19aff91f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: - checkout - restore_cache: - key: v1-py2-{{ checksum "setup.py" }} + key: v1-py2-deps-{{ checksum "setup.py" }} - run: name: Create a virtualenv @@ -25,13 +25,12 @@ jobs: # pip install --editable git+https://github.com/openfisca/openfisca-core.git@BRANCH#egg=OpenFisca-Core[web-api] # use a specific branch of OpenFisca-Core - save_cache: - key: v1-py2-{{ checksum "setup.py" }} + key: v1-py2-deps-{{ checksum "setup.py" }} paths: - /tmp/venv/country_template - - dist - save_cache: - key: v1-py2-{{ .Revision }} + key: v1-py2-build-{{ .Revision }} paths: - dist @@ -56,10 +55,10 @@ jobs: - checkout - restore_cache: - key: v1-py2-{{ checksum "setup.py" }} + key: v1-py2-deps-{{ checksum "setup.py" }} - restore_cache: - key: v1-py2-{{ .Revision }} + key: v1-py2-build-{{ .Revision }} - run: name: Check for functional changes @@ -69,7 +68,7 @@ jobs: name: Upload a Python package to Pypi command: | source /tmp/venv/country_template/bin/activate - .circleci/publish-python-package.sh + twine upload dist/* --username $PYPI_USERNAME --password $PYPI_PASSWORD - run: name: Publish a git tag @@ -83,7 +82,7 @@ jobs: - checkout - restore_cache: - key: v1-py3-{{ checksum "setup.py" }} + key: v1-py3-deps-{{ checksum "setup.py" }} - run: name: Create a virtualenv @@ -99,13 +98,12 @@ jobs: # pip install --editable git+https://github.com/openfisca/openfisca-core.git@BRANCH#egg=OpenFisca-Core[web-api] # use a specific branch of OpenFisca-Core - save_cache: - key: v1-py3-{{ checksum "setup.py" }} + key: v1-py3-deps-{{ checksum "setup.py" }} paths: - /tmp/venv/country_template - - dist - save_cache: - key: v1-py3-{{ .Revision }} + key: v1-py3-build-{{ .Revision }} paths: - dist @@ -130,10 +128,10 @@ jobs: - checkout - restore_cache: - key: v1-py3-{{ checksum "setup.py" }} + key: v1-py3-deps-{{ checksum "setup.py" }} - restore_cache: - key: v1-py3-{{ .Revision }} + key: v1-py3-build-{{ .Revision }} - run: name: Check for functional changes @@ -143,7 +141,7 @@ jobs: name: Upload a Python package to Pypi command: | source /tmp/venv/country_template/bin/activate - .circleci/publish-python-package.sh + twine upload dist/* --username $PYPI_USERNAME --password $PYPI_PASSWORD workflows: version: 2 diff --git a/.circleci/publish-python-package.sh b/.circleci/publish-python-package.sh deleted file mode 100755 index 1ad8af95..00000000 --- a/.circleci/publish-python-package.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /usr/bin/env bash - -twine upload dist/* --username $PYPI_USERNAME --password $PYPI_PASSWORD # publish From ae9a18922e3b34058a01f3c9eaa72a35141c8700 Mon Sep 17 00:00:00 2001 From: Mauko Quiroga Date: Tue, 30 Oct 2018 17:08:18 +0100 Subject: [PATCH 3/3] Bump version --- CHANGELOG.md | 6 ++++-- setup.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e0a0914..9f969d8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,15 @@ # Changelog -### 3.5.1 - [#59](https://github.com/openfisca/country-template/pull/59) +### 3.5.2 - [#59](https://github.com/openfisca/country-template/pull/59) [#62](https://github.com/openfisca/country-template/pull/62) [#63](https://github.com/openfisca/country-template/pull/63) * Technical change * Details: - Tests library against its packaged version - By doing so, we prevent some hideous bugs -## 3.5.0 +> Note: Version `3.5.1` has been unpublished as it accidentally introduced a bug. Please use version `3.5.2` or more recent. + +## 3.5.0 - [#58](https://github.com/openfisca/country-template/pull/58) * Technical change - In the `/spec` Web API route, use examples that apply to this country package diff --git a/setup.py b/setup.py index 525449ab..b54d5208 100755 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setup( name = "OpenFisca-Country-Template", - version = "3.5.1", + version = "3.5.2", author = "OpenFisca Team", author_email = "contact@openfisca.org", classifiers=[