From e4818d46c4134bb3877f08c3d50b829d687160fa Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Tue, 20 Dec 2022 10:30:38 +0000 Subject: [PATCH] Remove tests with old certifi dependency --- .github/workflows/python-deps.yml | 21 +---- python-setup/tests/pipenv/requests-2/Pipfile | 12 --- .../tests/pipenv/requests-2/Pipfile.lock | 60 -------------- .../tests/poetry/requests-2/poetry.lock | 81 ------------------- .../tests/poetry/requests-2/pyproject.toml | 15 ---- .../requirements/requests-2/requirements.txt | 1 - .../tests/requirements/requests-2/setup.py | 3 - .../tests/setup_py/requests-2/setup.py | 12 --- 8 files changed, 2 insertions(+), 203 deletions(-) delete mode 100644 python-setup/tests/pipenv/requests-2/Pipfile delete mode 100644 python-setup/tests/pipenv/requests-2/Pipfile.lock delete mode 100644 python-setup/tests/poetry/requests-2/poetry.lock delete mode 100644 python-setup/tests/poetry/requests-2/pyproject.toml delete mode 100644 python-setup/tests/requirements/requests-2/requirements.txt delete mode 100644 python-setup/tests/requirements/requests-2/setup.py delete mode 100644 python-setup/tests/setup_py/requests-2/setup.py diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index 2aecdd832d..e8e0a8d317 100644 --- a/.github/workflows/python-deps.yml +++ b/.github/workflows/python-deps.yml @@ -28,17 +28,7 @@ jobs: matrix: os: [ubuntu-20.04, ubuntu-22.04, macos-latest] python_deps_type: [pipenv, poetry, requirements, setup_py] - python_version: [2, 3] - exclude: - # Python2 and poetry are not supported. See https://github.com/actions/setup-python/issues/374 - - python_version: 2 - python_deps_type: poetry - # Python2 and pipenv are not supported since pipenv v2021.11.5 - - python_version: 2 - python_deps_type: pipenv - # Python2 is not available on ubuntu-22.04 by default -- see https://github.com/github/codeql-action/pull/1257 - - python_version: 2 - os: ubuntu-22.04 + python_version: [3] env: @@ -138,14 +128,7 @@ jobs: fail-fast: false matrix: python_deps_type: [pipenv, poetry, requirements, setup_py] - python_version: [2, 3] - exclude: - # Python2 and poetry are not supported. See https://github.com/actions/setup-python/issues/374 - - python_version: 2 - python_deps_type: poetry - # Python2 and pipenv are not supported since pipenv v2021.11.5 - - python_version: 2 - python_deps_type: pipenv + python_version: [3] env: CODEQL_ACTION_TEST_MODE: true diff --git a/python-setup/tests/pipenv/requests-2/Pipfile b/python-setup/tests/pipenv/requests-2/Pipfile deleted file mode 100644 index c9450bcf78..0000000000 --- a/python-setup/tests/pipenv/requests-2/Pipfile +++ /dev/null @@ -1,12 +0,0 @@ -[[source]] -name = "pypi" -url = "https://pypi.org/simple" -verify_ssl = true - -[dev-packages] - -[packages] -requests = "*" - -[requires] -python_version = "2.7" diff --git a/python-setup/tests/pipenv/requests-2/Pipfile.lock b/python-setup/tests/pipenv/requests-2/Pipfile.lock deleted file mode 100644 index bdb0a64904..0000000000 --- a/python-setup/tests/pipenv/requests-2/Pipfile.lock +++ /dev/null @@ -1,60 +0,0 @@ -{ - "_meta": { - "hash": { - "sha256": "76839637c628c87a4ac26d62aa559b8a572f4a742c8b6bd2f339f36514692676" - }, - "pipfile-spec": 6, - "requires": { - "python_version": "2.7" - }, - "sources": [ - { - "name": "pypi", - "url": "https://pypi.org/simple", - "verify_ssl": true - } - ] - }, - "default": { - "certifi": { - "hashes": [ - "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872", - "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569" - ], - "version": "==2021.10.8" - }, - "chardet": { - "hashes": [ - "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa", - "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5" - ], - "markers": "python_version < '3'", - "version": "==4.0.0" - }, - "idna": { - "hashes": [ - "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6", - "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0" - ], - "markers": "python_version < '3'", - "version": "==2.10" - }, - "requests": { - "hashes": [ - "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24", - "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7" - ], - "index": "pypi", - "version": "==2.26.0" - }, - "urllib3": { - "hashes": [ - "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece", - "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", - "version": "==1.26.7" - } - }, - "develop": {} -} diff --git a/python-setup/tests/poetry/requests-2/poetry.lock b/python-setup/tests/poetry/requests-2/poetry.lock deleted file mode 100644 index 5724dfdc3a..0000000000 --- a/python-setup/tests/poetry/requests-2/poetry.lock +++ /dev/null @@ -1,81 +0,0 @@ -[[package]] -name = "certifi" -version = "2021.10.8" -description = "Python package for providing Mozilla's CA Bundle." -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "chardet" -version = "4.0.0" -description = "Universal encoding detector for Python 2 and 3" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] -name = "idna" -version = "2.10" -description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[[package]] -name = "requests" -version = "2.26.0" -description = "Python HTTP for Humans." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" - -[package.dependencies] -certifi = ">=2017.4.17" -chardet = {version = ">=3.0.2,<5", markers = "python_version < \"3\""} -idna = {version = ">=2.5,<3", markers = "python_version < \"3\""} -urllib3 = ">=1.21.1,<1.27" - -[package.extras] -socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] -use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] - -[[package]] -name = "urllib3" -version = "1.26.7" -description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" - -[package.extras] -brotli = ["brotlipy (>=0.6.0)"] -secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] -socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] - -[metadata] -lock-version = "1.1" -python-versions = "^2.7" -content-hash = "c8501f2d45b33db399d74760be224bc771094fccce218ac8fe28f9b0ff85c63d" - -[metadata.files] -certifi = [ - {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, - {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, -] -chardet = [ - {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, - {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, -] -idna = [ - {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, - {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, -] -requests = [ - {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, - {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, -] -urllib3 = [ - {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"}, - {file = "urllib3-1.26.7.tar.gz", hash = "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"}, -] diff --git a/python-setup/tests/poetry/requests-2/pyproject.toml b/python-setup/tests/poetry/requests-2/pyproject.toml deleted file mode 100644 index 890d591478..0000000000 --- a/python-setup/tests/poetry/requests-2/pyproject.toml +++ /dev/null @@ -1,15 +0,0 @@ -[tool.poetry] -name = "autoinstall-test" -version = "0.1.0" -description = "" -authors = ["Your Name "] - -[tool.poetry.dependencies] -python = "^2.7" -requests = "*" - -[tool.poetry.dev-dependencies] - -[build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" diff --git a/python-setup/tests/requirements/requests-2/requirements.txt b/python-setup/tests/requirements/requests-2/requirements.txt deleted file mode 100644 index a8ed785e41..0000000000 --- a/python-setup/tests/requirements/requests-2/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -requests==2.26.0 diff --git a/python-setup/tests/requirements/requests-2/setup.py b/python-setup/tests/requirements/requests-2/setup.py deleted file mode 100644 index ea6a81184d..0000000000 --- a/python-setup/tests/requirements/requests-2/setup.py +++ /dev/null @@ -1,3 +0,0 @@ -# fake setup.py with Trove classifier to fool Python extractor to believe this is Python 2 for sure - -# Programming Language :: Python :: 2.7 diff --git a/python-setup/tests/setup_py/requests-2/setup.py b/python-setup/tests/setup_py/requests-2/setup.py deleted file mode 100644 index 5603a6b470..0000000000 --- a/python-setup/tests/setup_py/requests-2/setup.py +++ /dev/null @@ -1,12 +0,0 @@ -from setuptools import setup - -# has fake Trove classifier to fool Python extractor to believe this is Python 2 for sure - -# Programming Language :: Python :: 2.7 - - -setup( - name="example-setup.py", - install_requires=["requests==2.26.0"], - python_requires=">=2.7, <3", -)