From 68379f53acb50af49d7c2ae865863d8890063a42 Mon Sep 17 00:00:00 2001 From: Olaf Meeuwissen Date: Sun, 7 May 2023 11:26:15 +0900 Subject: [PATCH] Revert Pygments backward incompatibility work-around The issue was fixed in upstream's 8.2.2 release. See https://github.com/getnikola/nikola/issues/3617#issuecomment-1114286968. This commit reverts 1af416853a6e5ef733bf2f09e1d01f76efebf2bf. --- .dockerignore | 1 - Dockerfile | 7 ++----- constraints.txt | 9 --------- 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 constraints.txt diff --git a/.dockerignore b/.dockerignore index 625cf00..5d0f124 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,2 @@ * !Dockerfile -!constraints.txt diff --git a/Dockerfile b/Dockerfile index 4bc459a..04f1dd0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,6 @@ MAINTAINER Olaf Meeuwissen 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 \ @@ -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.* \ @@ -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.* \ diff --git a/constraints.txt b/constraints.txt deleted file mode 100644 index fc77c6b..0000000 --- a/constraints.txt +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: © 2022 Olaf Meeuwissen - -# Use this file to work around backward compatibility issues that may -# be introduced by newer versions of dependencies at container image -# build time. - -# See https://github.com/getnikola/nikola/pull/3619 -Pygments < 2.12.0