Skip to content

Commit

Permalink
Repin dependencies to fix security alerts (#9717)
Browse files Browse the repository at this point in the history 
* repin current

* repin oldest

* csr must have version set to zero

* only set PIP_USE_PEP517 for macOS

* experiment with brew update git failure workaround
  • Loading branch information
@alexzorin
alexzorin committed Jul 5, 2023
1 parent 4fc4d53 commit d0e11c8
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 81 deletions.
5 changes: 5 additions & 0 deletions .azure-pipelines/templates/jobs/standard-tests-jobs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@ jobs:
IMAGE_NAME: macOS-12
PYTHON_VERSION: 3.7
TOXENV: cover
# As of pip 23.1.0, builds started failing on macOS unless this flag was set.
# See https://github.com/certbot/certbot/pull/9717#issuecomment-1610861794.
PIP_USE_PEP517: "true"
macos-cover:
IMAGE_NAME: macOS-12
TOXENV: cover
# See explanation under macos-py37-cover.
PIP_USE_PEP517: "true"
windows-py37:
IMAGE_NAME: windows-2019
PYTHON_VERSION: 3.7
Expand Down
6 changes: 6 additions & 0 deletions .azure-pipelines/templates/steps/tox-steps.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@ steps:
# We run brew update because we've seen attempts to install an older version
# of a package fail. See
# https://github.com/actions/virtual-environments/issues/3165.
#
# We untap homebrew/core and homebrew/cask and unset HOMEBREW_NO_INSTALL_FROM_API (which
# is set by the CI macOS env) because GitHub has been having issues, making these jobs
# fail on git clones: https://github.com/orgs/Homebrew/discussions/4612.
- bash: |
set -e
unset HOMEBREW_NO_INSTALL_FROM_API
brew untap homebrew/core homebrew/cask
brew update
brew install augeas
condition: startswith(variables['IMAGE_NAME'], 'macOS')
Expand Down
2 changes: 1 addition & 1 deletion certbot-ci/certbot_integration_tests/utils/misc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ def generate_csr(domains: Iterable[str], key_path: str, csr_path: str,
req.add_extensions([san_constraint])

req.set_pubkey(key)
req.set_version(2)
req.set_version(0)
req.sign(key, 'sha256')

with open(csr_path, 'wb') as file_h:
Expand Down
48 changes: 24 additions & 24 deletions tools/oldest_constraints.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,35 @@
# that script.
apacheconfig==0.3.2 ; python_full_version < "3.8.0" and python_version >= "3.7"
asn1crypto==0.24.0 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0"
astroid==2.15.3 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
astroid==2.15.5 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
boto3==1.15.15 ; python_full_version < "3.8.0" and python_version >= "3.7"
botocore==1.18.15 ; python_full_version < "3.8.0" and python_version >= "3.7"
cachetools==5.3.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
certifi==2022.12.7 ; python_full_version < "3.8.0" and python_version >= "3.7"
cachetools==5.3.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
certifi==2023.5.7 ; python_full_version < "3.8.0" and python_version >= "3.7"
cffi==1.11.5 ; python_full_version < "3.8.0" and python_version >= "3.7"
chardet==3.0.4 ; python_full_version < "3.8.0" and python_version >= "3.7"
cloudflare==1.5.1 ; python_full_version < "3.8.0" and python_version >= "3.7"
colorama==0.4.6 ; python_full_version < "3.8.0" and sys_platform == "win32" and python_version >= "3.7"
configargparse==1.5.3 ; python_full_version < "3.8.0" and python_version >= "3.7"
configobj==5.0.6 ; python_full_version < "3.8.0" and python_version >= "3.7"
coverage==7.2.3 ; python_version >= "3.7" and python_full_version < "3.8.0"
coverage==7.2.7 ; python_version >= "3.7" and python_full_version < "3.8.0"
cryptography==3.2.1 ; python_full_version < "3.8.0" and python_version >= "3.7"
cython==0.29.34 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0"
cython==0.29.35 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0"
dill==0.3.6 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
distlib==0.3.6 ; python_version >= "3.7" and python_full_version < "3.8.0"
distro==1.0.1 ; python_full_version < "3.8.0" and python_version >= "3.7"
dns-lexicon==3.2.1 ; python_full_version < "3.8.0" and python_version >= "3.7"
dnspython==1.15.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
exceptiongroup==1.1.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
execnet==1.9.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
filelock==3.11.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
filelock==3.12.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
funcsigs==0.4 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0"
future==0.18.3 ; python_full_version < "3.8.0" and python_version >= "3.7"
google-api-python-client==1.6.5 ; python_full_version < "3.8.0" and python_version >= "3.7"
google-auth==2.16.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
httplib2==0.9.2 ; python_full_version < "3.8.0" and python_version >= "3.7"
idna==2.6 ; python_full_version < "3.8.0" and python_version >= "3.7"
importlib-metadata==6.4.1 ; python_version >= "3.7" and python_version < "3.8"
importlib-metadata==6.6.0 ; python_version >= "3.7" and python_version < "3.8"
iniconfig==2.0.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
ipaddress==1.0.16 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0"
isort==5.11.5 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
Expand All @@ -40,27 +40,27 @@ lazy-object-proxy==1.9.0 ; python_full_version >= "3.7.2" and python_full_versio
logger==1.4 ; python_full_version < "3.8.0" and python_version >= "3.7"
mccabe==0.7.0 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
mypy-extensions==1.0.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
mypy==1.2.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
mypy==1.3.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
ndg-httpsclient==0.3.2 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0"
oauth2client==4.1.3 ; python_full_version < "3.8.0" and python_version >= "3.7"
packaging==23.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
parsedatetime==2.4 ; python_full_version < "3.8.0" and python_version >= "3.7"
pbr==1.8.0 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0"
pip==23.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
platformdirs==3.2.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
pip==23.1.2 ; python_version >= "3.7" and python_full_version < "3.8.0"
platformdirs==3.5.3 ; python_full_version < "3.8.0" and python_version >= "3.7"
pluggy==1.0.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
ply==3.4 ; python_full_version < "3.8.0" and python_version >= "3.7"
py==1.11.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
pyasn1-modules==0.2.8 ; python_full_version < "3.8.0" and python_version >= "3.7"
pyasn1-modules==0.3.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
pyasn1==0.4.8 ; python_full_version < "3.8.0" and python_version >= "3.7"
pycparser==2.14 ; python_full_version < "3.8.0" and python_version >= "3.7"
pylint==2.17.2 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
pylint==2.17.4 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
pyopenssl==17.5.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
pyparsing==2.2.1 ; python_full_version < "3.8.0" and python_version >= "3.7"
pyrfc3339==1.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
pytest-cov==4.0.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
pytest-xdist==3.2.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
pytest==7.3.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
pytest-cov==4.1.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
pytest-xdist==3.3.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
pytest==7.3.2 ; python_version >= "3.7" and python_full_version < "3.8.0"
python-augeas==0.5.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
python-dateutil==2.8.2 ; python_full_version < "3.8.0" and python_version >= "3.7"
python-digitalocean==1.11 ; python_full_version < "3.8.0" and python_version >= "3.7"
Expand All @@ -73,26 +73,26 @@ rsa==4.9 ; python_full_version < "3.8.0" and python_version >= "3.7"
s3transfer==0.3.7 ; python_full_version < "3.8.0" and python_version >= "3.7"
setuptools==41.6.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
six==1.11.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
tldextract==3.4.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
tldextract==3.4.4 ; python_version >= "3.7" and python_full_version < "3.8.0"
tomli==2.0.1 ; python_full_version < "3.8.0" and python_version >= "3.7"
tomlkit==0.11.7 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
tomlkit==0.11.8 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
tox==1.9.2 ; python_version >= "3.7" and python_full_version < "3.8.0"
typed-ast==1.5.4 ; python_version < "3.8" and python_version >= "3.7"
types-cryptography==3.3.23.2 ; python_version >= "3.7" and python_full_version < "3.8.0"
types-httplib2==0.22.0.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
types-pyopenssl==23.0.0.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
types-pyrfc3339==1.1.1.4 ; python_version >= "3.7" and python_full_version < "3.8.0"
types-python-dateutil==2.8.19.12 ; python_version >= "3.7" and python_full_version < "3.8.0"
types-python-dateutil==2.8.19.13 ; python_version >= "3.7" and python_full_version < "3.8.0"
types-pytz==2023.3.0.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
types-pywin32==306.0.0.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
types-requests==2.28.11.17 ; python_version >= "3.7" and python_full_version < "3.8.0"
types-setuptools==67.6.0.8 ; python_version >= "3.7" and python_full_version < "3.8.0"
types-pywin32==306.0.0.2 ; python_version >= "3.7" and python_full_version < "3.8.0"
types-requests==2.31.0.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
types-setuptools==67.8.0.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
types-six==1.16.21.8 ; python_version >= "3.7" and python_full_version < "3.8.0"
types-urllib3==1.26.25.10 ; python_version >= "3.7" and python_full_version < "3.8.0"
typing-extensions==4.5.0 ; python_version < "3.8" and python_version >= "3.7"
types-urllib3==1.26.25.13 ; python_version >= "3.7" and python_full_version < "3.8.0"
typing-extensions==4.6.3 ; python_version < "3.8" and python_version >= "3.7"
uritemplate==3.0.1 ; python_full_version < "3.8.0" and python_version >= "3.7"
urllib3==1.24.2 ; python_full_version < "3.8.0" and python_version >= "3.7"
virtualenv==20.21.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
virtualenv==20.23.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
wheel==0.33.6 ; python_full_version < "3.8.0" and python_version >= "3.7"
wrapt==1.15.0 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
zipp==3.15.0 ; python_version >= "3.7" and python_version < "3.8"

0 comments on commit d0e11c8

Please sign in to comment.