Merge branch 'main' into dependabot/pip/apispec-6.8.1

pantos-io · Jan 7, 2025 · e01ada6 · e01ada6
2 parents d94e35c + 64361a2
commit e01ada6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -22,7 +22,7 @@ RUN ARCH=$(uname -m) && \
     bash miniconda.sh -b && \
     rm -f miniconda.sh
 
-RUN python3 -m pip install poetry
+RUN python3 -m pip install 'poetry<2.0.0'
 
 WORKDIR /app
 

diff --git a/debian/rules b/debian/rules
@@ -16,7 +16,7 @@ export DH_VIRTUALENV_INSTALL_ROOT=/opt/pantos
 export POETRY_VIRTUALENVS_CREATE=false
 PYTHON_VERSION = 3.12.4
 SNAKE=debian/$(PACKAGE)$(DH_VIRTUALENV_INSTALL_ROOT)/$(PACKAGE)/bin/python3
-EXTRA_REQUIREMENTS=--upgrade-pip --preinstall "setuptools>=38" --preinstall "poetry" --preinstall "dh-poetry"
+EXTRA_REQUIREMENTS=--upgrade-pip --preinstall "setuptools>=38" --preinstall "poetry<2.0.0" --preinstall "dh-poetry"
 DH_VENV_ARGS=--builtin-venv --python=$(SNAKE) $(EXTRA_REQUIREMENTS) \
             --extra-pip-arg=--progress-bar=on \
 			--pip-tool dh-poetry