Python 3.9 (#69)

uc-cdis · Jan 31, 2023 · 76c91cc · 76c91cc
1 parent 5d6e1bd
commit 76c91cc
Show file tree

Hide file tree

Showing 5 changed files with 699 additions and 484 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -1,11 +1,11 @@
 {
-  "generated_at": "2020-07-20T20:19:41Z",
+  "version": "1.4.0",
   "plugins_used": [
     {
-      "name": "AWSKeyDetector"
+      "name": "ArtifactoryDetector"
     },
     {
-      "name": "ArtifactoryDetector"
+      "name": "AWSKeyDetector"
     },
     {
       "name": "Base64HighEntropyString",
@@ -31,8 +31,8 @@
       "name": "JwtTokenDetector"
     },
     {
-      "keyword_exclude": null,
-      "name": "KeywordDetector"
+      "name": "KeywordDetector",
+      "keyword_exclude": ""
     },
     {
       "name": "MailchimpDetector"
@@ -53,72 +53,61 @@
       "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": {
     ".travis.yml": [
       {
         "type": "Base64 High Entropy String",
         "filename": ".travis.yml",
-        "hashed_secret": "c0f6a9c34a9785144815d1663bf345f32ad0d411",
-        "is_verified": false,
-        "line_number": 28,
-        "is_secret": false
-      }
-    ],
-    "Pipfile.lock": [
-      {
-        "type": "Hex High Entropy String",
-        "filename": "Pipfile.lock",
-        "hashed_secret": "a208e4f9c74f7a205d0f4a3dee68140ce88ce818",
-        "is_verified": false,
-        "line_number": 4,
-        "is_secret": false
-      },
-      {
-        "type": "Hex High Entropy String",
-        "filename": "Pipfile.lock",
-        "hashed_secret": "6011ea66faf3039c5b29fdbaa0567c0356ff9a1c",
-        "is_verified": false,
-        "line_number": 125,
-        "is_secret": false
-      },
-      {
-        "type": "Hex High Entropy String",
-        "filename": "Pipfile.lock",
-        "hashed_secret": "640e60795f08744221f6816fe9dc949c58465256",
-        "is_verified": false,
-        "line_number": 130,
-        "is_secret": false
-      },
-      {
-        "type": "Hex High Entropy String",
-        "filename": "Pipfile.lock",
-        "hashed_secret": "d339625d7addea9138006aec1f6ca8679024e5bb",
-        "is_verified": false,
-        "line_number": 222,
-        "is_secret": false
-      },
-      {
-        "type": "Hex High Entropy String",
-        "filename": "Pipfile.lock",
-        "hashed_secret": "fb5db621cdd0255778280b17080c8dcdfb417066",
-        "is_verified": false,
-        "line_number": 227,
-        "is_secret": false
-      },
-      {
-        "type": "Hex High Entropy String",
-        "filename": "Pipfile.lock",
-        "hashed_secret": "d525d5ebd014ae5326d34dc39e47a1fce67f9991",
+        "hashed_secret": "f7c7521de09503540ad0e35bbb8119ad4c79f64d",
         "is_verified": false,
-        "line_number": 245,
-        "is_secret": false
+        "line_number": 8
       },
       {
-        "type": "Hex High Entropy String",
-        "filename": "Pipfile.lock",
-        "hashed_secret": "2698838211dc12f77bea1c167e20e0822d59a27c",
+        "type": "Base64 High Entropy String",
+        "filename": ".travis.yml",
+        "hashed_secret": "c0f6a9c34a9785144815d1663bf345f32ad0d411",
         "is_verified": false,
-        "line_number": 269,
+        "line_number": 28,
         "is_secret": false
       }
     ],
@@ -154,7 +143,7 @@
         "filename": "tests/test_client.py",
         "hashed_secret": "301918c8b904630da85e75ee32e9ba68ff925b73",
         "is_verified": false,
-        "line_number": 42,
+        "line_number": 16,
         "is_secret": false
       },
       {
@@ -167,41 +156,5 @@
       }
     ]
   },
-  "version": "1.4.0",
-  "filters_used": [
-    {
-      "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_sequential_string"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_potential_uuid"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_likely_id_string"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_templated_secret"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_indirect_reference"
-    },
-    {
-      "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
-      "min_level": 2
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_lock_file"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_swagger_file"
-    }
-  ]
+  "generated_at": "2023-01-30T20:56:37Z"
 }
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: python
 python:
-- '3.6'
+- '3.9'
 sudo: false
 env:
   global:
@@ -10,7 +10,7 @@ install:
 - pip install pipenv
 - pipenv install --dev --deploy --python `which python`
 - pipenv graph
-script: pipenv run py.test -vv
+script: pipenv run pytest -vv
 before_deploy:
 - sed -i.bak "s/=get_version()/='$TRAVIS_TAG'/g" setup.py
 - cat setup.py
@@ -21,7 +21,7 @@ deploy:
   skip_existing: true
   skip_cleanup: true
   on:
-    python: 3.6
+    python: 3.9
     repo: uc-cdis/indexclient
     tags: true
   password:

diff --git a/Pipfile b/Pipfile
@@ -3,19 +3,15 @@ name = "pypi"
 url = "https://pypi.org/simple"
 verify_ssl = true
 
+[packages]
+requests = "*"
+indexclient = {editable = true, path = "."}
+
 [dev-packages]
 pytest = "*"
 mock = "*"
-cdisutilstest = {editable = true,git = "https://github.com/uc-cdis/cdisutils-test.git",ref = "1.0.0"}
-indexd = {editable = true,git = "https://github.com/uc-cdis/indexd.git",ref = "2.4.0"}
-doiclient = {editable = true,git = "https://github.com/uc-cdis/doiclient.git",ref = "1.0.0"}
-dosclient = {editable = true,git = "https://github.com/uc-cdis/dosclient.git",ref = "1.0.0"}
-hsclient = {editable = true,git = "https://github.com/uc-cdis/hsclient.git",ref = "1.0.0"}
-cdislogging = {editable = true,git = "https://github.com/uc-cdis/cdislogging.git",ref = "1.0.0"}
-
-[packages]
-requests = "*"
-indexclient = {editable = true,path = "."}
+cdisutilstest = {editable = true, git = "https://github.com/uc-cdis/cdisutils-test.git", ref = "1.0.0"}
+indexd = {git = "https://github.com/uc-cdis/indexd.git", ref = "4.0.2"}
 
 [requires]
-python_version = "3.6"
+python_version = "3.9"