Skip to content

Commit 32e20fc

Browse files
authored
Merge pull request #10 from EasyPost/v1.4.0
chore: prepare v1.4.0 for release
2 parents f7c37c5 + dde309d commit 32e20fc

File tree

5 files changed

+35
-26
lines changed

5 files changed

+35
-26
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ on:
77

88
jobs:
99
run-tests:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-20.04
1111
strategy:
1212
matrix:
13-
pythonversion: ['3.6', '3.8', '3.8', '3.9', 'pypy-3.6']
13+
pythonversion: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
1414
steps:
1515
- uses: actions/checkout@v2
1616
- name: set up python

CHANGES.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,37 @@
11
ChangeLog
22
=========
33

4+
1.4.0
5+
-----
6+
7+
- Adds proper support for `ecdsa-sha2-nistp384`
8+
49
1.3.3
510
-----
11+
612
- Fix RtD link issue
713

814
1.3.2
915
-----
16+
1017
- Fix PyPI project URLs
1118

1219
1.3.1
1320
-----
21+
1422
- Fix `setup.py` issues
1523

1624
1.3.0
1725
-----
26+
1827
- Can now parse ECDSA keys (if they're signed with an RSA CA)
1928
- Add `.from_file` constructor on `SSHCertificate`
2029
- Add a bunch of type hints
2130
- Improve documentation a bit
2231

2332
1.2.0
2433
-----
34+
2535
- Can now parse DSA and Ed25519 keys (although they still have to have been signed by an RSA CA)
2636
- Unit tests
2737
- `key_type` is now in the `SSHCertificate` object
@@ -30,4 +40,5 @@ ChangeLog
3040

3141
1.1.0
3242
-----
43+
3344
- CA certificate fingerprint (equivalent to `ssh-keygen -l -f /path/to/key.pub`) is now parsed for ssh-rsa CAs. I don't have any ECDSA/Ed25519 CAs so I haven't tested them!

setup.py

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
#!/usr/bin/env python
22

3-
from setuptools import setup, find_packages
4-
3+
from setuptools import find_packages, setup
54

65
setup(
76
name="ssh_certificate_parser",
8-
version="1.3.3",
7+
version="1.4.0",
98
author="James Brown",
109
author_email="[email protected]",
1110
url="https://github.com/easypost/ssh_certificate_parser",
1211
license="ISC",
13-
packages=find_packages(exclude=['tests']),
12+
packages=find_packages(exclude=["tests"]),
1413
description="Python library for interacting with OpenSSH Certificates",
15-
long_description=open('README.md', 'r').read(),
16-
long_description_content_type='text/markdown',
14+
long_description=open("README.md", "r").read(),
15+
long_description_content_type="text/markdown",
1716
install_requires=[
18-
'attrs>=16',
17+
"attrs>=16",
1918
],
2019
project_urls={
21-
'Docs': 'https://ssh-certificate-parser.readthedocs.io/',
22-
'Tracker': 'https://github.com/EasyPost/ssh_certificate_parser/issues',
23-
'Source': 'https://github.com/EasyPost/ssh_certificate_parser',
20+
"Docs": "https://ssh-certificate-parser.readthedocs.io/",
21+
"Tracker": "https://github.com/EasyPost/ssh_certificate_parser/issues",
22+
"Source": "https://github.com/EasyPost/ssh_certificate_parser",
2423
},
2524
classifiers=[
2625
"Development Status :: 3 - Alpha",
@@ -30,8 +29,10 @@
3029
"Programming Language :: Python :: 3.7",
3130
"Programming Language :: Python :: 3.8",
3231
"Programming Language :: Python :: 3.9",
32+
"Programming Language :: Python :: 3.10",
33+
"Programming Language :: Python :: 3.11",
3334
"Operating System :: POSIX",
3435
"Intended Audience :: Developers",
3536
"License :: OSI Approved :: ISC License (ISCL)",
36-
]
37+
],
3738
)

ssh_certificate_parser/__init__.py

+7-11
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
import base64
2-
import hashlib
3-
import enum
42
import datetime
5-
from typing import List
3+
import enum
4+
import hashlib
65
from pathlib import Path
6+
from typing import List
77

88
import attr
99

10-
from .errors import UnsupportedKeyTypeError
11-
from .errors import UnsupportedCertificateTypeError
12-
from .parser_helpers import take_u32
13-
from .parser_helpers import take_u64
14-
from .parser_helpers import take_pascal_bytestring
15-
from .parser_helpers import take_pascal_string
16-
from .parser_helpers import take_list
10+
from .errors import UnsupportedCertificateTypeError, UnsupportedKeyTypeError
11+
from .parser_helpers import (take_list, take_pascal_bytestring,
12+
take_pascal_string, take_u32, take_u64)
1713

1814
__author__ = 'EasyPost <[email protected]>'
19-
version_info = (1, 3, 3)
15+
version_info = (1, 4, 0)
2016
__version__ = '.'.join(str(s) for s in version_info)
2117

2218

test_requirements.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
pytest==6.*
1+
flake8==3.9.*
2+
importlib_metadata<5
23
pytest-cov==2.*
34
pytest-mock==3.*
4-
flake8==3.8.*
5+
pytest==6.*

0 commit comments

Comments
 (0)