Merge branch 'Yelp:master' into feature-plugin-email_address

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: ['3.7', '3.8', '3.9']
+        python: ['3.8', '3.9', '3.10']
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2

.github/workflows/pypi.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python: ['3.7', '3.8', '3.9']
+        python: ['3.8', '3.9', '3.10']
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2

detect_secrets/plugins/ibm_cloud_iam.py

@@ -34,7 +34,7 @@ def verify(self, secret: str) -> VerifiedResult:
 
 
 def verify_cloud_iam_api_key(apikey: Union[str, bytes]) -> requests.Response:  # pragma: no cover
-    if type(apikey) == bytes:
+    if type(apikey) is bytes:
         apikey = apikey.decode('UTF-8')
 
     headers = {

requirements-dev.txt

@@ -1,34 +1,34 @@
 attrs==21.4.0
 backports.entry-points-selectable==1.1.1
-certifi==2021.10.8
+certifi==2023.7.22
 cfgv==3.2.0
 charset-normalizer==2.0.7
 coverage==4.5.4
-distlib==0.3.6
-filelock==3.0.12
-flake8==3.5.0
+distlib==0.3.7
+filelock==3.13.1
+flake8==6.1.0
 gibberish-detector==0.1.1
 identify==2.3.0
-idna==3.3
-importlib-metadata==4.8.1
+idna==3.4
+importlib-metadata==6.8.0
 iniconfig==1.1.1
-mccabe==0.6.1
+mccabe==0.7.0
 monotonic==1.6
 mypy==0.971
 mypy-extensions==0.4.3
 nodeenv==1.6.0
 packaging==21.3
-platformdirs==2.0.2
+platformdirs==3.10.0
 pluggy==0.13.1
 pre-commit==2.17.0
 py==1.11.0
 pyahocorasick==1.4.4
-pycodestyle==2.3.1
-pyflakes==1.6.0
+pycodestyle==2.11.0
+pyflakes==3.1.0
 pyparsing==2.4.7
-pytest==6.2.2
+pytest==7.4.3
 PyYAML==6.0
-requests==2.26.0
+requests==2.31.0
 responses==0.16.0
 six==1.16.0
 toml==0.10.2
@@ -37,8 +37,8 @@ tox-pip-extensions==1.6.0
 typed-ast==1.5.4
 types-PyYAML==6.0.11
 types-requests==2.28.9
-typing-extensions==3.10.0.2
+typing-extensions==4.3.0
 unidiff==0.7.4
-urllib3==1.26.9
-virtualenv==20.6.0
-zipp==3.6.0
+urllib3==2.1.0
+virtualenv==20.24.6
+zipp==3.17.0

setup.py

@@ -24,9 +24,8 @@ def get_version():
     description='Tool for detecting secrets in the codebase',
     long_description=long_description,
     long_description_content_type='text/markdown',
-    license='Copyright Yelp, Inc. 2020',
-    author='Aaron Loo',
-    author_email='[email protected]',
+    author='Yelp, Inc.',
+    author_email='[email protected]',
     url='https://github.com/Yelp/detect-secrets',
     download_url='https://github.com/Yelp/detect-secrets/archive/{}.tar.gz'.format(VERSION),
     keywords=['secret-management', 'pre-commit', 'security', 'entropy-checks'],

tox.ini

@@ -1,9 +1,8 @@
 [tox]
 project = detect_secrets
 # These should match the ci python env list
-envlist = py{37,38,39},mypy
+envlist = py{38,39,310},mypy
 skip_missing_interpreters = true
-tox_pip_extensions_ext_venv_update = true
 
 [testenv]
 passenv = SSH_AUTH_SOCK