Drop Python 3.5 support + bump some test & transitive dependencies (#329

) * bump project dependencies * drop python 3.5 support * test against python 3.8/3.9 * unneeded python 3.5 requirement * remove unneeded py35 dep * testpy36 like the others * unused import * bump version of flake8 * bump version of pyinstaller * add change log
nchammas · Feb 8, 2021 · ca10e68 · ca10e68
1 parent 9769e1b
commit ca10e68
Show file tree

Hide file tree

Showing 16 changed files with 134 additions and 93 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,21 @@
 language: python
 python:
-  - "3.5"
-  - "3.6"
 # Work-around for Python 3.7 on Travis CI pulled from here:
 # https://github.com/travis-ci/travis-ci/issues/9815#issue-336465122
 matrix:
   include:
+    - python: "3.6"
+      dist: "xenial"
+      sudo: true
     - python: "3.7"
       dist: "xenial"
       sudo: true
+    - python: "3.8"
+      dist: "xenial"
+      sudo: true
+    - python: "3.9"
+      dist: "xenial"
+      sudo: true
 install:
   - "pip install -r requirements/maintainer.pip"
   # Fix for PyInstaller: https://stackoverflow.com/q/61574984/

diff --git a/CHANGES.md b/CHANGES.md
@@ -7,8 +7,10 @@
 ### Changed
 
 * [#311]: Changed how Flintrock manages its own security groups to reduce the likelihood of hitting any limits on the number of rules per security group.
+* [#329]: Dropped support for Python 3.5 and added automated testing for Python 3.8 and 3.9.
 
 [#311]: https://github.com/nchammas/flintrock/pull/311
+[#329]: https://github.com/nchammas/flintrock/pull/329
 
 ## [1.0.0] - 2020-01-11
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -81,7 +81,7 @@ There are a few things you should do before diving in to write a new feature or
 If you are changing anything about Flintrock's dependencies, be sure to update the compiled requirements using [pip-tools]:
 
 ```
-pip install -U pip-tools
+pip install -U "pip-tools<6"
 pip-compile -U requirements/user.in -o requirements/user.pip
 pip-compile -U requirements/developer.in -o requirements/developer.pip
 pip-compile -U requirements/maintainer.in -o requirements/maintainer.pip

diff --git a/README.md b/README.md
@@ -114,7 +114,7 @@ Before using Flintrock, take a quick look at the
 notice and [license](https://github.com/nchammas/flintrock/blob/master/LICENSE)
 and make sure you're OK with their terms.
 
-**Flintrock requires Python 3.5 or newer**, unless you are using one
+**Flintrock requires Python 3.6 or newer**, unless you are using one
 of our **standalone packages**. Flintrock has been thoroughly tested
 only on OS X, but it should run on all POSIX systems.
 A motivated contributor should be able to add

diff --git a/flintrock/flintrock.py b/flintrock/flintrock.py
@@ -1073,9 +1073,9 @@ def config_to_click(config: dict) -> dict:
 
     click_map = {
         'launch': dict(
-            list(config['launch'].items()) +
-            list(ec2_configs.items()) +
-            list(service_configs.items())),
+            list(config['launch'].items())
+            + list(ec2_configs.items())
+            + list(service_configs.items())),
         'describe': ec2_configs,
         'destroy': ec2_configs,
         'login': ec2_configs,

diff --git a/flintrock/services.py b/flintrock/services.py
@@ -154,7 +154,7 @@ def install(
 
                 echo "export HADOOP_LIBEXEC_DIR='$(pwd)/hadoop/libexec'" >> .bashrc
             """.format(
-                version=self.version,
+                # version=self.version,
                 download_source=self.download_source.format(v=self.version),
             ))
 
@@ -317,7 +317,7 @@ def install(
                 command="""
                     python /tmp/download-package.py "{download_source}" "spark"
                 """.format(
-                    version=self.version,
+                    # version=self.version,
                     download_source=self.download_source.format(v=self.version),
                 ))
 

diff --git a/requirements/developer.in b/requirements/developer.in
@@ -1,6 +1,6 @@
 -r user.pip
 pytest >= 3.5.0
 pytest-cov >= 2.5.1
-flake8 == 3.5.0
+flake8 == 3.8.4
 freezegun == 1.1.0
 # PyYAML  # requirement already covered by setup.py
diff --git a/requirements/developer.pip b/requirements/developer.pip
@@ -6,9 +6,9 @@
 #
 -e file:.#egg=Flintrock
     # via -r requirements/user.pip
-attrs==19.3.0
+attrs==20.3.0
     # via pytest
-bcrypt==3.1.7
+bcrypt==3.2.0
     # via
     #   -r requirements/user.pip
     #   paramiko
@@ -22,7 +22,7 @@ botocore==1.13.45
     #   boto3
     #   flintrock
     #   s3transfer
-cffi==1.13.2
+cffi==1.14.4
     # via
     #   -r requirements/user.pip
     #   bcrypt
@@ -32,9 +32,9 @@ click==7.0
     # via
     #   -r requirements/user.pip
     #   flintrock
-coverage==5.0.1
+coverage==5.4
     # via pytest-cov
-cryptography==2.8
+cryptography==3.4.2
     # via
     #   -r requirements/user.pip
     #   flintrock
@@ -43,50 +43,51 @@ docutils==0.15.2
     # via
     #   -r requirements/user.pip
     #   botocore
-flake8==3.5.0
+flake8==3.8.4
     # via -r requirements/developer.in
 freezegun==1.1.0
     # via -r requirements/developer.in
-importlib-metadata==1.3.0
+importlib-metadata==3.4.0
     # via
+    #   flake8
     #   pluggy
     #   pytest
-jmespath==0.9.4
+iniconfig==1.1.1
+    # via pytest
+jmespath==0.10.0
     # via
     #   -r requirements/user.pip
     #   boto3
     #   botocore
 mccabe==0.6.1
     # via flake8
-more-itertools==8.0.2
-    # via pytest
-packaging==19.2
+packaging==20.9
     # via pytest
 paramiko==2.7.1
     # via
     #   -r requirements/user.pip
     #   flintrock
 pluggy==0.13.1
     # via pytest
-py==1.8.0
+py==1.10.0
     # via pytest
-pycodestyle==2.3.1
+pycodestyle==2.6.0
     # via flake8
-pycparser==2.19
+pycparser==2.20
     # via
     #   -r requirements/user.pip
     #   cffi
-pyflakes==1.6.0
+pyflakes==2.2.0
     # via flake8
-pynacl==1.3.0
+pynacl==1.4.0
     # via
     #   -r requirements/user.pip
     #   paramiko
-pyparsing==2.4.6
+pyparsing==2.4.7
     # via packaging
-pytest-cov==2.8.1
+pytest-cov==2.11.1
     # via -r requirements/developer.in
-pytest==5.3.2
+pytest==6.2.2
     # via
     #   -r requirements/developer.in
     #   pytest-cov
@@ -103,19 +104,19 @@ s3transfer==0.2.1
     # via
     #   -r requirements/user.pip
     #   boto3
-six==1.13.0
+six==1.15.0
     # via
     #   -r requirements/user.pip
     #   bcrypt
-    #   cryptography
-    #   packaging
     #   pynacl
     #   python-dateutil
-urllib3==1.25.7
+toml==0.10.2
+    # via pytest
+typing-extensions==3.7.4.3
+    # via importlib-metadata
+urllib3==1.25.11
     # via
     #   -r requirements/user.pip
     #   botocore
-wcwidth==0.1.7
-    # via pytest
-zipp==0.6.0
+zipp==3.4.0
     # via importlib-metadata
diff --git a/requirements/maintainer.in b/requirements/maintainer.in
@@ -1,5 +1,4 @@
 -r developer.pip
 wheel >= 0.31.0
 twine == 1.15.0
-PyInstaller == 3.5
-keyring < 21.0.0  # to maintain compatibility for Python 3.5
+PyInstaller == 4.2