Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use cisagov/scraper instead of llnl-scraper from PyPI #40

Merged
merged 3 commits into from
Mar 16, 2023
Merged

Use cisagov/scraper instead of llnl-scraper from PyPI #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6add4a1
Use the cisagov fork of LLNL/scraper
mcdonnnj Mar 15, 2023
6cf7d63
Update the version of `wheel` installed in the Python venv
mcdonnnj Mar 15, 2023
6f4dcc6
Add @dav3r to the CODEOWNERS
mcdonnnj Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
32 changes: 15 additions & 17 deletions src/Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.