Update cryptography version (#33)

* Update cryptography version * Remove Python2 support
aws · Mar 10, 2023 · 36e0200 · 36e0200
1 parent 470ed67
commit 36e0200
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 109 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # AWS EC2 Instance Connect CLI
 
 This is a Python client for accessing EC2 instances via AWS EC2 Instance Connect.
-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`
+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`
 
 ## Setup
 
@@ -31,8 +31,6 @@ Unit tests can be run with standard pytest.  They may be run, for example, by
 
 `python -m pytest`
 
-For Python2, ensure **mock** is installed: `pip2 install mock`.
-
 Also, for corrcting import when using virtualenv, you have to export PYTHONPATH by running: `export PYTHONPATH=$(pwd)`
 
 ## Generating Documentation

diff --git a/README.rst b/README.rst
@@ -10,11 +10,6 @@ This client supports all standard ssh operations with the `mssh` command and all
 
 The ec2-connect-cli package works on Python versions:
 
-* 2.6.x and greater
-* 2.7.x and greater
-* 3.3.x and greater
-* 3.4.x and greater
-* 3.5.x and greater
 * 3.6.x and greater
 
 ------------

diff --git a/doc/source/README.rst b/doc/source/README.rst
@@ -10,11 +10,6 @@ This client supports all standard ssh operations with the `mssh` command and all
 
 The ec2-connect-cli package works on Python versions:
 
-* 2.6.x and greater
-* 2.7.x and greater
-* 3.3.x and greater
-* 3.4.x and greater
-* 3.5.x and greater
 * 3.6.x and greater
 
 ------------

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -26,7 +26,7 @@
 # The short X.Y version
 version = '1.0'
 # The full version, including alpha/beta/rc tags
-release = '1.0.2'
+release = '1.0.3'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/ec2instanceconnectcli/__init__.py b/ec2instanceconnectcli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.0.2'
+__version__ = '1.0.3'
 
 EnvironmentVariables = {
     'ca_bundle': ('ca_bundle', 'AWS_CA_BUNDLE', None, None),

diff --git a/ec2instanceconnectcli/py2py3.py b/ec2instanceconnectcli/py2py3.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 setuptools>=3.3
-cryptography>=1.9
+cryptography>=39.0.1
 botocore>=1.12.179
 pytest>=3.2.3
 pytest-cov>=2.5.1
diff --git a/setup.cfg b/setup.cfg
@@ -1,10 +1,8 @@
 [bdist_wheel]
-# Flag indicating code works for both Python 2 and Python 3.
-universal=1
 
 [metadata]
 requires-dist=
-    cryptography>=1.9
+    cryptography>=39.0.1
     botocore>=1.12.179
 
 [tool:pytest]

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@ def find_version(*file_paths):
     raise RuntimeError("Unable to find version string.")
 
 
-requires = ['cryptography>=1.9',
+requires = ['cryptography>=39.0.1',
             'botocore>=1.12.179'
             ]
 
@@ -50,11 +50,7 @@ def find_version(*file_paths):
         'Operating System :: OS Independent',
         'Operating System :: Unix',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',