Skip to content

Commit f3b4934

Browse files
authored
chore(deps): drop setuptools dependency (#983)
Barman 3.19 dropped its runtime dependency on setuptools, so we no longer need to pin it in the sidecar requirements or install it in the image build. A Python 3.13 venv no longer seeds setuptools by default, so removing it from the pip upgrade keeps it out of the runtime image entirely. Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
1 parent bb53820 commit f3b4934

3 files changed

Lines changed: 1 addition & 8 deletions

File tree

containers/Dockerfile.sidecar

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ COPY containers/sidecar-requirements.txt .
5555

5656
# Create virtualenv and install dependencies
5757
RUN python3 -m venv /venv && \
58-
/venv/bin/pip install --upgrade pip setuptools wheel && \
58+
/venv/bin/pip install --upgrade pip wheel && \
5959
/venv/bin/pip install --no-cache-dir -r sidecar-requirements.txt
6060

6161
# Download and extract runtime library packages and their dependencies

containers/sidecar-requirements.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
barman[azure,cloud,google,snappy,zstandard,lz4]==3.19.1
2-
setuptools==82.0.1
32
zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability

containers/sidecar-requirements.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -780,9 +780,3 @@ zstandard==0.25.0 \
780780
--hash=sha256:fd7a5004eb1980d3cefe26b2685bcb0b17989901a70a1040d1ac86f1d898c551 \
781781
--hash=sha256:ffef5a74088f1e09947aecf91011136665152e0b4b359c42be3373897fb39b01
782782
# via barman
783-
784-
# The following packages are considered to be unsafe in a requirements file:
785-
setuptools==82.0.1 \
786-
--hash=sha256:7d872682c5d01cfde07da7bccc7b65469d3dca203318515ada1de5eda35efbf9 \
787-
--hash=sha256:a59e362652f08dcd477c78bb6e7bd9d80a7995bc73ce773050228a348ce2e5bb
788-
# via -r sidecar-requirements.in

0 commit comments

Comments
 (0)