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
5 changed files with 1568 additions and 1620 deletions
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
|
||||
|
||||
# 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 -
|
||||
|
||||
# copy project requirement files here to ensure they will be cached.
|
||||
|
@ -49,7 +49,7 @@ WORKDIR $PYSETUP_PATH
|
|||
COPY ./poetry.lock ./pyproject.toml ./
|
||||
|
||||
# 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
|
||||
|
@ -72,7 +72,7 @@ COPY ./alembic.ini $MEALIE_HOME/
|
|||
|
||||
# venv already has runtime deps installed we get a quicker install
|
||||
WORKDIR $MEALIE_HOME
|
||||
RUN . $VENV_PATH/bin/activate && poetry install
|
||||
RUN . $VENV_PATH/bin/activate && poetry install --with main,dev
|
||||
WORKDIR /
|
||||
|
||||
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
|
||||
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 /
|
||||
|
||||
# Grab CRF++ Model Release
|
||||
|
|
2
makefile
2
makefile
|
@ -36,7 +36,7 @@ code-gen: ## 🤖 Run Code-Gen Scripts
|
|||
|
||||
.PHONY: setup
|
||||
setup: ## 🏗 Setup Development Instance
|
||||
poetry install && \
|
||||
poetry install --with main,dev && \
|
||||
cd frontend && \
|
||||
yarn install && \
|
||||
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"
|
||||
tzdata = "^2021.5"
|
||||
uvicorn = {extras = ["standard"], version = "^0.13.0"}
|
||||
pre-commit = "^2.20.0"
|
||||
|
||||
[tool.poetry.dev-dependencies]
|
||||
[tool.poetry.group.dev.dependencies]
|
||||
black = "^21.12b0"
|
||||
coverage = "^5.5"
|
||||
coveragepy-lcov = "^0.1.1"
|
||||
|
@ -61,8 +60,6 @@ types-python-slugify = "^5.0.3"
|
|||
types-requests = "^2.27.12"
|
||||
types-urllib3 = "^1.26.11"
|
||||
|
||||
[tool.poetry.group.dev.dependencies]
|
||||
|
||||
[build-system]
|
||||
build-backend = "poetry.core.masonry.api"
|
||||
requires = ["poetry-core>=1.0.0"]
|
||||
|
|
Loading…
Reference in a new issue