From 8154ee548ab687c77ae72192b3e71499c0050da7 Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Wed, 1 Dec 2021 21:07:17 -0900 Subject: [PATCH] Chore/bump deps (#853) * add LDAP dep * bump extruct and scraper * allow for disabling auto backup * v0.5.4 changelog --- Dockerfile | 2 ++ docs/docs/changelog/v0.5.4.md | 28 +++++++++++++++++++ .../documentation/getting-started/install.md | 1 + mealie/core/config.py | 2 ++ mealie/services/backups/exports.py | 5 +++- poetry.lock | 14 +++++----- pyproject.toml | 4 +-- 7 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 docs/docs/changelog/v0.5.4.md diff --git a/Dockerfile b/Dockerfile index 9e9088a01e..ca4eca9fa2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,6 +44,8 @@ RUN apt-get update \ build-essential \ libpq-dev \ libwebp-dev \ + # LDAP Dependencies + libsasl2-dev libldap2-dev libssl-dev \ gnupg gnupg2 gnupg1 \ debian-keyring \ debian-archive-keyring \ diff --git a/docs/docs/changelog/v0.5.4.md b/docs/docs/changelog/v0.5.4.md new file mode 100644 index 0000000000..1ba26b5521 --- /dev/null +++ b/docs/docs/changelog/v0.5.4.md @@ -0,0 +1,28 @@ +# v0.5.4 - Bug Fixes + +**App Version: v0.5.4** + +**Database Version: v0.5.0** + +## Breaking Changes + +!!! error "Breaking Changes" + + None + +## What's Changed +* Add support for new languages by @sephrat in https://github.com/hay-kot/mealie/pull/781 +* Allow arrow keys to function when SearchDialog is not open by @asymworks in https://github.com/hay-kot/mealie/pull/777 +* Use firefox user agent when making requests by @cadamswaite in https://github.com/hay-kot/mealie/pull/780 +* Improve the SWAG Community Guide by @BryceStevenWilley in https://github.com/hay-kot/mealie/pull/793 +* New Crowdin updates by @hay-kot in https://github.com/hay-kot/mealie/pull/818 +* Add LDAP authentication support (v2, onto dev) by @dvdkon in https://github.com/hay-kot/mealie/pull/803 +* Auto backup is now disabled by default. Enable it by setting the AUTO_BACKUP_ENABLED env variable to true. + + +## New Contributors +* @asymworks made their first contribution in https://github.com/hay-kot/mealie/pull/777 +* @dvdkon made their first contribution in https://github.com/hay-kot/mealie/pull/803 + +**Full Changelog**: https://github.com/hay-kot/mealie/compare/v0.5.3...v0.5.4 + diff --git a/docs/docs/documentation/getting-started/install.md b/docs/docs/documentation/getting-started/install.md index 54e0648678..ce6180f264 100644 --- a/docs/docs/documentation/getting-started/install.md +++ b/docs/docs/documentation/getting-started/install.md @@ -138,6 +138,7 @@ services: | RECIPE_LANDSCAPE_VIEW | True | Default Recipe Settings - Set Landscape View | | RECIPE_DISABLE_COMMENTS | False | Default Recipe Settings - Disable Comments | | RECIPE_DISABLE_AMOUNT | False | Default Recipe Settings - Disable Amount | +| AUTO_BACKUP_ENABLED | False | Disable/Enable Mealie's Auto Backup Function | | API_PORT | 9000 | The port exposed by backend API. **Do not change this if you're running in Docker** | | API_DOCS | True | Turns on/off access to the API documentation locally. | | TZ | UTC | Must be set to get correct date/time on the server | diff --git a/mealie/core/config.py b/mealie/core/config.py index cfcb988215..e4bec13d06 100644 --- a/mealie/core/config.py +++ b/mealie/core/config.py @@ -172,6 +172,8 @@ def public_db_url(cls, v: Optional[str], values: dict[str, Any]) -> str: RECIPE_DISABLE_COMMENTS: bool = False RECIPE_DISABLE_AMOUNT: bool = False + AUTO_BACKUP_ENABLED: bool = False + class Config: env_file = BASE_DIR.joinpath(".env") env_file_encoding = "utf-8" diff --git a/mealie/services/backups/exports.py b/mealie/services/backups/exports.py index 28563464e1..3bd75580ad 100644 --- a/mealie/services/backups/exports.py +++ b/mealie/services/backups/exports.py @@ -6,7 +6,7 @@ from jinja2 import Template from mealie.core import root_logger -from mealie.core.config import app_dirs +from mealie.core.config import app_dirs, settings from mealie.db.database import db from mealie.db.db_setup import create_session from mealie.services.events import create_backup_event @@ -153,6 +153,9 @@ def backup_all( def auto_backup_job(): + if not settings.AUTO_BACKUP_ENABLED: + return + for backup in app_dirs.BACKUP_DIR.glob("Auto*.zip"): backup.unlink() diff --git a/poetry.lock b/poetry.lock index 862fd40d6b..861ca9898d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -246,7 +246,7 @@ gmpy2 = ["gmpy2"] [[package]] name = "extruct" -version = "0.12.0" +version = "0.13.0" description = "Extract embedded metadata from HTML markup" category = "main" optional = false @@ -1009,7 +1009,7 @@ rdflib = ">=5.0.0" [[package]] name = "recipe-scrapers" -version = "13.5.0" +version = "13.7.0" description = "Python package, scraping recipes from all over the internet" category = "main" optional = false @@ -1308,7 +1308,7 @@ pgsql = ["psycopg2-binary"] [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "938e8edc83d1059c87ed6af1f3943e444de7dc29fa91420c0d9c873d97459d46" +content-hash = "02b04e1af3f21f406605bbfef3b22990c0bec735439ae00f36867e83d5c5fa1c" [metadata.files] aiofiles = [ @@ -1508,8 +1508,8 @@ ecdsa = [ {file = "ecdsa-0.17.0.tar.gz", hash = "sha256:b9f500bb439e4153d0330610f5d26baaf18d17b8ced1bc54410d189385ea68aa"}, ] extruct = [ - {file = "extruct-0.12.0-py2.py3-none-any.whl", hash = "sha256:42c6c9f50b00aa6c17b5c26b5f1b3a337ebc27b427fafc3714f34ce3bbb16c2f"}, - {file = "extruct-0.12.0.tar.gz", hash = "sha256:d4a68bb79d1b85ff36d603a42c2666888bb480191a399a659d9daaf735358276"}, + {file = "extruct-0.13.0-py2.py3-none-any.whl", hash = "sha256:fe19b9aefdb4dfbf828c2b082b81a363a03a44c7591c2d6b62ca225cb8f8c0be"}, + {file = "extruct-0.13.0.tar.gz", hash = "sha256:50a5b5bac4c5e19ecf682bf63a28fde0b1bb57433df7057371f60b58c94a2c64"}, ] fastapi = [ {file = "fastapi-0.63.0-py3-none-any.whl", hash = "sha256:98d8ea9591d8512fdadf255d2a8fa56515cdd8624dca4af369da73727409508e"}, @@ -2087,8 +2087,8 @@ rdflib-jsonld = [ {file = "rdflib_jsonld-0.6.2-py2.py3-none-any.whl", hash = "sha256:011afe67672353ca9978ab9a4bee964dff91f14042f2d8a28c22a573779d2f8b"}, ] recipe-scrapers = [ - {file = "recipe_scrapers-13.5.0-py3-none-any.whl", hash = "sha256:37d311c01aaac5903d08cf6771512231fc3e908eb363acbca7a401a6dbdbcfb9"}, - {file = "recipe_scrapers-13.5.0.tar.gz", hash = "sha256:84d3c57b84e7ffe08bd3488fe7fba50b66819bb818d8451bfc47a84656099a14"}, + {file = "recipe_scrapers-13.7.0-py3-none-any.whl", hash = "sha256:97c1a4b7c0866a384a26efb201e538f292a9cdd2bd1d75a6aeba5de86c152d07"}, + {file = "recipe_scrapers-13.7.0.tar.gz", hash = "sha256:b416fab1020c64eb74a58e5b83580f9732153b9c64e93b5221ebdbfdc3c7716e"}, ] regex = [ {file = "regex-2021.11.10-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9345b6f7ee578bad8e475129ed40123d265464c4cfead6c261fd60fc9de00bcf"}, diff --git a/pyproject.toml b/pyproject.toml index bc29022f08..9b96d19108 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ python-dotenv = "^0.15.0" python-slugify = "^4.0.1" requests = "^2.25.1" PyYAML = "^5.3.1" -extruct = "^0.12.0" +extruct = "^0.13.0" python-multipart = "^0.0.5" fastapi-camelcase = "^1.0.2" bcrypt = "^3.2.0" @@ -32,7 +32,7 @@ lxml = "4.6.2" Pillow = "^8.2.0" pathvalidate = "^2.4.1" apprise = "0.9.3" -recipe-scrapers = "^13.2.7" +recipe-scrapers = "^13.7.0" psycopg2-binary = {version = "^2.9.1", optional = true} python-ldap = "^3.3.0" gunicorn = "^20.1.0"