Merge pull request #93 from cisagov/improvement/get-rid-of-python-war…

…ning

Get rid of Python warning about use of deprecated function

.pre-commit-config.yaml

@@ -121,7 +121,7 @@ repos:
     hooks:
       - id: black
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
         additional_dependencies:

README.md

@@ -30,7 +30,7 @@ expects the secrets in a different location.
 To run the `cisagov/pshtt_reporter` image via Docker:
 
 ```console
-docker run cisagov/pshtt_reporter:1.2.14
+docker run cisagov/pshtt_reporter:1.2.15
 ```
 
 ### Running with Docker Compose ###
@@ -43,7 +43,7 @@ docker run cisagov/pshtt_reporter:1.2.14
 
     services:
       pshtt_reporter:
-        image: cisagov/pshtt_reporter:1.2.14
+        image: cisagov/pshtt_reporter:1.2.15
         volumes:
           - type: bind
             source: <your_log_dir>
@@ -89,7 +89,7 @@ environment variables.  See the
 
     services:
       pshtt_reporter:
-        image: cisagov/pshtt_reporter:1.2.14
+        image: cisagov/pshtt_reporter:1.2.15
         volumes:
           - type: bind
             source: <your_log_dir>
@@ -126,7 +126,7 @@ environment variables.  See the
 1. Pull the new image:
 
     ```console
-    docker pull cisagov/pshtt_reporter:1.2.14
+    docker pull cisagov/pshtt_reporter:1.2.15
     ```
 
 1. Recreate and run the container by following the [previous instructions](#running-with-docker).
@@ -136,11 +136,11 @@ environment variables.  See the
 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.
-`:1.2.14`).
+`:1.2.15`).
 
 | Image:tag | Description |
 |-----------|-------------|
-|`cisagov/pshtt_reporter:1.2.14`| An exact release version. |
+|`cisagov/pshtt_reporter:1.2.15`| An exact release version. |
 |`cisagov/pshtt_reporter:1.2`| The most recent release matching the major and minor version numbers. |
 |`cisagov/pshtt_reporter:1`| The most recent release matching the major version number. |
 |`cisagov/pshtt_reporter:edge` | The most recent image built from a merge into the `develop` branch of this repository. |
@@ -204,7 +204,7 @@ Build the image locally using this git repository as the [build context](https:/
 
 ```console
 docker build \
-  --tag cisagov/pshtt_reporter:1.2.14 \
+  --tag cisagov/pshtt_reporter:1.2.15 \
   https://github.com/cisagov/pshtt_reporter.git#develop
 ```
 
@@ -235,7 +235,7 @@ Docker:
       --file Dockerfile-x \
       --platform linux/amd64 \
       --output type=docker \
-      --tag cisagov/pshtt_reporter:1.2.14 .
+      --tag cisagov/pshtt_reporter:1.2.15 .
     ```
 
 ## Contributing ##

src/report/generate_https_scan_report.py

@@ -15,7 +15,7 @@
 # Standard Python Libraries
 import codecs
 import csv
-from datetime import datetime
+from datetime import datetime, timezone
 import json
 import os
 import shutil
@@ -79,7 +79,7 @@ def __init__(self, db, agency, debug=False):
         self.__agency = agency
         self.__agency_id = None
         self.__debug = debug
-        self.__generated_time = datetime.utcnow()
+        self.__generated_time = datetime.now(timezone.utc)
         self.__results = dict()  # reusable query results
         self.__requests = None
         self.__report_doc = {"scores": []}

src/version.txt

@@ -1 +1 @@
-__version__ = "1.2.14"
+__version__ = "1.2.15"