Merge branch 'main' of https://github.com/jauderho/dockerfiles

jauderho · Mar 19, 2024 · 1d2d434 · 1d2d434
2 parents 6500147 + 816d38a
commit 1d2d434
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/docker-autocompose/Pipfile.lock b/docker-autocompose/Pipfile.lock
diff --git a/docker-autocompose/requirements.txt b/docker-autocompose/requirements.txt
@@ -3,7 +3,7 @@
 certifi==2024.2.2; python_version >= '3.6'
 charset-normalizer==3.3.2; python_full_version >= '3.7.0'
 docker==7.0.0; python_version >= '3.8'
--e git+https://github.com/jauderho/docker-autocompose.git@8372fc78bf4bae157cd86bb1cc02e420ad7170a9#egg=docker-autocompose
+-e git+https://github.com/jauderho/docker-autocompose.git@0bbaa18267c08ad2c4aea86f315410274c43fd1b#egg=docker-autocompose
 idna==3.6; python_version >= '3.5'
 packaging==21.3; python_version >= '3.6'
 pyaml==23.12.0; python_version >= '3.8'

diff --git a/sslyze/Pipfile.lock b/sslyze/Pipfile.lock
diff --git a/sslyze/requirements.txt b/sslyze/requirements.txt
@@ -1,7 +1,7 @@
 -i https://pypi.org/simple
 --extra-index-url https://www.piwheels.org/simple
 annotated-types==0.6.0; python_version >= '3.8'
-cffi==1.16.0; python_version >= '3.8'
+cffi==1.16.0; platform_python_implementation != 'PyPy'
 cryptography==41.0.7; python_version >= '3.7'
 nassl==5.2.0; python_version >= '3.8'
 pycparser==2.21