From ea2b50395e459e2a9cc87a3da4a17614abb2ae96 Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Thu, 4 Jun 2020 01:22:09 -0500
Subject: [PATCH] Drop Py2 support; bump version

---
 .github/workflows/ci.yml | 13 -------------
 .gitlab-ci.yml           | 18 ------------------
 meshmode/version.py      |  2 +-
 setup.py                 |  4 ----
 4 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 01e2cbfc..1e93235e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,19 +24,6 @@ jobs:
                 curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh
                 . ./prepare-and-run-flake8.sh "$(basename $GITHUB_REPOSITORY)" ./test
 
-    pytest2:
-        name: Pytest Conda Py2
-        runs-on: ubuntu-latest
-        steps:
-        -   uses: actions/checkout@v2
-        -   name: "Main Script"
-            run: |
-                sed 's/python=3/python=2.7/' .test-conda-env-py3.yml > .test-conda-env-py2.yml
-                cat .test-conda-env-py2.yml
-                CONDA_ENVIRONMENT=.test-conda-env-py2.yml
-                curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
-                . ./build-and-test-py-project-within-miniconda.sh
-
     pytest3:
         name: Pytest Conda Py3
         runs-on: ubuntu-latest
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ec4e234..3c9da790 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,3 @@
-Python 2.7 POCL:
-  script:
-  - export PY_EXE=python2.7
-  - export PYOPENCL_TEST=portable:pthread
-  - export EXTRA_INSTALL="pybind11 cython numpy mako mpi4py"
-  # cython is here because pytential (for now, for TS) depends on it
-  - 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
-  - pocl
-  - mpi
-  except:
-  - tags
-  artifacts:
-    reports:
-      junit: test/pytest.xml
-
 Python 3 Nvidia K40:
   script:
   - export PY_EXE=python3
diff --git a/meshmode/version.py b/meshmode/version.py
index d26fbc2f..5cea8857 100644
--- a/meshmode/version.py
+++ b/meshmode/version.py
@@ -1,2 +1,2 @@
-VERSION = (2016, 1)
+VERSION = (2020, 1)
 VERSION_TEXT = ".".join(str(i) for i in VERSION)
diff --git a/setup.py b/setup.py
index 688e9f92..dd63663d 100644
--- a/setup.py
+++ b/setup.py
@@ -27,10 +27,6 @@ def main():
               'Natural Language :: English',
               'Programming Language :: Python',
               'Programming Language :: Python :: 3',
-              'Programming Language :: Python :: 2.6',
-              'Programming Language :: Python :: 2.7',
-              'Programming Language :: Python :: 3.2',
-              'Programming Language :: Python :: 3.3',
               'Topic :: Scientific/Engineering',
               'Topic :: Scientific/Engineering :: Information Analysis',
               'Topic :: Scientific/Engineering :: Mathematics',
-- 
GitLab