Merge branch 'master' into tests_inversion

openfisca · Mar 1, 2024 · d2fdc99 · d2fdc99
2 parents 5c11710 + 17cfeeb
commit d2fdc99
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -146,8 +146,7 @@ jobs:
     needs: [ check-for-functional-changes ]
     if: needs.check-for-functional-changes.outputs.status == 'success'
     env:
-      PYPI_USERNAME: openfisca-bot
-      PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      PYPI_TOKEN_OPENFISCA_BOT: ${{ secrets.PYPI_TOKEN_OPENFISCA_BOT }}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -169,7 +168,7 @@ jobs:
           path: dist
           key: release-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}-ubuntu-20.04
       - name: Upload a Python package to PyPi
-        run: twine upload dist/* --username $PYPI_USERNAME --password $PYPI_PASSWORD
+        run: twine upload dist/* --username __token__ --password $PYPI_TOKEN_OPENFISCA_BOT
       - name: Publish a git tag
         run: "${GITHUB_WORKSPACE}/.github/publish-git-tag.sh"
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+### 3.0.6 [#248](https://github.com/openfisca/openfisca-france-data/pull/248)
+* Technical changes
+- Correction d'une typo dans la PR précédente
+
+### 3.0.5 [#247](https://github.com/openfisca/openfisca-france-data/pull/247)
+* Technical changes
+- Pour corriger la publication de la librairie sur PyPi, passe à une authentification PyPi via un token
+
+
+### 3.0.4 [#246](https://github.com/openfisca/openfisca-france-data/pull/246)
+* Technical changes
+- Augmente la version d'openfisca-france exigée en dépendance
+
+
 ### 3.0.3 [#244](https://github.com/openfisca/openfisca-france-data/pull/244)
 * Technical changes:
 - Correction dees liens des paramètres dans la fonction create_taux_csg_remplacement

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name = "OpenFisca-France-Data",
-    version = "3.0.3",
+    version = "3.0.6",
     description = "OpenFisca-France-Data module to work with French survey data",
     long_description = long_description,
     long_description_content_type="text/markdown",
@@ -42,7 +42,7 @@
     python_requires = ">=3.9",
     install_requires = [
         "multipledispatch >=0.6.0, <1.0.0",
-        "OpenFisca-France >=155.0.0, <156.0.0",
+        "OpenFisca-France >=156.0.0, <157.0.0",
         "openFisca-survey-manager >=2.0.0, <2.1.0",
         ],
     extras_require = {