Skip to content

Commit aed5d21

Browse files
authored
Merge branch 'Yelp:master' into feature-plugin-email_address
2 parents 6167041 + d068f9e commit aed5d21

File tree

6 files changed

+22
-24
lines changed

6 files changed

+22
-24
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
matrix:
1919
os: [ubuntu-latest, macos-latest, windows-latest]
20-
python: ['3.7', '3.8', '3.9']
20+
python: ['3.8', '3.9', '3.10']
2121
steps:
2222
- uses: actions/checkout@v2
2323
- uses: actions/setup-python@v2

.github/workflows/pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [ubuntu-latest, macos-latest]
18-
python: ['3.7', '3.8', '3.9']
18+
python: ['3.8', '3.9', '3.10']
1919
steps:
2020
- uses: actions/checkout@v2
2121
- uses: actions/setup-python@v2

detect_secrets/plugins/ibm_cloud_iam.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def verify(self, secret: str) -> VerifiedResult:
3434

3535

3636
def verify_cloud_iam_api_key(apikey: Union[str, bytes]) -> requests.Response: # pragma: no cover
37-
if type(apikey) == bytes:
37+
if type(apikey) is bytes:
3838
apikey = apikey.decode('UTF-8')
3939

4040
headers = {

requirements-dev.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
attrs==21.4.0
22
backports.entry-points-selectable==1.1.1
3-
certifi==2021.10.8
3+
certifi==2023.7.22
44
cfgv==3.2.0
55
charset-normalizer==2.0.7
66
coverage==4.5.4
7-
distlib==0.3.6
8-
filelock==3.0.12
9-
flake8==3.5.0
7+
distlib==0.3.7
8+
filelock==3.13.1
9+
flake8==6.1.0
1010
gibberish-detector==0.1.1
1111
identify==2.3.0
12-
idna==3.3
13-
importlib-metadata==4.8.1
12+
idna==3.4
13+
importlib-metadata==6.8.0
1414
iniconfig==1.1.1
15-
mccabe==0.6.1
15+
mccabe==0.7.0
1616
monotonic==1.6
1717
mypy==0.971
1818
mypy-extensions==0.4.3
1919
nodeenv==1.6.0
2020
packaging==21.3
21-
platformdirs==2.0.2
21+
platformdirs==3.10.0
2222
pluggy==0.13.1
2323
pre-commit==2.17.0
2424
py==1.11.0
2525
pyahocorasick==1.4.4
26-
pycodestyle==2.3.1
27-
pyflakes==1.6.0
26+
pycodestyle==2.11.0
27+
pyflakes==3.1.0
2828
pyparsing==2.4.7
29-
pytest==6.2.2
29+
pytest==7.4.3
3030
PyYAML==6.0
31-
requests==2.26.0
31+
requests==2.31.0
3232
responses==0.16.0
3333
six==1.16.0
3434
toml==0.10.2
@@ -37,8 +37,8 @@ tox-pip-extensions==1.6.0
3737
typed-ast==1.5.4
3838
types-PyYAML==6.0.11
3939
types-requests==2.28.9
40-
typing-extensions==3.10.0.2
40+
typing-extensions==4.3.0
4141
unidiff==0.7.4
42-
urllib3==1.26.9
43-
virtualenv==20.6.0
44-
zipp==3.6.0
42+
urllib3==2.1.0
43+
virtualenv==20.24.6
44+
zipp==3.17.0

setup.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ def get_version():
2424
description='Tool for detecting secrets in the codebase',
2525
long_description=long_description,
2626
long_description_content_type='text/markdown',
27-
license='Copyright Yelp, Inc. 2020',
28-
author='Aaron Loo',
29-
author_email='[email protected]',
27+
author='Yelp, Inc.',
28+
author_email='[email protected]',
3029
url='https://github.com/Yelp/detect-secrets',
3130
download_url='https://github.com/Yelp/detect-secrets/archive/{}.tar.gz'.format(VERSION),
3231
keywords=['secret-management', 'pre-commit', 'security', 'entropy-checks'],

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
[tox]
22
project = detect_secrets
33
# These should match the ci python env list
4-
envlist = py{37,38,39},mypy
4+
envlist = py{38,39,310},mypy
55
skip_missing_interpreters = true
6-
tox_pip_extensions_ext_venv_update = true
76

87
[testenv]
98
passenv = SSH_AUTH_SOCK

0 commit comments

Comments
 (0)