diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 152b115..ab07ea9 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -3,7 +3,7 @@ # These owners will be the default owners for everything in the # repo. Unless a later match takes precedence, these owners will be # requested for review when someone opens a pull request. -* @jsf9k @mcdonnnj +* @dav3r @jsf9k @mcdonnnj # These folks own any files in the .github directory at the root of # the repository and any of its subdirectories. diff --git a/Dockerfile b/Dockerfile index c479fcd..e712fb1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ ENV VIRTUAL_ENV="${CISA_HOME}/.venv" ENV PYTHON_PIP_VERSION=23.0.1 ENV PYTHON_PIPENV_VERSION=2023.2.18 ENV PYTHON_SETUPTOOLS_VERSION=67.6.0 -ENV PYTHON_WHEEL_VERSION=0.38.4 +ENV PYTHON_WHEEL_VERSION=0.40.0 # Install the dependencies necessary to build the cryptography Python # package. These are required to build the package if a pre-built wheel diff --git a/src/Pipfile b/src/Pipfile index 5ad74d8..d7b2956 100644 --- a/src/Pipfile +++ b/src/Pipfile @@ -7,8 +7,8 @@ name = "pypi" # Minimum version for IMDSv2 support boto3 = ">=1.13.23" docopt = ">=0.6.2" -# Minimum version for local COCOMO II calculation -llnl-scraper = ">=0.12.0" +# Use our fork for required functionality that is not in LLNL/scraper yet. +llnl-scraper = {file = "https://github.com/cisagov/scraper/archive/v0.14.0-dev.tar.gz"} [requires] python_full_version = "3.10.10" diff --git a/src/Pipfile.lock b/src/Pipfile.lock index 7dd7281..f5a2c41 100644 --- a/src/Pipfile.lock +++ b/src/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "85812c6a22af4d386b2ccd4e61fff9a3e4df2e7c55be0cf509c1204ed78a9ccc" + "sha256": "1413d26625ce214e9ce38d5c1f8cfe536e4dc8e0e89456a881cfd72f3b8fe569" }, "pipfile-spec": 6, "requires": { @@ -18,19 +18,19 @@ "default": { "boto3": { "hashes": [ - "sha256:5374c409d0153e5da4ccde3a0f7e3efac81ce7c60e4e18ffc9acc87c67e0c0a3", - "sha256:f4839565feeaaca4ef775b74a8df996b79b61d988db62c90571bcc948a9f24c5" + "sha256:278d896e9090a976f41ec68da5c572bc4e5b7cb1e515f1898fee8cb2fadfb50d", + "sha256:3ce2225a61832d69831d669d912424ea3863268ca1cfa2a82203bb90952acefa" ], "index": "pypi", - "version": "==1.26.88" + "version": "==1.26.91" }, "botocore": { "hashes": [ - "sha256:48ed2af0a10e7c15a3445eda62f665b106a2aba4ffa1ce730d7083022fd9596f", - "sha256:c320275d18ee140005ace4d04e9e720d5b1e30625cfde5267b1fc5133fd4d44d" + "sha256:4ed6a488aee1b42367eace71f7d0993dda05b02eebd7dcdd78db5c9ce3d80da5", + "sha256:a8a800a2a945da807758cace539fc5b5ec1d5082ce363799d3a3870c2c4ed6fc" ], "markers": "python_version >= '3.7'", - "version": "==1.29.88" + "version": "==1.29.91" }, "certifi": { "hashes": [ @@ -216,7 +216,6 @@ "sha256:fa507318e427169ade4e9eccef39e9011cdc19534f55ca2f36ec3f388c1f70f3", "sha256:ffd394c7896ed7821a6d13b24657c6a34b6e2650bd84ae063cf11ccffa4f1a97" ], - "markers": "python_full_version >= '3.6.0'", "version": "==39.0.2" }, "decorator": { @@ -266,12 +265,11 @@ "version": "==1.0.1" }, "llnl-scraper": { + "file": "https://github.com/cisagov/scraper/archive/v0.14.0-dev.tar.gz", "hashes": [ - "sha256:21e50f456586f662b288d3308c813a4b14e77cf09a26886a1dae065ecbc6a3fd", - "sha256:419acf4c265f0b332678817b4f835f1670dc776ced668e44fb63bfe61d1e191a" + "sha256:38b6168ef5c5b6896f2623101db0b326c30caf0c865b6599a1c3417ef229e0d5" ], - "index": "pypi", - "version": "==0.12.0" + "version": "==0.14.0.dev0" }, "msrest": { "hashes": [ @@ -311,7 +309,7 @@ "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86", "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", "version": "==2.8.2" }, "python-gitlab": { @@ -374,7 +372,7 @@ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", "version": "==1.16.0" }, "stashy": { @@ -393,11 +391,11 @@ }, "urllib3": { "hashes": [ - "sha256:076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72", - "sha256:75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1" + "sha256:8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305", + "sha256:aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", - "version": "==1.26.14" + "version": "==1.26.15" }, "vsts": { "hashes": [