Skip to content

Commit 8edbcf7

Browse files
authored
Merge pull request #87 from IdentityPython/python_3_10
add Python 3.10 rc
2 parents ca85903 + 6893f1e commit 8edbcf7

File tree

9 files changed

+65
-36
lines changed

9 files changed

+65
-36
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
- "3.7"
1515
- "3.8"
1616
- "3.9"
17+
- "3.10.0-rc.2"
1718
steps:
1819
- uses: actions/checkout@v2
1920
- name: Set up Python ${{ matrix.python-version }}
@@ -33,6 +34,8 @@ jobs:
3334
run: |
3435
pip install poetry
3536
poetry config virtualenvs.in-project true
37+
- name: Python 3.10 workaround
38+
run: poetry config experimental.new-installer false
3639
- name: Install dependencies
3740
run: poetry install
3841
- name: Run pytest

poetry.lock

Lines changed: 53 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ jwkconv = "cryptojwt.tools.keyconv:main"
3838
jwtpeek = "cryptojwt.tools.jwtpeek:main"
3939

4040
[tool.poetry.dependencies]
41-
python = "^3.6"
41+
python = "^3.6.2"
4242
cryptography = "^3.4.6"
4343
requests = "^2.25.1"
4444
readerwriterlock = "^1.0.9"
4545

4646
[tool.poetry.dev-dependencies]
4747
alabaster = "^0.7.12"
48-
black = "^20.8b1"
48+
black = "^21.5b1"
4949
isort = "^5.6.4"
5050
pytest = "^6.1.2"
5151
pytest-black = "^0.3.12"

src/cryptojwt/key_issuer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222

2323
class KeyIssuer(object):
24-
""" A key issuer instance contains a number of KeyBundles. """
24+
"""A key issuer instance contains a number of KeyBundles."""
2525

2626
params = {
2727
"ca_certs": None,

src/cryptojwt/key_jar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323

2424
class KeyJar(object):
25-
""" A keyjar contains a number of KeyBundles sorted by owner/issuer """
25+
"""A keyjar contains a number of KeyBundles sorted by owner/issuer"""
2626

2727
def __init__(
2828
self,

src/cryptojwt/serialize/item.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
class KeyIssuer:
77
@staticmethod
88
def serialize(item: key_issuer.KeyIssuer) -> str:
9-
""" Convert from KeyIssuer to JSON """
9+
"""Convert from KeyIssuer to JSON"""
1010
return json.dumps(item.dump(exclude_attributes=["keybundle_cls"]))
1111

1212
def deserialize(self, spec: str) -> key_issuer.KeyIssuer:
13-
""" Convert from JSON to KeyIssuer """
13+
"""Convert from JSON to KeyIssuer"""
1414
_dict = json.loads(spec)
1515
issuer = key_issuer.KeyIssuer().load(_dict)
1616
return issuer

src/cryptojwt/tools/keyconv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def output_bytes(data: bytes, binary: bool = False, filename: Optional[str] = No
174174

175175

176176
def main():
177-
""" Main function"""
177+
"""Main function"""
178178
parser = argparse.ArgumentParser(description="JWK Conversion Utility")
179179

180180
parser.add_argument("--kid", dest="kid", metavar="key_id", help="Key ID")

src/cryptojwt/tools/keygen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
def main():
22-
""" Main function"""
22+
"""Main function"""
2323
parser = argparse.ArgumentParser(description="JSON Web Key (JWK) Generator")
2424

2525
parser.add_argument("--kty", dest="kty", metavar="type", help="Key type", required=True)

tests/test_04_key_jar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ def setup(self):
688688
self.sjwt_b = _jws.sign_compact([sig_key])
689689

690690
def test_no_kid_multiple_keys(self):
691-
""" This is extremely strict """
691+
"""This is extremely strict"""
692692
_jwt = factory(self.sjwt_a)
693693
# remove kid reference
694694
_jwt.jwt.headers["kid"] = ""

0 commit comments

Comments
 (0)