Skip to content

Commit 658915f

Browse files
committed
Remove workaround to install unreleased pypi-attestation
1 parent 7ee4de0 commit 658915f

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
220220
set -x \
221221
&& apt-get update \
222222
&& apt-get install --no-install-recommends -y \
223-
libpq5 libxml2 libxslt1.1 libcurl4 git \
223+
libpq5 libxml2 libxslt1.1 libcurl4 \
224224
$(if [ "$DEVEL" = "yes" ]; then echo 'bash libjpeg62 postgresql-client build-essential libffi-dev libxml2-dev libxslt-dev libpq-dev libcurl4-openssl-dev libssl-dev vim oathtool'; fi) \
225225
&& apt-get clean \
226226
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -238,5 +238,4 @@ COPY . /opt/warehouse/src/
238238
RUN tldextract --update
239239
# Load our module to pre-compile as much bytecode as we can easily.
240240
# Saves time collectively on container boot!
241-
RUN pip install --force pypi-attestations@git+https://github.com/trailofbits/pypi-attestations/@dm/extensions
242241
RUN python -m warehouse

requirements/main.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ redis>=2.8.0,<6.0.0
6565
rfc3986
6666
sentry-sdk
6767
setuptools
68-
pypi-attestations==0.0.17
68+
pypi-attestations==0.0.18
6969
sqlalchemy[asyncio]>=2.0,<3.0
7070
stdlib-list
7171
stripe

requirements/main.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1798,9 +1798,9 @@ pyparsing==3.2.0 \
17981798
--hash=sha256:93d9577b88da0bbea8cc8334ee8b918ed014968fd2ec383e868fb8afb1ccef84 \
17991799
--hash=sha256:cbf74e27246d595d9a74b186b810f6fbb86726dbf3b9532efb343f6d7294fe9c
18001800
# via linehaul
1801-
pypi-attestations==0.0.17 \
1802-
--hash=sha256:5936c0c69af4e31d69543d03c9809c53c3f1c12b7eed6d83fe1bc81bf6a58c2e \
1803-
--hash=sha256:5a8a6a89f146d97357284fb6f467ea095273cf385f2f62ce49ad70b0a2057841
1801+
pypi-attestations==0.0.18 \
1802+
--hash=sha256:08490f8f6bebb032e0776539e130f8101163a96ad84e2983b9b0cd11a45f346f \
1803+
--hash=sha256:1c88f7d312ba86e82882d3d704077f9d87a360e5215d26c872e90565829ce855
18041804
# via -r requirements/main.in
18051805
pyqrcode==1.2.1 \
18061806
--hash=sha256:1b2812775fa6ff5c527977c4cd2ccb07051ca7d0bc0aecf937a43864abe5eff6 \

0 commit comments

Comments
 (0)