From 1ce71d0a47f3115e98ba3a090d1841134bcf365f Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Thu, 4 Jun 2020 00:00:57 -0500
Subject: [PATCH 1/4] Drop Py2 support

---
 .github/workflows/ci.yml |  4 ++--
 .gitlab-ci.yml           | 15 ---------------
 setup.py                 |  8 ++++----
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b9933fa..fde641a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: [2.7, 3.6, 3.7, 3.8]
+                python-version: [3.6, 3.7, 3.8]
         steps:
         -   uses: actions/checkout@v2
         -
@@ -65,7 +65,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: [2.7, 3.6, 3.7, 3.8]
+                python-version: [3.6, 3.7, 3.8]
         steps:
         -   uses: actions/checkout@v2
         -
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82015b6..2d18c7f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,3 @@
-Python 2.7:
-  script:
-  - py_version=2.7
-  - EXTRA_INSTALL="numpy scipy"
-  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
-  - ". ./build-and-test-py-project.sh"
-  tags:
-  - python2.7
-  - gfortran
-  except:
-  - tags
-  artifacts:
-    reports:
-      junit: test/pytest.xml
-
 Python 3:
   script:
   - py_version=3
diff --git a/setup.py b/setup.py
index 71e94f4..9a06c49 100644
--- a/setup.py
+++ b/setup.py
@@ -26,10 +26,10 @@ def main():
               'License :: OSI Approved :: MIT License',
               'Natural Language :: English',
               'Programming Language :: Python',
-              'Programming Language :: Python :: 2.6',
-              'Programming Language :: Python :: 2.7',
-              'Programming Language :: Python :: 3.3',
-              'Programming Language :: Python :: 3.4',
+              'Programming Language :: Python :: 3',
+              'Programming Language :: Python :: 3.6',
+              'Programming Language :: Python :: 3.7',
+              'Programming Language :: Python :: 3.8',
               'Topic :: Scientific/Engineering',
               'Topic :: Scientific/Engineering :: Information Analysis',
               'Topic :: Scientific/Engineering :: Mathematics',
-- 
GitLab


From f6588cdd089ff5a8ba0a795df5ce1394a7b0375b Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Thu, 4 Jun 2020 00:16:18 -0500
Subject: [PATCH 2/4] Bump version

---
 leap/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/leap/version.py b/leap/version.py
index 6f62bed..5cea885 100644
--- a/leap/version.py
+++ b/leap/version.py
@@ -1,2 +1,2 @@
-VERSION = (2019, 5)
+VERSION = (2020, 1)
 VERSION_TEXT = ".".join(str(i) for i in VERSION)
-- 
GitLab


From d8c92602deb557cdf410cec9504884f6cbced723 Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Thu, 4 Jun 2020 00:28:54 -0500
Subject: [PATCH 3/4] Actually drop Py2 support

---
 .gitlab-ci.yml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82015b6..2d18c7f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,3 @@
-Python 2.7:
-  script:
-  - py_version=2.7
-  - EXTRA_INSTALL="numpy scipy"
-  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
-  - ". ./build-and-test-py-project.sh"
-  tags:
-  - python2.7
-  - gfortran
-  except:
-  - tags
-  artifacts:
-    reports:
-      junit: test/pytest.xml
-
 Python 3:
   script:
   - py_version=3
-- 
GitLab


From 37331d784cffebe35f978e6ce1d652f2b345934b Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Thu, 4 Jun 2020 00:29:07 -0500
Subject: [PATCH 4/4] Revert "Actually drop Py2 support"

This reverts commit d8c92602deb557cdf410cec9504884f6cbced723.
---
 .gitlab-ci.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d18c7f..82015b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,18 @@
+Python 2.7:
+  script:
+  - py_version=2.7
+  - EXTRA_INSTALL="numpy scipy"
+  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
+  - ". ./build-and-test-py-project.sh"
+  tags:
+  - python2.7
+  - gfortran
+  except:
+  - tags
+  artifacts:
+    reports:
+      junit: test/pytest.xml
+
 Python 3:
   script:
   - py_version=3
-- 
GitLab