Merge branch 'master' into tests_inversion

openfisca · Jan 19, 2024 · 5c11710 · 5c11710
2 parents 31aa515 + 6f7af1a
commit 5c11710
Show file tree

Hide file tree

Showing 64 changed files with 3,215 additions and 500 deletions.
diff --git a/.conda/meta.yaml b/.conda/meta.yaml
@@ -1,10 +1,11 @@
 ###############################################################################
-## Fichier de description du package pour Anaconda.org
-## Le numéro de version est mis à jour automatiquement par BumpVer
+## File for Anaconda.org
+## It use Jinja2 templating code to retreive information from setup.py
 ###############################################################################
 
 {% set name = "openfisca-france-data" %}
-{% set version = "0.23.1" %}
+{% set data = load_setup_py_data() %}
+{% set version = data.get('version') %}
 
 package:
   name: {{ name|lower }}
@@ -23,13 +24,9 @@ requirements:
     - python
     - pip
   run:
-    - python >=3.7,<4.0
-    - click >=8.0.0,<9.0.0
-    - matplotlib >=3.1.1,<4.0.0
-    - multipledispatch >=0.6.0,<1.0.0
-    - openFisca-france >=113.0.0,<120.0.0  # Max 120 because of a bug in OF : https://github.com/openfisca/openfisca-france/issues/1996
-    - openFisca-survey-manager >=0.44.2,<1.0.0
-    - wquantiles >=0.3.0,<1.0.0
+    {% for req in data.get('install_requires', []) %}
+    - {{ req }}
+    {% endfor %}
 
 test:
   imports:
@@ -50,15 +47,9 @@ outputs:
       host:
         - python
       run:
-        - autopep8 >=1.4.0,<1.5.0
-        - flake8 >=3.7.0,<3.8.0
-        - ipython >=7.5.0,<8.0.0
-        - mypy >=0.670,<1.0.0
-        - pytest >=4.3.0,<5.0.0
-        - pytest-cov >=2.6.0,<3.0.0
-        - scipy >=1.2.1,<2.0.0
-        - toolz >=0.9.0,<1.0.0
-        - bumpver
+        {% for req in data.get('extras_require', []) %}
+        - {{ req }}
+        {% endfor %}
         - {{ pin_subpackage('openfisca-france-data', exact=True) }}
 
 about:

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: true
       matrix:
         os: ["ubuntu-20.04"]
-        python-version: ["3.8.9", "3.9.9"]
+        python-version: ["3.9.9", "3.10.6"]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -22,7 +22,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Cache build
         id: restore-build
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ env.pythonLocation }}
           key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-${{ matrix.os }}
@@ -33,7 +33,7 @@ jobs:
         run: make build
       - name: Cache release
         id: restore-release
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: dist
           key: release-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-${{ matrix.os }}
@@ -51,7 +51,7 @@ jobs:
           python-version: 3.9.9
       - name: Cache build
         id: restore-build
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ env.pythonLocation }}
           key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-ubuntu-20.04
@@ -91,7 +91,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ "ubuntu-20.04" ]  # On peut ajouter "macos-latest" si besoin
-        python-version: ["3.8.9", "3.9.9"]
+        python-version: ["3.9.9", "3.10.6"]
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
@@ -104,6 +104,7 @@ jobs:
         with:
           path: ${{ env.pythonLocation }}
           key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-${{ matrix.os }}
+      - run: pip install .[test]
       - run: make test
 
   check-version-and-changelog:
@@ -116,7 +117,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8.9
+          python-version: 3.9.9
       - name: Check version number has been properly updated
         run: "${GITHUB_WORKSPACE}/.github/is-version-number-acceptable.sh"
 
@@ -157,13 +158,13 @@ jobs:
           python-version: 3.9.9
       - name: Cache build
         id: restore-build
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ env.pythonLocation }}
           key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-ubuntu-20.04
       - name: Cache release
         id: restore-release
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: dist
           key: release-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-ubuntu-20.04
@@ -259,6 +260,7 @@ jobs:
           commit: ${{steps.last_pr_commit.outputs.result}}
           name: conda-build-${{ env.PACKAGE_VERSION }}-${{steps.last_pr_commit.outputs.result}}
           path: conda-build-tmp
+          event: push # To avoid conflict with PR workflow
           if_no_artifact_found: fail
       - name: Conda upload
         # This shell is made necessary by https://github.com/conda-incubator/setup-miniconda/issues/128

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -159,7 +159,7 @@ check-for-functional-changes:
   before_script:
   - ''
   script:
-  - if `.github/has-functional-changes.sh` ; then echo "OK to build package" ; fi
+  - if `.gitlab-ci/has-functional-changes.sh` ; then echo "OK to build package" ; fi
   only: 
   - master
-Original file line number
+Diff line change
@@ Expand Up / @@ -159,7 +159,7 @@ check-for-functional-changes: @@
       before_script:
       - ''
       script:
-      - if `.github/has-functional-changes.sh` ; then echo "OK to build package" ; fi
+      - if `.gitlab-ci/has-functional-changes.sh` ; then echo "OK to build package" ; fi
       only:
       - master
@@ Expand Down @@