[2/4] [test-built] Improve building workflow

.circleci/config.yml

@@ -19,11 +19,14 @@ jobs:
             python -m venv /tmp/venv/openfisca_core
             echo "source /tmp/venv/openfisca_core/bin/activate" >> $BASH_ENV
 
+      - run:
+          name: Install build dependencies
+          command: make install-builder
+
       - run:
           name: Install dependencies
           command: |
-            make install
-            make clean
+            make install-deps
             # pip install --editable git+https://github.com/openfisca/country-template.git@BRANCH_NAME#egg=OpenFisca-Country-Template  # use a specific branch of OpenFisca-Country-Template
             # pip install --editable git+https://github.com/openfisca/extension-template.git@BRANCH_NAME#egg=OpenFisca-Extension-Template  # use a specific branch of OpenFisca-Extension-Template
 
@@ -32,9 +35,13 @@ jobs:
           paths:
             - /tmp/venv/openfisca_core
 
+      - run:
+          name: Build & install openfisca-core
+          command: make clean build
+
       - run:
           name: Run linters
-          command: make lint
+          command: make clean lint
 
       - run:
           name: Run openfisca-core tests
@@ -151,10 +158,10 @@ jobs:
           command: if ! .circleci/has-functional-changes.sh ; then circleci step halt ; fi
 
       - run:
-          name: Upload a Python package to Pypi
+          name: Upload openfisca-core package to PyPi
           command: |
             source /tmp/venv/openfisca_core/bin/activate
-            .circleci/publish-python-package.sh
+            make install-publisher clean build publish
 
       - run:
           name: Publish a git tag

.circleci/has-functional-changes.sh

@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-IGNORE_DIFF_ON="README.md CONTRIBUTING.md Makefile .gitignore LICENSE* .circleci/* .github/* tests/*"
+IGNORE_DIFF_ON=".circleci/* .github/* tasks/* tests/* .gitignore conftest.py CONTRIBUTING.md LICENSE* Makefile README.md STYLEGUIDE.md"
 
 last_tagged_commit=`git describe --tags --abbrev=0 --first-parent`  # --first-parent ensures we don't follow tags not published in master through an unlikely intermediary merge commit
 

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 35.5.3 [#1058](https://github.com/openfisca/openfisca-core/pull/1058)
+
+#### Non-technical changes
+
+- Moves building workflow to `Makefile`.
+
 ### 35.5.2 [#1048](https://github.com/openfisca/openfisca-core/pull/1048)
 
 #### Bug fix

Makefile

@@ -1,9 +1,9 @@
-include openfisca_tasks/install.mk
-include openfisca_tasks/lint.mk
-include openfisca_tasks/publish.mk
-include openfisca_tasks/serve.mk
-include openfisca_tasks/test_code.mk
-include openfisca_tasks/test_doc.mk
+include tasks/dev.mk
+include tasks/lint.mk
+include tasks/publish.mk
+include tasks/serve.mk
+include tasks/test_code.mk
+include tasks/test_doc.mk
 
 ## To share info with the user, but no action is needed.
 print_info = $$(tput setaf 6)[i]$$(tput sgr0)
@@ -21,7 +21,7 @@ print_pass = echo $$(tput setaf 2)[✓]$$(tput sgr0) $$(tput setaf 8)$1$$(tput s
 ## Similar to `print_work`, but this will read the comments above a task, and
 ## print them to the user at the start of each task. The `$1` is a function
 ## argument.
-print_help = sed -n "/^$1/ { x ; p ; } ; s/\#\#/$(print_work)/ ; s/\./…/ ; x" ${MAKEFILE_LIST}
+print_help = sed -n "/^$1/ { x ; p ; } ; s/\#\#/\r$(print_work)/ ; s/\./…/ ; x" ${MAKEFILE_LIST}
 
 ## Same as `make`.
 .DEFAULT_GOAL := all

setup.py

@@ -36,7 +36,7 @@
 
 setup(
     name = 'OpenFisca-Core',
-    version = '35.5.2',
+    version = '35.5.3',
     author = 'OpenFisca Team',
     author_email = 'contact@openfisca.org',
     classifiers = [

openfisca_tasks/install.mk → tasks/dev.mk

@@ -1,7 +1,7 @@
 ## Install project dependencies.
 install:
 	@$(call print_help,$@:)
-	@pip install --upgrade pip twine wheel
+	@pip install --upgrade pip
 	@pip install --editable .[dev] --upgrade --use-deprecated=legacy-resolver
 
 ## Uninstall project dependencies.

tasks/publish.mk

@@ -0,0 +1,27 @@
+## Install building utils.
+install-builder:
+	@$(call print_help,$@:)
+	@pip install --upgrade pip setuptools wheel
+
+## Install publishing tools.
+install-publisher:
+	@$(call print_help,$@:)
+	@pip install --upgrade twine
+
+## Install build dependencies.
+install-deps:
+	@$(call print_help,$@:)
+	@python setup.py egg_info
+	@pip install $$(grep -v "^\[" *.egg-info/requires.txt)
+	@$(call print_pass,$@:)
+
+## Build & install openfisca-core for deployment and publishing.
+build:
+	@$(call print_help,$@:)
+	@python setup.py bdist_wheel
+	@find dist -name "*.whl" -exec pip install --force-reinstall --no-dependencies {} \;
+	@$(call print_pass,$@:)
+
+## Upload openfisca-core package to PyPi.
+publish:
+	@twine upload dist/* --username $${PYPI_USERNAME} --password $${PYPI_PASSWORD}