Skip to content

Commit 1c1c412

Browse files
authored
Remove fallback to pkg_resources, since we use pip>23.1 (#142)
We added an environment variable to let pip < 23.2 fal back to using pkg_resources instead of importlib_metadata because ther was a regression. this was solved in pip 23.2, release around July 2023 and our recent Plone releases all use this pip or newer. pypa/pip#12079
2 parents 2003482 + 29428a8 commit 1c1c412

File tree

4 files changed

+0
-8
lines changed

4 files changed

+0
-8
lines changed

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ COPY --from=builder --chown=500:500 /app /app
1818
# Enable compilation of po files into mo files (This is added here for backward compatibility)
1919

2020
ENV zope_i18n_compile_mo_files=true
21-
# https://github.com/pypa/pip/issues/12079
22-
ENV _PIP_USE_IMPORTLIB_METADATA=0
2321

2422
# Link /data (the exposed volume) into /app/var
2523
RUN ln -s /data /app/var

Dockerfile.acceptance

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ ENV LISTEN_PORT=${ZSERVER_PORT}
3232
ENV APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default-homepage
3333
# Packages to be used in configuration
3434
ENV CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors
35-
# https://github.com/pypa/pip/issues/12079
36-
ENV _PIP_USE_IMPORTLIB_METADATA=0
3735

3836
RUN ln -s /data /app/var
3937

Dockerfile.classicui

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,3 @@ RUN ln -s /data /app/var
2424

2525
# Setup default type for site creation to be classic
2626
ENV TYPE=classic
27-
# https://github.com/pypa/pip/issues/12079
28-
ENV _PIP_USE_IMPORTLIB_METADATA=0

Dockerfile.dev

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ ENV DEBUG_MODE on
2828
ENV zope_i18n_compile_mo_files=
2929
# Set chameleon cache directory
3030
ENV CHAMELEON_CACHE /app/var/cache
31-
# https://github.com/pypa/pip/issues/12079
32-
ENV _PIP_USE_IMPORTLIB_METADATA=0
3331
# Expose Zope Port
3432
EXPOSE 8080
3533

0 commit comments

Comments
 (0)