Skip to content

Commit 64afac0

Browse files
committed
Merge branch 'master' into feature/per-nutrition-plan-stats
2 parents 3f0b9ce + 3d17fac commit 64afac0

File tree

45 files changed

+1897
-1062
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1897
-1062
lines changed

.dockerignore

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,32 @@
1+
# Git
2+
.git
3+
.gitignore
4+
5+
# Docker
6+
Dockerfile*
7+
.dockerignore
8+
9+
# Python
10+
__pycache__/
11+
*.pyo
12+
*.pyd
113
.venv
214
venv
3-
node_modules
415
*.sqlite3
5-
**/__pycache__
616
*.egg-info
717

18+
# IDE / OS specific
19+
.idea/
20+
.vscode/
21+
*.swp
22+
.DS_Store
23+
824
# Other files and folders
925
/coverage.lcov
1026
/media/
1127
/static/
1228
/db/
13-
/extras/docker/open-food-facts/dump/*.tar.gz
14-
/extras/docker/open-food-facts/dump/off/*
29+
/extras/open-food-facts/dump/
1530
/extras/authors/commits_cache/
1631
/extras/authors/*.md
1732
/extras/scripts/*.json

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
name: CI job (python ${{ matrix.python-version }})
2323

2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626

2727
- name: Set up Python ${{ matrix.python-version }}
28-
uses: actions/setup-python@v5
28+
uses: actions/setup-python@v6
2929
with:
3030
python-version: ${{ matrix.python-version }}
3131

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020

2121
# Initializes the CodeQL tools for scanning.
2222
- name: Initialize CodeQL

.github/workflows/docker-base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222

2323
- name: Set up QEMU
2424
uses: docker/[email protected]

.github/workflows/docker-demo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424

2525
- name: Set up QEMU
2626
uses: docker/[email protected]

.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
3232
3333
- name: Checkout
34-
uses: actions/checkout@v4
34+
uses: actions/checkout@v5
3535

3636
- name: Docker meta
3737
id: meta
@@ -109,7 +109,7 @@ jobs:
109109
- build-prod
110110
steps:
111111
- name: Download digests
112-
uses: actions/download-artifact@v4
112+
uses: actions/download-artifact@v5
113113
with:
114114
path: /tmp/digests
115115
pattern: digests-*

.github/workflows/formatter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515

1616
- name: Checkout code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
- name: Get dependencies
2020
run: pip install ruff isort

.github/workflows/linter.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ jobs:
4646
# Checkout the code base #
4747
##########################
4848
- name: Checkout Code
49-
uses: actions/checkout@v4
49+
uses: actions/checkout@v5
5050

5151
################################
5252
# Run Linter against code base #
5353
################################
5454
- name: Lint Code Base
55-
uses: super-linter/super-linter@v7
55+
uses: super-linter/super-linter@v8
5656
env:
5757
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5858
VALIDATE_MARKDOWN: true

.yarn/install-state.gz

5.83 KB
Binary file not shown.

.yarnrc

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)