diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml index d1be245..8c8bc43 100644 --- a/.github/workflows/tag-release.yaml +++ b/.github/workflows/tag-release.yaml @@ -8,25 +8,22 @@ name: Create Release jobs: build: - name: Create Release + name: Auto-release d'un tag runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@master - name: Get tag message - run: | - tag_message=`git show "$TAG" | grep "^\- "` - echo "tag_message=$tag_message" >> "$GITHUB_ENV" - env: - TAG: ${{ github.ref }} + run: echo "TAG_MESSAGE=`git show ${{ github.ref_name }} | grep '^\- '`" >> "$GITHUB_ENV" - name: Create Release id: create_release uses: actions/create-release@latest env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token + TAG_MESSAGE: ${{ env.TAG_MESSAGE }} with: tag_name: ${{ github.ref }} - release_name: ${{ github.ref }} - body: ${{ env.tag_message }} + release_name: ${{ github.ref_name }} + body: ${{ env.TAG_MESSAGE }} draft: false prerelease: false diff --git a/README.md b/README.md index cfb6c1f..7384132 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # decp.info -> v2.1.3 +> v2.1.4 Outil d'exploration et de téléchargement des données essentielles de la commande publique. @@ -38,6 +38,11 @@ Ne pas oublier de mettre à jour les fichier .env. ## Notes de version +##### 2.1.4 (8 octobre 2025) + +- possibilité de filtrer sur le champ "Source" +- création automatique d'une release Github quand je push un tag + ##### 2.1.3 (4 octobre 2025) - tentative d'auto-release à chaque création de tag git diff --git a/pyproject.toml b/pyproject.toml index 33599eb..f70844b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "decp.info" description = "Interface d'exploration et d'analyse des marchés publics français." -version = "2.1.3" +version = "2.1.4" requires-python = ">= 3.10" authors = [ { name = "Colin Maudry", email = "colin+decp@maudry.com" } diff --git a/src/assets/decp.info.png b/src/assets/decp.info.png new file mode 100644 index 0000000..f2e91b5 Binary files /dev/null and b/src/assets/decp.info.png differ diff --git a/src/utils.py b/src/utils.py index 50b5a7a..69daa28 100644 --- a/src/utils.py +++ b/src/utils.py @@ -43,9 +43,9 @@ def add_resource_link(dff: pl.DataFrame) -> pl.DataFrame: dff = dff.with_columns( ( '' + pl.col("sourceDataset") + "" - ).alias("source") + ).alias("sourceDataset") ) - dff = dff.drop(["sourceFile", "sourceDataset"]) + dff = dff.drop(["sourceFile"]) return dff @@ -211,6 +211,7 @@ def filter_table_data(lff: pl.LazyFrame, filter_query: str) -> pl.LazyFrame: filtering_expressions = filter_query.split(" && ") for filter_part in filtering_expressions: col_name, operator, filter_value = split_filter_part(filter_part) + col_type = str(schema[col_name]) if debug: print("filter_value:", filter_value) @@ -313,7 +314,7 @@ def get_data_schema() -> dict: for col in original_schema["fields"]: new_schema[col["name"]] = col - new_schema["source"] = { + new_schema["sourceDataset"] = { "description": "Code de la source des données, avec un lien vers le fichier Open Data dont proviennent les données de ce marché public.", "title": "Source des données", "short_name": "Source",