Skip to content

Commit

Permalink
Back to 3.9 and pin setuptools
Browse files Browse the repository at this point in the history
  • Loading branch information
akariv committed Jan 28, 2025
1 parent a2ba8cb commit b97f2db
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ RUN apk --update --no-cache --virtual=build-dependencies add \
build-base python3-dev \libxml2-dev libxslt-dev postgresql-dev leveldb leveldb-dev && \
apk --update --no-cache add libstdc++ redis libpq && \
mkdir -p /run/redis && mkdir -p /var/run/dpp && \
pip install psycopg2 datapackage-pipelines-github datapackage-pipelines-sourcespec-registry datapackage-pipelines-aws
pip install -U pip "setuptools=66" && \
pip install psycopg2 datapackage-pipelines-github datapackage-pipelines-sourcespec-registry datapackage-pipelines-aws

ADD . /dpp/

Expand Down
5 changes: 3 additions & 2 deletions Dockerfile.slim
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
FROM python:3.12-slim
FROM python:3.9-slim

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

RUN pip install psycopg2 datapackage-pipelines-github datapackage-pipelines-sourcespec-registry datapackage-pipelines-aws

ADD . /dpp/

RUN pip install psycopg2 datapackage-pipelines-github datapackage-pipelines-sourcespec-registry datapackage-pipelines-aws
RUN pip install -U /dpp/[speedup] && \
mkdir -p /var/redis && chmod 775 /var/redis && chown redis.redis /var/redis && \
mkdir -p /var/log/redis && cd /etc && ln -s redis/redis.conf
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def read(*paths):
'globster>=0.1.0',
'dataflows>=0.2.11',
'python-dateutil<2.8.1',
'werkzeug<1.0'
'werkzeug<1.0',
]
SPEEDUP_REQUIRES = [
'dataflows[speedup]',
Expand Down

0 comments on commit b97f2db

Please sign in to comment.