Install llnl-scraper from PyPI

Dockerfile

@@ -29,13 +29,13 @@ ENV PYTHON_SETUPTOOLS_VERSION=82.0.0
 RUN apk --no-cache add \
   gcc=15.2.0-r2 \
   libffi-dev=3.5.2-r0 \
-  musl-dev=1.2.5-r21 \
+  musl-dev=1.2.5-r23 \
   # This package is being installed because we want to avoid building
   # wheels on some of the hardware platforms we support.  Note that we
   # must install it both here and in the build stage for this to work.
   py3-cryptography=46.0.7-r0 \
-  python3-dev=3.12.12-r0 \
-  python3=3.12.12-r0
+  python3-dev=3.12.13-r0 \
+  python3=3.12.13-r0
 
 ###
 # Create a Python virtual environment (venv) for setup (due to PEP 668), install the
@@ -77,7 +77,7 @@ RUN pipenv install --clear --deploy --extra-pip-args "--no-cache-dir" --verbose
 #
 # Official Docker images are in the form library/<app> while non-official
 # images are in the form <user>/<app>.
-FROM docker.io/library/python:3.12.12-alpine3.23 AS build-stage
+FROM docker.io/library/python:3.12.13-alpine3.23 AS build-stage
 
 ###
 # For a list of pre-defined annotation keys and value types see:

README.md

@@ -31,7 +31,7 @@ hosted by DHS](https://www.dhs.gov/code.json).
 To run the `cisagov/code-gov-update` image via Docker:
 
 ```console
-docker run cisagov/code-gov-update:0.3.0-rc.8
+docker run cisagov/code-gov-update:0.3.0-rc.9
 ```
 
 ### Running with Docker Compose ###
@@ -47,7 +47,7 @@ docker run cisagov/code-gov-update:0.3.0-rc.8
         environment:
           - AWS_CONFIG_FILE=path/to/aws_config
           - AWS_PROFILE=default
-        image: cisagov/code-gov-update:0.3.0-rc.8
+        image: cisagov/code-gov-update:0.3.0-rc.9
         init: true
     ```
 
@@ -95,7 +95,7 @@ environment variables.  See the
         environment:
           - AWS_CONFIG_FILE=/run/secrets/aws_config
           - AWS_PROFILE=default
-        image: cisagov/code-gov-update:0.3.0-rc.8
+        image: cisagov/code-gov-update:0.3.0-rc.9
         init: true
         secrets:
           - source: aws_config
@@ -131,7 +131,7 @@ environment variables.  See the
 1. Pull the new image:
 
     ```console
-    docker pull cisagov/code-gov-update:0.3.0-rc.8
+    docker pull cisagov/code-gov-update:0.3.0-rc.9
     ```
 
 1. Recreate and run the container by following the [previous instructions](#running-with-docker).
@@ -167,11 +167,11 @@ and then update dependencies as you would above.
 The images of this container are tagged with [semantic
 versions](https://semver.org) of the underlying example project that they
 containerize.  It is recommended that most users use a version tag (e.g.
-`:0.3.0-rc.8`).
+`:0.3.0-rc.9`).
 
 | Image:tag | Description |
 | --------- | ----------- |
-| `cisagov/code-gov-update:0.3.0-rc.8` | An exact release version. |
+| `cisagov/code-gov-update:0.3.0-rc.9` | An exact release version. |
 | `cisagov/code-gov-update:0.3` | The most recent release matching the major and minor version numbers. |
 | `cisagov/code-gov-update:0` | The most recent release matching the major version number. |
 | `cisagov/code-gov-update:edge` | The most recent image built from a merge into the `develop` branch of this repository. |
@@ -236,7 +236,7 @@ Build the image locally using this git repository as the [build context](https:/
 
 ```console
 docker build \
-  --tag cisagov/code-gov-update:0.3.0-rc.8 \
+  --tag cisagov/code-gov-update:0.3.0-rc.9 \
   https://github.com/cisagov/code-gov-update.git#develop
 ```
 
@@ -267,7 +267,7 @@ Docker:
       --file Dockerfile-x \
       --platform linux/amd64 \
       --output type=docker \
-      --tag cisagov/code-gov-update:0.3.0-rc.8 .
+      --tag cisagov/code-gov-update:0.3.0-rc.9 .
     ```
 
 ## Contributing ##

src/Pipfile

@@ -11,12 +11,8 @@ boto3 = ">=1.13.23"
 # dependency as long as we are using the system package.
 cryptography = "46.0.7"
 docopt = ">=0.6.2"
-# We need a bugfix for behavior in newer versions of cloc. Since there is not a
-# release on PyPI with the code in https://github.com/LLNL/scraper/pull/79, we
-# must instead pull directly from the GitHub repository. We use the latest (as
-# of this comment) commit on the default branch to serve as our version pin
-# equivalent.
-llnl-scraper = {file = "https://api.github.com/repos/LLNL/scraper/tarball/536a72ce1ceb2e209281ff72a2ed59e735d45c33"}
+# Minimum version with newer versions of cloc compatibility
+llnl-scraper = ">=0.15.0"
 
 [requires]
-python_full_version = "3.12.12"
+python_full_version = "3.12.13"

src/version.txt

@@ -1 +1 @@
-0.3.0-rc.8
+0.3.0-rc.9