mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-03 13:19:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fixRounding

Browse Source
This commit is contained in:
Manon Brun
2024-04-08 09:13:57 +01:00
committed by GitHub
parent 78686faad3 f14acc371d
commit b70a3bce9f
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@@ -14,7 +14,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: awalsh128/cache-apt-pkgs-action@v1.4.1 - uses: awalsh128/cache-apt-pkgs-action@v1.4.2
with: with:
packages: libsasl2-dev python3-dev libldap2-dev libssl-dev packages: libsasl2-dev python3-dev libldap2-dev libssl-dev
version: 1.0 version: 1.0

1
cookbook/tests/other/test_automations.py
View File

@@ -156,6 +156,7 @@ def test_url_import_regex_replace(u1_s1):
if 'cookbook' in os.getcwd(): if 'cookbook' in os.getcwd():
test_file = os.path.join(os.getcwd(), 'other', 'test_data', recipe) test_file = os.path.join(os.getcwd(), 'other', 'test_data', recipe)
# TODO this catch doesn't really work depending on from where you start the test, must check for duplicate path sections
else: else:
test_file = os.path.join(os.getcwd(), 'cookbook', 'tests', 'other', 'test_data', recipe) test_file = os.path.join(os.getcwd(), 'cookbook', 'tests', 'other', 'test_data', recipe)
with open(test_file, 'r', encoding='UTF-8') as d: with open(test_file, 'r', encoding='UTF-8') as d:

12
requirements.txt
View File

@@ -2,18 +2,18 @@ Django==4.2.11
cryptography===42.0.5 cryptography===42.0.5
django-annoying==0.10.6 django-annoying==0.10.6
django-cleanup==8.0.0 django-cleanup==8.0.0
django-crispy-forms==2.0 django-crispy-forms==2.1
crispy-bootstrap4==2022.1 crispy-bootstrap4==2022.1
django-tables2==2.7.0 django-tables2==2.7.0
djangorestframework==3.14.0 djangorestframework==3.14.0
drf-writable-nested==0.7.0 drf-writable-nested==0.7.0
django-oauth-toolkit==2.3.0 django-oauth-toolkit==2.3.0
django-debug-toolbar==4.2.0 django-debug-toolbar==4.3.0
bleach==6.0.0 bleach==6.0.0
gunicorn==21.2.0 gunicorn==21.2.0
lxml==5.1.0 lxml==5.1.0
Markdown==3.5.1 Markdown==3.5.1
Pillow==10.2.0 Pillow==10.3.0
psycopg2-binary==2.9.9 psycopg2-binary==2.9.9
python-dotenv==1.0.0 python-dotenv==1.0.0
requests==2.31.0 requests==2.31.0
@@ -23,14 +23,14 @@ whitenoise==6.6.0
icalendar==5.0.11 icalendar==5.0.11
pyyaml==6.0.1 pyyaml==6.0.1
uritemplate==4.1.1 uritemplate==4.1.1
beautifulsoup4==4.12.2 beautifulsoup4==4.12.3
microdata==0.8.0 microdata==0.8.0
mock==5.1.0 mock==5.1.0
Jinja2==3.1.3 Jinja2==3.1.3
django-webpack-loader==3.0.1 django-webpack-loader==3.0.1
git+https://github.com/BITSOLVER/django-js-reverse@071e304fd600107bc64bbde6f2491f1fe049ec82 git+https://github.com/BITSOLVER/django-js-reverse@071e304fd600107bc64bbde6f2491f1fe049ec82
django-allauth==0.61.1 django-allauth==0.61.1
recipe-scrapers==14.52.0 recipe-scrapers==14.53.0
django-scopes==2.0.0 django-scopes==2.0.0
django-treebeard==4.7 django-treebeard==4.7
django-cors-headers==4.3.1 django-cors-headers==4.3.1
@@ -48,7 +48,7 @@ aiohttp==3.9.3
# Development # Development
pytest==8.0.0 pytest==8.0.0
pytest-django==4.8.0 pytest-django==4.8.0
pytest-cov===4.1.0 pytest-cov===5.0.0
pytest-factoryboy==2.6.0 pytest-factoryboy==2.6.0
pytest-html==4.1.1 pytest-html==4.1.1
pytest-asyncio==0.23.5 pytest-asyncio==0.23.5

2
vue/src/components/ShoppingLineItem.vue
View File

@@ -54,7 +54,7 @@
text-field="name" text-field="name"
value-field="id" value-field="id"
v-model="food.supermarket_category" v-model="food.supermarket_category"
@change="detail_modal_visible = false; updateFoodCategory(food)" @input="detail_modal_visible = false; updateFoodCategory(food)"
></b-form-select> ></b-form-select>
<b-button variant="info" block <b-button variant="info" block