Skip to content

Commit

Permalink
Revert Pygments backward incompatibility work-around
Browse files Browse the repository at this point in the history
The issue was fixed in upstream's 8.2.2 release.  See
getnikola/nikola#3617 (comment).

This commit reverts 1af4168.
  • Loading branch information
paddy-hack committed May 7, 2023
1 parent cb85285 commit 68379f5
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 15 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
*
!Dockerfile
!constraints.txt
7 changes: 2 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ MAINTAINER Olaf Meeuwissen <[email protected]>
ENV PIP_OPTS --no-cache-dir --disable-pip-version-check
ARG _VERSION

COPY constraints.txt /tmp/constraints.txt
RUN apk add --no-cache \
python3 \
py3-pip \
Expand All @@ -27,8 +26,7 @@ RUN apk add --no-cache \
jpeg-dev \
&& \
CFLAGS="$CFLAGS -L/lib" \
pip3 install -c /tmp/constraints.txt $PIP_OPTS \
nikola$_VERSION \
pip3 install $PIP_OPTS nikola$_VERSION \
&& \
apk del .build-deps && \
find /usr/lib/python3.* \
Expand All @@ -47,8 +45,7 @@ RUN apk add --no-cache \
python3-dev \
zeromq-dev \
&& \
pip3 install -c /tmp/constraints.txt $PIP_OPTS \
'nikola[extras]'$_VERSION \
pip3 install $PIP_OPTS 'nikola[extras]'$_VERSION \
&& \
apk del .extra-build-deps && \
find /usr/lib/python3.* \
Expand Down
9 changes: 0 additions & 9 deletions constraints.txt

This file was deleted.

0 comments on commit 68379f5

Please sign in to comment.