Merge branch 'master' into neutralize-variable-in-test

openfisca · Dec 14, 2021 · 938ca81 · 938ca81
2 parents b9984f2 + 601a397
commit 938ca81
Show file tree

Hide file tree

Showing 58 changed files with 1,666 additions and 525 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.circleci/publish-python-package.sh b/.circleci/publish-python-package.sh
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: pip
+  directory: "/"
+  schedule:
+    interval: monthly
+  labels:
+  - kind:dependencies
diff --git a/.circleci/get-numpy-version.py → .github/get-numpy-version.py b/.circleci/get-numpy-version.py → .github/get-numpy-version.py
diff --git a/.circleci/has-functional-changes.sh → .github/has-functional-changes.sh b/.circleci/has-functional-changes.sh → .github/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* .github/* tests/* openfisca_tasks/*.mk tasks/*.mk"
 
 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
 

diff --git a/.circleci/is-version-number-acceptable.sh → .github/is-version-number-acceptable.sh b/.circleci/is-version-number-acceptable.sh → .github/is-version-number-acceptable.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-if [[ $CIRCLE_BRANCH == master ]]
+if [[ ${GITHUB_REF#refs/heads/} == master ]]
 then
     echo "No need for a version check on master."
     exit 0

diff --git a/.circleci/publish-git-tag.sh → .github/publish-git-tag.sh b/.circleci/publish-git-tag.sh → .github/publish-git-tag.sh