Merge github.com:cisagov/skeleton-python-library into lineage/skeleton

Author: mcdonnnj

.pre-commit-config.yaml

@@ -41,13 +41,20 @@ repos:
     hooks:
       - id: prettier
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.25.0
+    rev: v1.26.0
     hooks:
       - id: yamllint
         args:
           - --strict
 
   # Shell script hooks
+  - repo: https://github.com/lovesegfault/beautysh
+    rev: 6.0.1
+    hooks:
+      - id: beautysh
+        args:
+          - --indent-size
+          - '2'
   - repo: https://github.com/detailyang/pre-commit-shell
     rev: 1.0.5
     hooks:
@@ -85,16 +92,18 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.790
+    rev: v0.800
     hooks:
       - id: mypy
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.7.4
+    rev: v2.10.0
     hooks:
       - id: pyupgrade
 
   # Ansible hooks
   - repo: https://github.com/ansible-community/ansible-lint
+    # This is intentionally being held back because of issues in v5 per
+    # https://github.com/cisagov/skeleton-ansible-role/issues/69
     rev: v4.3.7
     hooks:
       - id: ansible-lint

bump_version.sh

@@ -14,38 +14,38 @@ old_version=$(sed -n "s/^__version__ = \"\(.*\)\"$/\1/p" $VERSION_FILE)
 
 if [ $# -ne 1 ]
 then
-   echo "$HELP_INFORMATION"
+  echo "$HELP_INFORMATION"
 else
-    case $1 in
-        major|minor|patch|prerelease|build)
-            new_version=$(python -c "import semver; print(semver.bump_$1('$old_version'))")
-            echo Changing version from "$old_version" to "$new_version"
-            # A temp file is used to provide compatability with macOS development
-            # as a result of macOS using the BSD version of sed
-            tmp_file=/tmp/version.$$
-            sed "s/$old_version/$new_version/" $VERSION_FILE > $tmp_file
-            mv $tmp_file $VERSION_FILE
-            git add $VERSION_FILE
-            git commit -m"Bump version from $old_version to $new_version"
-            git push
-            ;;
-        finalize)
-            new_version=$(python -c "import semver; print(semver.finalize_version('$old_version'))")
-            echo Changing version from "$old_version" to "$new_version"
-            # A temp file is used to provide compatability with macOS development
-            # as a result of macOS using the BSD version of sed
-            tmp_file=/tmp/version.$$
-            sed "s/$old_version/$new_version/" $VERSION_FILE > $tmp_file
-            mv $tmp_file $VERSION_FILE
-            git add $VERSION_FILE
-            git commit -m"Bump version from $old_version to $new_version"
-            git push
-            ;;
-        show)
-            echo "$old_version"
-            ;;
-        *)
-            echo "$HELP_INFORMATION"
-            ;;
-    esac
+  case $1 in
+    major|minor|patch|prerelease|build)
+      new_version=$(python -c "import semver; print(semver.bump_$1('$old_version'))")
+      echo Changing version from "$old_version" to "$new_version"
+      # A temp file is used to provide compatability with macOS development
+      # as a result of macOS using the BSD version of sed
+      tmp_file=/tmp/version.$$
+      sed "s/$old_version/$new_version/" $VERSION_FILE > $tmp_file
+      mv $tmp_file $VERSION_FILE
+      git add $VERSION_FILE
+      git commit -m"Bump version from $old_version to $new_version"
+      git push
+      ;;
+    finalize)
+      new_version=$(python -c "import semver; print(semver.finalize_version('$old_version'))")
+      echo Changing version from "$old_version" to "$new_version"
+      # A temp file is used to provide compatability with macOS development
+      # as a result of macOS using the BSD version of sed
+      tmp_file=/tmp/version.$$
+      sed "s/$old_version/$new_version/" $VERSION_FILE > $tmp_file
+      mv $tmp_file $VERSION_FILE
+      git add $VERSION_FILE
+      git commit -m"Bump version from $old_version to $new_version"
+      git push
+      ;;
+    show)
+      echo "$old_version"
+      ;;
+    *)
+      echo "$HELP_INFORMATION"
+      ;;
+  esac
 fi

requirements-dev.txt

@@ -1,3 +1,4 @@
 --requirement requirements-test.txt
 ipython
+mypy
 semver

setup-env

@@ -50,14 +50,14 @@ while (( "$#" )); do
       shift
       ;;
     -*) # unsupported flags
-       echo "Error: Unsupported flag $1" >&2
-       exit 1
-       ;;
+      echo "Error: Unsupported flag $1" >&2
+      exit 1
+      ;;
     *) # preserve positional arguments
-       PARAMS="$PARAMS $1"
-       shift
-       ;;
-      esac
+      PARAMS="$PARAMS $1"
+      shift
+      ;;
+  esac
 done
 
 # set positional arguments in their proper place

setup.py

@@ -48,13 +48,17 @@ def get_version(version_file):
     description="HTTP content hasher",
     long_description=readme(),
     long_description_content_type="text/markdown",
-    # NCATS "homepage"
-    url="https://www.us-cert.gov/resources/ncats",
-    # The project's main homepage
-    download_url="https://github.com/cisagov/hash-http-content",
+    # Landing page for CISA's cybersecurity mission
+    url="https://www.cisa.gov/cybersecurity",
+    # Additional URLs for this project per
+    # https://packaging.python.org/guides/distributing-packages-using-setuptools/#project-urls
+    project_urls={
+        "Source": "https://github.com/cisagov/hash-http-content",
+        "Tracker": "https://github.com/cisagov/hash-http-content/issues",
+    },
     # Author details
-    author="Cyber and Infrastructure Security Agency",
-    author_email="ncats@hq.dhs.gov",
+    author="Cybersecurity and Infrastructure Security Agency",
+    author_email="github@cisa.dhs.gov",
     license="License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[