mirror of
https://github.com/mealie-recipes/mealie.git
synced 2025-07-09 03:04:54 -04:00
chore: fix poetry breaking changes (#1921)
* poetry stop breaking my things * bump poetry version * drop dependabot
This commit is contained in:
parent
81e0c56484
commit
3ae72cfda1
46
.github/dependabot.yml
vendored
46
.github/dependabot.yml
vendored
@ -1,46 +0,0 @@
|
|||||||
version: 2
|
|
||||||
updates:
|
|
||||||
# Fetch and update latest `npm` packages
|
|
||||||
- package-ecosystem: npm
|
|
||||||
directory: "/frontend"
|
|
||||||
schedule:
|
|
||||||
interval: daily
|
|
||||||
time: "00:00"
|
|
||||||
open-pull-requests-limit: 10
|
|
||||||
reviewers:
|
|
||||||
- hay-kot
|
|
||||||
assignees:
|
|
||||||
- hay-kot
|
|
||||||
commit-message:
|
|
||||||
prefix: fix
|
|
||||||
prefix-development: chore
|
|
||||||
include: scope
|
|
||||||
# Fetch and update latest `github-actions` pkgs
|
|
||||||
- package-ecosystem: github-actions
|
|
||||||
directory: "/frontend"
|
|
||||||
schedule:
|
|
||||||
interval: daily
|
|
||||||
time: "00:00"
|
|
||||||
open-pull-requests-limit: 10
|
|
||||||
reviewers:
|
|
||||||
- hay-kot
|
|
||||||
assignees:
|
|
||||||
- hay-kot
|
|
||||||
commit-message:
|
|
||||||
prefix: fix
|
|
||||||
prefix-development: chore
|
|
||||||
include: scope
|
|
||||||
- package-ecosystem: pip
|
|
||||||
directory: "/mealie"
|
|
||||||
schedule:
|
|
||||||
interval: daily
|
|
||||||
time: "00:00"
|
|
||||||
open-pull-requests-limit: 10
|
|
||||||
reviewers:
|
|
||||||
- hay-kot
|
|
||||||
assignees:
|
|
||||||
- hay-kot
|
|
||||||
commit-message:
|
|
||||||
prefix: fix
|
|
||||||
prefix-development: chore
|
|
||||||
include: scope
|
|
@ -41,7 +41,7 @@ RUN apt-get update \
|
|||||||
&& pip install -U --no-cache-dir pip
|
&& pip install -U --no-cache-dir pip
|
||||||
|
|
||||||
# install poetry - respects $POETRY_VERSION & $POETRY_HOME
|
# install poetry - respects $POETRY_VERSION & $POETRY_HOME
|
||||||
ENV POETRY_VERSION=1.2.1
|
ENV POETRY_VERSION=1.3.1
|
||||||
RUN curl -sSL https://install.python-poetry.org | python3 -
|
RUN curl -sSL https://install.python-poetry.org | python3 -
|
||||||
|
|
||||||
# copy project requirement files here to ensure they will be cached.
|
# copy project requirement files here to ensure they will be cached.
|
||||||
@ -49,7 +49,7 @@ WORKDIR $PYSETUP_PATH
|
|||||||
COPY ./poetry.lock ./pyproject.toml ./
|
COPY ./poetry.lock ./pyproject.toml ./
|
||||||
|
|
||||||
# install runtime deps - uses $POETRY_VIRTUALENVS_IN_PROJECT internally
|
# install runtime deps - uses $POETRY_VIRTUALENVS_IN_PROJECT internally
|
||||||
RUN poetry install -E pgsql --no-dev
|
RUN poetry install -E pgsql --only main
|
||||||
|
|
||||||
###############################################
|
###############################################
|
||||||
# Development Image
|
# Development Image
|
||||||
@ -72,7 +72,7 @@ COPY ./alembic.ini $MEALIE_HOME/
|
|||||||
|
|
||||||
# venv already has runtime deps installed we get a quicker install
|
# venv already has runtime deps installed we get a quicker install
|
||||||
WORKDIR $MEALIE_HOME
|
WORKDIR $MEALIE_HOME
|
||||||
RUN . $VENV_PATH/bin/activate && poetry install
|
RUN . $VENV_PATH/bin/activate && poetry install --with main,dev
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
|
|
||||||
RUN chmod +x $MEALIE_HOME/mealie/run.sh
|
RUN chmod +x $MEALIE_HOME/mealie/run.sh
|
||||||
@ -122,7 +122,7 @@ COPY ./alembic.ini $MEALIE_HOME/
|
|||||||
|
|
||||||
# venv already has runtime deps installed we get a quicker install
|
# venv already has runtime deps installed we get a quicker install
|
||||||
WORKDIR $MEALIE_HOME
|
WORKDIR $MEALIE_HOME
|
||||||
RUN . $VENV_PATH/bin/activate && poetry install -E pgsql --no-dev
|
RUN . $VENV_PATH/bin/activate && poetry install -E pgsql --only main
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
|
|
||||||
# Grab CRF++ Model Release
|
# Grab CRF++ Model Release
|
||||||
|
2
makefile
2
makefile
@ -36,7 +36,7 @@ code-gen: ## 🤖 Run Code-Gen Scripts
|
|||||||
|
|
||||||
.PHONY: setup
|
.PHONY: setup
|
||||||
setup: ## 🏗 Setup Development Instance
|
setup: ## 🏗 Setup Development Instance
|
||||||
poetry install && \
|
poetry install --with main,dev && \
|
||||||
cd frontend && \
|
cd frontend && \
|
||||||
yarn install && \
|
yarn install && \
|
||||||
cd ..
|
cd ..
|
||||||
|
3127
poetry.lock
generated
3127
poetry.lock
generated
File diff suppressed because it is too large
Load Diff
@ -40,9 +40,8 @@ recipe-scrapers = "^14.24.0"
|
|||||||
requests = "^2.25.1"
|
requests = "^2.25.1"
|
||||||
tzdata = "^2021.5"
|
tzdata = "^2021.5"
|
||||||
uvicorn = {extras = ["standard"], version = "^0.13.0"}
|
uvicorn = {extras = ["standard"], version = "^0.13.0"}
|
||||||
pre-commit = "^2.20.0"
|
|
||||||
|
|
||||||
[tool.poetry.dev-dependencies]
|
[tool.poetry.group.dev.dependencies]
|
||||||
black = "^21.12b0"
|
black = "^21.12b0"
|
||||||
coverage = "^5.5"
|
coverage = "^5.5"
|
||||||
coveragepy-lcov = "^0.1.1"
|
coveragepy-lcov = "^0.1.1"
|
||||||
@ -61,8 +60,6 @@ types-python-slugify = "^5.0.3"
|
|||||||
types-requests = "^2.27.12"
|
types-requests = "^2.27.12"
|
||||||
types-urllib3 = "^1.26.11"
|
types-urllib3 = "^1.26.11"
|
||||||
|
|
||||||
[tool.poetry.group.dev.dependencies]
|
|
||||||
|
|
||||||
[build-system]
|
[build-system]
|
||||||
build-backend = "poetry.core.masonry.api"
|
build-backend = "poetry.core.masonry.api"
|
||||||
requires = ["poetry-core>=1.0.0"]
|
requires = ["poetry-core>=1.0.0"]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user