Skip to content

Commit e3b6801

Browse files
committed
fix(deps): pin setuptools<80 to restore pkg_resources for CKAN CLI
setuptools 80+ removed pkg_resources as a top-level module. CKAN 2.11.4 cli.py still imports from it, so the container crashed on startup. Pin setuptools<80 in Pipfile; re-lock resolves to ==79.0.1 which includes pkg_resources. Reverts the temporary Dockerfile downgrade workaround from d60cb43.
1 parent d60cb43 commit e3b6801

3 files changed

Lines changed: 33 additions & 35 deletions

File tree

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jsonschema = "==3.2.0"
8989
charset-normalizer = "==3.3.2"
9090
python-dotenv = "==1.0.0"
9191
python-jose = "==3.3.0"
92-
setuptools = ">=65.0.0"
92+
setuptools = ">=65.0.0,<80.0.0"
9393
raven = "==6.10.0"
9494
tableschema = "==1.20.2"
9595
frictionless = ">=5.0.0,<6.0.0"

Pipfile.lock

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy/Dockerfile.prod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ COPY Pipfile Pipfile.lock /usr/lib/adx/
6161

6262
# Install Python dependencies
6363
WORKDIR /usr/lib/adx
64-
# setuptools 80+ removed pkg_resources; downgrade so CKAN CLI (which still
65-
# imports pkg_resources) can find it at runtime.
66-
RUN mkdir .venv && pipenv sync -v && .venv/bin/pip install "setuptools<80" && ln -s .venv venv
64+
RUN mkdir .venv && pipenv sync -v && ln -s .venv venv
6765

6866
# Install Node.js and yarn for React build
6967
RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \

0 commit comments

Comments
 (0)