Skip to content

Commit 36e0200

Browse files
authored
Update cryptography version (#33)
* Update cryptography version * Remove Python2 support
1 parent 470ed67 commit 36e0200

File tree

9 files changed

+6
-109
lines changed

9 files changed

+6
-109
lines changed

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# AWS EC2 Instance Connect CLI
22

33
This is a Python client for accessing EC2 instances via AWS EC2 Instance Connect.
4-
This module supports Python 2.7.x and 3+. [This package is available on PyPI for pip installation](https://pypi.org/project/ec2instanceconnectcli/), ie, `pip install ec2instanceconnectcli`
4+
This module supports Python 3.6.x+. [This package is available on PyPI for pip installation](https://pypi.org/project/ec2instanceconnectcli/), ie, `pip install ec2instanceconnectcli`
55

66
## Setup
77

@@ -31,8 +31,6 @@ Unit tests can be run with standard pytest. They may be run, for example, by
3131

3232
`python -m pytest`
3333

34-
For Python2, ensure **mock** is installed: `pip2 install mock`.
35-
3634
Also, for corrcting import when using virtualenv, you have to export PYTHONPATH by running: `export PYTHONPATH=$(pwd)`
3735

3836
## Generating Documentation

README.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ This client supports all standard ssh operations with the `mssh` command and all
1010

1111
The ec2-connect-cli package works on Python versions:
1212

13-
* 2.6.x and greater
14-
* 2.7.x and greater
15-
* 3.3.x and greater
16-
* 3.4.x and greater
17-
* 3.5.x and greater
1813
* 3.6.x and greater
1914

2015
------------

doc/source/README.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ This client supports all standard ssh operations with the `mssh` command and all
1010

1111
The ec2-connect-cli package works on Python versions:
1212

13-
* 2.6.x and greater
14-
* 2.7.x and greater
15-
* 3.3.x and greater
16-
* 3.4.x and greater
17-
* 3.5.x and greater
1813
* 3.6.x and greater
1914

2015
------------

doc/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# The short X.Y version
2727
version = '1.0'
2828
# The full version, including alpha/beta/rc tags
29-
release = '1.0.2'
29+
release = '1.0.3'
3030

3131

3232
# -- General configuration ---------------------------------------------------

ec2instanceconnectcli/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"""
1818
import os
1919

20-
__version__ = '1.0.2'
20+
__version__ = '1.0.3'
2121

2222
EnvironmentVariables = {
2323
'ca_bundle': ('ca_bundle', 'AWS_CA_BUNDLE', None, None),

ec2instanceconnectcli/py2py3.py

Lines changed: 0 additions & 85 deletions
This file was deleted.

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
setuptools>=3.3
2-
cryptography>=1.9
2+
cryptography>=39.0.1
33
botocore>=1.12.179
44
pytest>=3.2.3
55
pytest-cov>=2.5.1

setup.cfg

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
[bdist_wheel]
2-
# Flag indicating code works for both Python 2 and Python 3.
3-
universal=1
42

53
[metadata]
64
requires-dist=
7-
cryptography>=1.9
5+
cryptography>=39.0.1
86
botocore>=1.12.179
97

108
[tool:pytest]

setup.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def find_version(*file_paths):
2121
raise RuntimeError("Unable to find version string.")
2222

2323

24-
requires = ['cryptography>=1.9',
24+
requires = ['cryptography>=39.0.1',
2525
'botocore>=1.12.179'
2626
]
2727

@@ -50,11 +50,7 @@ def find_version(*file_paths):
5050
'Operating System :: OS Independent',
5151
'Operating System :: Unix',
5252
'Programming Language :: Python',
53-
'Programming Language :: Python :: 2',
54-
'Programming Language :: Python :: 2.7',
5553
'Programming Language :: Python :: 3',
56-
'Programming Language :: Python :: 3.4',
57-
'Programming Language :: Python :: 3.5',
5854
'Programming Language :: Python :: 3.6',
5955
'Programming Language :: Python :: 3.7',
6056
'Programming Language :: Python :: 3.8',

0 commit comments

Comments
 (0)