Cleanup CircleCI config

openfisca · Oct 31, 2018 · 96cf8df · 96cf8df
2 parents 8d7651c + ae9a189
commit 96cf8df
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git 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,12 +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
 
       - save_cache:
-          key: v1-py2-{{ .Revision }}
+          key: v1-py2-build-{{ .Revision }}
           paths:
             - dist
 
@@ -55,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
@@ -68,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
@@ -82,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
@@ -98,12 +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
 
       - save_cache:
-          key: v1-py3-{{ .Revision }}
+          key: v1-py3-build-{{ .Revision }}
           paths:
             - dist
 
@@ -128,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
@@ -141,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
diff --git 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
@@ -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=[