Deprecated support for Python 3.4 (reached end-of-life)

2 files changed, 6 insertions, 51 deletions

diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
index 1155bed..e649b6f 100644
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@ -138,7 +138,7 @@ parallel_test['python_3.7'] = {
     }
 }
 
-// Only running 3.4, 3.5, and 3.6 for Pull Requests (and for "jenkins" branch)
+// Only running 3.5, and 3.6 for Pull Requests (and for "jenkins" branch)
 
 if (BUILD_TYPE == 'pr' || (BUILD_TYPE == 'push' && COMMIT_BRANCH == 'jenkins')) {
     parallel_test['python_3.6'] = {
@@ -229,50 +229,6 @@ if (BUILD_TYPE == 'pr' || (BUILD_TYPE == 'push' && COMMIT_BRANCH == 'jenkins'))
             }
         }
     }
-    parallel_test['python_3.4'] = {
-        node('ubuntu-1604-small') {
-            stage('Python 3.4') {
-                try {
-                    timeout(time: 20, activity: true, unit: 'MINUTES') {
-                        githubNotify account: USERNAME, context: CONTEXT + "/python3.4", credentialsId: 'ppaquette-jenkins-api-as-password', description: PENDING_MSG, gitApiUrl: '', repo: REPOSITORY, sha: COMMIT_HASH, status: 'PENDING', targetUrl: ''
-                        withCredentials([sshUserPrivateKey(credentialsId: 'jenkins-ssh-key', keyFileVariable: 'SSH_KEY_FILE', passphraseVariable: '', usernameVariable: '')]) {
-                            checkout([$class: 'GitSCM', branches: [[name: CHECKOUT_BRANCH]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[name: 'origin', refspec: CHECKOUT_REF, credentialsId: 'jenkins-ssh-key', url: GITHUB_URL]]])
-                            sh ".jenkins/merge_pr.sh $PR_NUMBER $COMMIT_HASH $BASE_HASH $SSH_KEY_FILE \
-                                && wget -nv https://storage.googleapis.com/ppaquette-diplomacy/files/Miniconda3-py37.sh -O miniconda.sh \
-                                && chmod +x ./miniconda.sh \
-                                && rm -Rf $HOME/miniconda \
-                                && ./miniconda.sh -b -p $HOME/miniconda \
-                                && export PATH=$HOME/miniconda/bin:$PATH \
-                                && conda create -y -q -n py34 python=3.4 \
-                                && export PATH=$HOME/miniconda/envs/py34/bin:$PATH \
-                                && mkdir -p $HOME/.cache/diplomacy \
-                                && wget -nv https://storage.googleapis.com/ppaquette-diplomacy/cache-jenkins/convoy_paths_cache.pkl -O $HOME/.cache/diplomacy/convoy_paths_cache.pkl \
-                                && .jenkins/get_cache.sh $PR_NUMBER $STRIPPED_BRANCH \
-                                && pip install -r requirements.txt \
-                                && pip install -r requirements_dev.txt \
-                                && touch run_install_nvm.sh \
-                                && chmod +x run_install_nvm.sh \
-                                && ./run_install_nvm.sh \
-                                && echo '--------------------------------------------------' \
-                                && pip --version \
-                                && python --version \
-                                && which python \
-                                && git rev-parse HEAD \
-                                && git log -n 1 \
-                                && ./run_tests.sh \
-                                && .jenkins/set_cache.sh $PR_NUMBER $STRIPPED_BRANCH"
-                        }
-                        githubNotify account: USERNAME, context: CONTEXT + "/python3.4", credentialsId: 'ppaquette-jenkins-api-as-password', description: SUCCESS_MSG, gitApiUrl: '', repo: REPOSITORY, sha: COMMIT_HASH, status: 'SUCCESS', targetUrl: ''
-                    }
-                } catch(err) {
-                    echo "Error encountered in parallel (Python 3.4): ${err}"
-                    exit_status = 1
-                    currentBuild.result = "FAILURE"
-                    githubNotify account: USERNAME, context: CONTEXT + "/python3.4", credentialsId: 'ppaquette-jenkins-api-as-password', description: FAILURE_MSG, gitApiUrl: '', repo: REPOSITORY, sha: COMMIT_HASH, status: 'FAILURE', targetUrl: ''
-                }
-            }
-        }
-    }
 }
 parallel parallel_test
 
diff --git a/setup.py b/setup.py
index 6599f3b..cc24da0 100644
--- a/setup.py
+++ b/setup.py
@@ -18,12 +18,12 @@
 import sys
 from setuptools import setup, find_packages
 
-# Requiring python 3.4+.
-# To simplify code for Tornado coroutines return statements, we don't support Python 3.3
+# Requiring python 3.5+.
+# To simplify code for Tornado coroutines return statements, we don't support Python 3.4
 # ( more info here: http://www.tornadoweb.org/en/stable/guide/coroutines.html#coroutines ).
-if (sys.version_info.major, sys.version_info.minor) <= (3, 3):
-    print("This Python is only compatible with Python 3.4+, but you are running "
-          "Python {}.{}. The installation will likely fail.".format(sys.version_info.major, sys.version_info.minor))
+if (sys.version_info.major, sys.version_info.minor) <= (3, 4):
+    print("This package is only compatible with Python 3.5+, but you are running Python {}.{}."
+          .format(sys.version_info.major, sys.version_info.minor))
 
 # ------------------------------------
 # Configuration
@@ -48,7 +48,6 @@ setup(name=PACKAGE_NAME,
       tests_require=['pytest'],
       classifiers=['License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
                    'Programming Language:: Python:: 3',
-                   'Programming Language:: Python:: 3.4',
                    'Programming Language:: Python:: 3.5',
                    'Programming Language:: Python:: 3.6',
                    'Programming Language:: Python:: 3.7',