Skip to content

Commit

Permalink
pin 'zope.interface>=4.7.0' minimal version (via zopefoundation/zope.…
Browse files Browse the repository at this point in the history
…interface#30) to fix missing 'Features' feature officially removed (via pypa/setuptools#65) and pin setuptools<46.0.0
  • Loading branch information
fmigneault committed Mar 9, 2020
1 parent c18cfc3 commit 8e8ee89
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions requirements-sys.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pip
setuptools<46
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 8e8ee89

Please sign in to comment.