Merge branch 'master' into change-waste-ratio-to-input-mass

.env.sample

@@ -11,6 +11,6 @@ ENABLE_FOOD_SECTION=True
 MATOMO_HOST=stats.beta.gouv.fr
 MATOMO_SITE_ID=57
 MATOMO_TOKEN=xxx
-NODE_ENV=production
+NODE_ENV=development
 SCALINGO_POSTGRESQL_URL=please-change-this
 SENTRY_DSN=please-change-this

.github/workflows/node.js.yml

@@ -18,8 +18,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x]
-        python-version: [3.11]
+        node-version: [20.x]
+        python-version: [3.12]
 
     steps:
     - uses: actions/checkout@v4
@@ -53,15 +53,13 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/.local/share/virtualenvs
-        key: ${{ runner.os }}-${{ matrix.python-version }}-pipenv-${{ hashFiles('Pipfile.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-pipenv-
+        key: ${{ runner.os }}-python-${{ steps.setup-python.outputs.python-version }}-pipenv-${{ hashFiles('Pipfile.lock') }}
 
     - name: Install Node dependencies
       run: npm ci --prefer-offline --no-audit
 
     - name: Install Python dependencies
-      run: pip install pipenv && pipenv install
+      run: pip install pipenv && pipenv install -d
 
     - name: Install Ubuntu dependencies
       run: |
@@ -80,7 +78,7 @@ jobs:
       if: ${{ github.event_name == 'pull_request' }}
       env:
         LAST_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
-        GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_ACCESS_TOKEN: ${{ secrets.GH_REST_ACCESS_TOKEN }}
       run: |
         eval `ssh-agent -s`
         # Private ssh key used by this Github action to clone the private repo
@@ -91,9 +89,6 @@ jobs:
     - name: Build app
       run: npm run build --if-present
 
-    - name: Build Elm static Db
-      run: npm run db:build
-
     - name: Run prettier, openapi & ruff formatting check
       run: npm run lint:all
 

.github/workflows/release-please.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
     steps:
       - uses: googleapis/release-please-action@v4
         id: release

.github/workflows/score_history.yml

@@ -16,8 +16,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x]
-        python-version: [3.11]
+        node-version: [20.x]
+        python-version: [3.12]
 
     # Run the job manually, on push to master or if the commit contains "[score_history]"
     if: ${{ github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || contains(github.event.head_commit.message, '[score_history]') }}
@@ -65,7 +65,7 @@ jobs:
         run: npm ci --prefer-offline --no-audit
 
       - name: Install Python dependencies
-        run: pip install pipenv && pipenv install
+        run: pip install pipenv && pipenv install -d
 
 
       - name: Install Ubuntu dependencies

.gitignore

@@ -1,6 +1,7 @@
 /.env
 /dist
 elm-stuff
+/check-db-app.js
 /compute-aggregated-app.js
 /node_modules
 /public/app.js

.prettierignore

@@ -2,6 +2,7 @@
 *.yaml
 *.html
 *.md
+elm.json
 package-lock.json
 public/icomoon/*
 public/vendor/*

.slugignore

@@ -0,0 +1,12 @@
+elm-stuff/
+data/
+.elm/
+src/
+ecobalyse-private/.git
+tests/
+styles.scss
+review/
+
+node_modules/@parcel
+node_modules/@swc
+node_modules/@elm_binaries

CHANGELOG.md

@@ -1,5 +1,52 @@
 # Changelog
 
+## [2.2.0](https://github.com/MTES-MCT/ecobalyse/compare/v2.1.1...v2.2.0) (2024-09-12)
+
+
+### Features
+
+* add app version to openapi docs in the root endpoint. ([#726](https://github.com/MTES-MCT/ecobalyse/issues/726)) ([5959c34](https://github.com/MTES-MCT/ecobalyse/commit/5959c3483600a2668390f6f0dd8a2778218436c0))
+* add holistic durability in exploratory mode ([#721](https://github.com/MTES-MCT/ecobalyse/issues/721)) ([774faf3](https://github.com/MTES-MCT/ecobalyse/commit/774faf3ad553687e154d4f46bf1227ccd0571710))
+* render app version details in the changelog. ([#725](https://github.com/MTES-MCT/ecobalyse/issues/725)) ([8f6ea50](https://github.com/MTES-MCT/ecobalyse/commit/8f6ea50aa1d11c37a0afc54e0de68a69cffbb1bb))
+
+
+### Bug Fixes
+
+* accept custom making complexity for upcycled garments. ([#723](https://github.com/MTES-MCT/ecobalyse/issues/723)) ([8f61547](https://github.com/MTES-MCT/ecobalyse/commit/8f61547f942b3fefd2129550125e9e7c0591cbaa))
+* **ci:** check for ecobalyse-private when extracting the branch name ([#733](https://github.com/MTES-MCT/ecobalyse/issues/733)) ([23ae8a5](https://github.com/MTES-MCT/ecobalyse/commit/23ae8a564854ab6cdb4f38bc62f04a04a47ca3c4))
+* don't add disabled step impacts to lifecycle totals. ([#719](https://github.com/MTES-MCT/ecobalyse/issues/719)) ([b6a7e1c](https://github.com/MTES-MCT/ecobalyse/commit/b6a7e1c4ff190acef8d0af0ee0f02b93b19ee32d))
+* ensure express app is properly monitored by Sentry. ([#729](https://github.com/MTES-MCT/ecobalyse/issues/729)) ([84a39aa](https://github.com/MTES-MCT/ecobalyse/commit/84a39aa69a8771294195787401cd0e9e11403d1f))
+* make scalingo not segfaulting. ([#728](https://github.com/MTES-MCT/ecobalyse/issues/728)) ([1de5140](https://github.com/MTES-MCT/ecobalyse/commit/1de5140c7e75bae20bd6afb58a0180d389dd3254))
+* use fabric processes to compute fabric waste ([#712](https://github.com/MTES-MCT/ecobalyse/issues/712)) ([1cce55b](https://github.com/MTES-MCT/ecobalyse/commit/1cce55b229cc9e14de72037d381d06f2255fe0bd))
+
+## [2.1.1](https://github.com/MTES-MCT/ecobalyse/compare/v2.1.0...v2.1.1) (2024-09-02)
+
+
+### Bug Fixes
+
+* **ui:** Hide unreleased entry in production version selector. ([#715](https://github.com/MTES-MCT/ecobalyse/issues/715)) ([78e4e8e](https://github.com/MTES-MCT/ecobalyse/commit/78e4e8e567b71677e70aaf5c1f3f09aea612fb32))
+
+## [2.1.0](https://github.com/MTES-MCT/ecobalyse/compare/v2.0.0...v2.1.0) (2024-08-30)
+
+
+### Features
+
+* add a button to access material/ingredient details ([#703](https://github.com/MTES-MCT/ecobalyse/issues/703)) ([e6fa6fe](https://github.com/MTES-MCT/ecobalyse/commit/e6fa6fe1f58183c15d28d7c08949cd566391b980))
+* add a version selector widget. ([#700](https://github.com/MTES-MCT/ecobalyse/issues/700)) ([a4ac751](https://github.com/MTES-MCT/ecobalyse/commit/a4ac75194530bad42bc673502f0413a19c4da80a))
+* allow downloading explorer data as CSV. ([#705](https://github.com/MTES-MCT/ecobalyse/issues/705)) ([b0ce426](https://github.com/MTES-MCT/ecobalyse/commit/b0ce426d374744fb416188e17dcfdfb0a505b521))
+* **api,textile:** make all country params optional. ([#713](https://github.com/MTES-MCT/ecobalyse/issues/713)) ([9c6724b](https://github.com/MTES-MCT/ecobalyse/commit/9c6724b7fcf2ebb5352f6c385fe80cc371957dd8))
+* implement upcycling. ([#710](https://github.com/MTES-MCT/ecobalyse/issues/710)) ([b8b20ee](https://github.com/MTES-MCT/ecobalyse/commit/b8b20ee5f0b911eca035e10b7325ffd65adfb133))
+* serve multiple app versions ([#627](https://github.com/MTES-MCT/ecobalyse/issues/627)) ([dcbbfaa](https://github.com/MTES-MCT/ecobalyse/commit/dcbbfaa1fae97daa45a342f1cb037f888a499d9f))
+* version selector redirect to current location hash. ([#709](https://github.com/MTES-MCT/ecobalyse/issues/709)) ([4493fb8](https://github.com/MTES-MCT/ecobalyse/commit/4493fb87f500441c3a0c728c13973ebba2c18e65))
+
+
+### Bug Fixes
+
+* add github token to worklows ([#704](https://github.com/MTES-MCT/ecobalyse/issues/704)) ([053d920](https://github.com/MTES-MCT/ecobalyse/commit/053d92085c6f20f328be0d7bea41ba2d2bfaf581))
+* add missing run command for score history ([#697](https://github.com/MTES-MCT/ecobalyse/issues/697)) ([82207dc](https://github.com/MTES-MCT/ecobalyse/commit/82207dce85e67e19f8abaf6bd8e31ef407c493d1))
+* avoid scrolling to top when using the explorer. ([#702](https://github.com/MTES-MCT/ecobalyse/issues/702)) ([bc4332f](https://github.com/MTES-MCT/ecobalyse/commit/bc4332ffad9dfda4ae7f56b20afa78d779c1078f))
+* broken comparator charts on desynced cache data. ([#706](https://github.com/MTES-MCT/ecobalyse/issues/706)) ([9445b71](https://github.com/MTES-MCT/ecobalyse/commit/9445b7107311bcace6761f5a2d039c1b0dc103c0))
+
 ## [2.0.0](https://github.com/MTES-MCT/ecobalyse/compare/v1.3.2...v2.0.0) (2024-07-30)
 
 

Pipfile

@@ -3,22 +3,25 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 name = "pypi"
 
+[requires]
+python_version = "3.12"
+
 [packages]
 django = ">=5.0.8,<6"
 django-mail-auth = ">=3.2,<3.3"
 gunicorn = ">=22,<23"
 psycopg2-binary = "2.9.9"
 python-decouple = ">=3,<4"
-ruff = "*"
-SQLAlchemy = "2.0.30"
-pandas = "1.5.3"
 GitPython = "3.1.43"
-pre-commit = "*"
-numpy = ">=1,<2"
 pytest-django = "*"
 pygithub = "*"
 ecobalyse = {file = "packages/python/ecobalyse"}
 typer = "*"
 pytest-mock = "*"
 
 [dev-packages]
+numpy = ">=1,<2"
+pre-commit = "*"
+pandas = "1.5.3"
+ruff = "*"
+SQLAlchemy = "2.0.30"