Skip to content

Commit b97f2db

Browse files
committed
Back to 3.9 and pin setuptools
1 parent a2ba8cb commit b97f2db

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ RUN apk --update --no-cache --virtual=build-dependencies add \
44
build-base python3-dev \libxml2-dev libxslt-dev postgresql-dev leveldb leveldb-dev && \
55
apk --update --no-cache add libstdc++ redis libpq && \
66
mkdir -p /run/redis && mkdir -p /var/run/dpp && \
7-
pip install psycopg2 datapackage-pipelines-github datapackage-pipelines-sourcespec-registry datapackage-pipelines-aws
7+
pip install -U pip "setuptools=66" && \
8+
pip install psycopg2 datapackage-pipelines-github datapackage-pipelines-sourcespec-registry datapackage-pipelines-aws
89

910
ADD . /dpp/
1011

Dockerfile.slim

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
FROM python:3.12-slim
1+
FROM python:3.9-slim
22

33
RUN apt-get update && apt-get install --no-install-recommends -y redis libleveldb1d libleveldb-dev build-essential libpq-dev && \
44
update-ca-certificates && mkdir -p /run/redis && mkdir -p /var/run/dpp && \
55
apt-get clean && rm -rf /var/lib/apt/lists/*
66

7+
RUN pip install psycopg2 datapackage-pipelines-github datapackage-pipelines-sourcespec-registry datapackage-pipelines-aws
8+
79
ADD . /dpp/
810

9-
RUN pip install psycopg2 datapackage-pipelines-github datapackage-pipelines-sourcespec-registry datapackage-pipelines-aws
1011
RUN pip install -U /dpp/[speedup] && \
1112
mkdir -p /var/redis && chmod 775 /var/redis && chown redis.redis /var/redis && \
1213
mkdir -p /var/log/redis && cd /etc && ln -s redis/redis.conf

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def read(*paths):
4242
'globster>=0.1.0',
4343
'dataflows>=0.2.11',
4444
'python-dateutil<2.8.1',
45-
'werkzeug<1.0'
45+
'werkzeug<1.0',
4646
]
4747
SPEEDUP_REQUIRES = [
4848
'dataflows[speedup]',

0 commit comments

Comments
 (0)