diff --git a/Dockerfile b/Dockerfile index f1fbe1c89..24b7dcba2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN apk update \ py-pip \ musl-dev \ postgresql-dev \ - && pip install --no-cache-dir --upgrade pip setuptools \ + && pip install --no-cache-dir --upgrade -r requirements-sys.txt \ && pip install --no-cache-dir -e $MAGPIE_DIR \ && apk --purge del .build-deps diff --git a/Makefile b/Makefile index bc5afc5a3..d5df81eec 100644 --- a/Makefile +++ b/Makefile @@ -224,7 +224,7 @@ install-all: install-sys install-pkg install-dev .PHONY: install-sys install-sys: clean conda-env ## install system dependencies and required installers/runners @echo "Installing system dependencies..." - @bash -c '$(CONDA_CMD) pip install --upgrade pip setuptools' + @bash -c '$(CONDA_CMD) pip install --upgrade -r "$(APP_ROOT)/requirements-sys.txt"' @bash -c '$(CONDA_CMD) pip install gunicorn' .PHONY: install-pkg diff --git a/requirements-sys.txt b/requirements-sys.txt new file mode 100644 index 000000000..825e9e965 --- /dev/null +++ b/requirements-sys.txt @@ -0,0 +1,2 @@ +pip +setuptools<46 diff --git a/requirements.txt b/requirements.txt index 1cd7a3599..b627678d1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,6 +32,7 @@ typing wheel==0.33.0 webob ziggurat-foundations==0.8.3 +zope.interface>=4.7.0,<5 zope.sqlalchemy==1.1 # TODO: remove when merged # until fix merged and deployed (https://github.com/authomatic/authomatic/pull/195)