Skip to content

Commit

Permalink
Remove fallback to pkg_resources, since we use pip>23.1 (#142)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jensens committed May 18, 2024
2 parents 2003482 + 29428a8 commit 1c1c412
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 8 deletions.
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ COPY --from=builder --chown=500:500 /app /app
# Enable compilation of po files into mo files (This is added here for backward compatibility)

ENV zope_i18n_compile_mo_files=true
# https://github.com/pypa/pip/issues/12079
ENV _PIP_USE_IMPORTLIB_METADATA=0

# Link /data (the exposed volume) into /app/var
RUN ln -s /data /app/var
2 changes: 0 additions & 2 deletions Dockerfile.acceptance
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ ENV LISTEN_PORT=${ZSERVER_PORT}
ENV APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default-homepage
# Packages to be used in configuration
ENV CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors
# https://github.com/pypa/pip/issues/12079
ENV _PIP_USE_IMPORTLIB_METADATA=0

RUN ln -s /data /app/var

Expand Down
2 changes: 0 additions & 2 deletions Dockerfile.classicui
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,3 @@ RUN ln -s /data /app/var

# Setup default type for site creation to be classic
ENV TYPE=classic
# https://github.com/pypa/pip/issues/12079
ENV _PIP_USE_IMPORTLIB_METADATA=0
2 changes: 0 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ ENV DEBUG_MODE on
ENV zope_i18n_compile_mo_files=
# Set chameleon cache directory
ENV CHAMELEON_CACHE /app/var/cache
# https://github.com/pypa/pip/issues/12079
ENV _PIP_USE_IMPORTLIB_METADATA=0
# Expose Zope Port
EXPOSE 8080

Expand Down

0 comments on commit 1c1c412

Please sign in to comment.