Run country & extension template tests systematically

.circleci/config.yml

@@ -40,6 +40,14 @@ jobs:
           name: Run openfisca-core tests
           command: make test-core pytest_args="--exitfirst"
 
+      - run:
+          name: Run country-template tests
+          command: make test-country pytest_args="--exitfirst"
+
+      - run:
+          name: Run extension-template tests
+          command: make test-extension pytest_args="--exitfirst"
+
       - run:
           name: Check NumPy typing against latest 3 minor versions
           command: for i in {1..3}; do VERSION=$(.circleci/get-numpy-version.py prev) && pip install numpy==$VERSION && make check-types; done
@@ -49,12 +57,6 @@ jobs:
           paths:
             - .coverage
 
-      - run:
-          name: Run Country Template tests
-          command: |
-            COUNTRY_TEMPLATE_PATH=`python -c "import openfisca_country_template; print(openfisca_country_template.CountryTaxBenefitSystem().get_package_metadata()['location'])"`
-            openfisca test $COUNTRY_TEMPLATE_PATH/openfisca_country_template/tests/
-
   test_docs:
     docker:
       - image: python:3.7

.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="README.md CONTRIBUTING.md Makefile .gitignore LICENSE* .circleci/* .github/* openfisca_tasks/*.mk tasks/*.mk tests/*"
 
 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 [#1020](https://github.com/openfisca/openfisca-core/pull/1020)
+
+#### Technical changes
+
+- Run openfisca-core & country/extension template tests systematically
+
 ### 35.5.2 [#1048](https://github.com/openfisca/openfisca-core/pull/1048)
 
 #### Bug fix

Makefile

@@ -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

openfisca_tasks/publish.mk

@@ -1,7 +1,7 @@
 ## Install openfisca-core for deployment and publishing.
-build: setup.py
+build:
 	@## This allows us to be sure tests are run against the packaged version
 	@## of openfisca-core, the same we put in the hands of users and reusers.
 	@$(call print_help,$@:)
-	@python $? bdist_wheel
+	@python setup.py bdist_wheel
 	@find dist -name "*.whl" -exec pip install --force-reinstall {}[dev] \;

openfisca_tasks/test_code.mk

@@ -1,5 +1,8 @@
-## Run openfisca-core.
-test-code: test-core
+## The path to the installed packages.
+python_packages = $(shell python -c "import sysconfig; print(sysconfig.get_paths()[\"purelib\"])")
+
+## Run openfisca-core & country/extension template tests.
+test-code: test-core test-country test-extension
 	@##	Usage:
 	@##
 	@##		make test [pytest_args="--ARG"] [openfisca_args="--ARG"]
@@ -10,6 +13,7 @@ test-code: test-core
 	@##		make test pytest_args="--exitfirst"
 	@##		make test openfisca_args="--performance"
 	@##		make test pytest_args="--exitfirst" openfisca_args="--performance"
+	@##
 	@$(call print_pass,$@:)
 
 ## Run openfisca-core tests.
@@ -19,3 +23,22 @@ test-core: $(shell git ls-files "tests/*.py")
 		openfisca test $? \
 		${openfisca_args}
 	@$(call print_pass,$@:)
+
+## Run country-template tests.
+test-country:
+	@$(call print_help,$@:)
+	@PYTEST_ADDOPTS="${PYTEST_ADDOPTS} ${pytest_args}" \
+		openfisca test ${python_packages}/openfisca_country_template/tests \
+		--country-package openfisca_country_template \
+		${openfisca_args}
+	@$(call print_pass,$@:)
+
+## Run extension-template tests.
+test-extension:
+	@$(call print_help,$@:)
+	@PYTEST_ADDOPTS="${PYTEST_ADDOPTS} ${pytest_args}" \
+		openfisca test ${python_packages}/openfisca_extension_template/tests \
+		--country-package openfisca_country_template \
+		--extensions openfisca_extension_template \
+		${openfisca_args}
+	@$(call print_pass,$@:)

setup.py

@@ -36,7 +36,7 @@
 
 setup(
     name = 'OpenFisca-Core',
-    version = '35.5.2',
+    version = '35.5.3',
     author = 'OpenFisca Team',
     author_email = '[email protected]',
     classifiers = [