From 7c35b26cb38a76b690e91cf68c3a3a49ea82a375 Mon Sep 17 00:00:00 2001
From: Alexandru Fikl <alexfikl@gmail.com>
Date: Thu, 4 Jun 2020 14:06:46 -0500
Subject: [PATCH] drop python2 support from the ci

---
 .github/workflows/ci.yml | 15 +--------------
 .gitlab-ci.yml           | 39 ---------------------------------------
 setup.py                 |  4 +---
 3 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b4cd23f7..c3cb8006 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,25 +18,12 @@ jobs:
         -
             uses: actions/setup-python@v1
             with:
-                python-version: '3.x' 
+                python-version: '3.x'
         -   name: "Main Script"
             run: |
                 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)" examples test
 
-    pytest2:
-        name: Pytest on 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
-                grep -v mpi4py .test-conda-env-py2.yml > .test-conda-env.yml
-                CONDA_ENVIRONMENT=.test-conda-env.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 on Py3
         runs-on: ubuntu-latest
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75d22eac..70173345 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,3 @@
-Python 2.7 POCL:
-  script:
-  - export PY_EXE=python2.7
-  - export PYOPENCL_TEST=portable:pthread
-  - export EXTRA_INSTALL="pybind11 numpy mako"
-  - 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
-  # https://github.com/pocl/pocl/issues/757
-  allow_failure: true
-  except:
-  - tags
-  artifacts:
-    reports:
-      junit: test/pytest.xml
-
 Python 3 POCL:
   script:
   - export PY_EXE=python3
@@ -54,26 +35,6 @@ Python 3 Intel:
     reports:
       junit: test/pytest.xml
 
-Python 2.7 POCL MPI:
-  script:
-  - export PY_EXE=python2.7
-  - export PYOPENCL_TEST=portable:pthread
-  - export EXTRA_INSTALL="pybind11 numpy mako mpi4py pymetis"
-  - export PYTEST_ADDOPTS="-k mpi"
-  - 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
-  # https://github.com/pocl/pocl/issues/757
-  allow_failure: true
-  except:
-  - tags
-  artifacts:
-    reports:
-      junit: test/pytest.xml
-
 Python 3 POCL MPI:
   script:
   - export PY_EXE=python3
diff --git a/setup.py b/setup.py
index e975a5cb..4c2b718d 100644
--- a/setup.py
+++ b/setup.py
@@ -31,9 +31,7 @@ def main():
               'Natural Language :: English',
               'Programming Language :: Python',
 
-              'Programming Language :: Python :: 2.6',
-              'Programming Language :: Python :: 2.7',
-              # 3.x has not yet been tested.
+              'Programming Language :: Python :: 3',
               'Topic :: Scientific/Engineering',
               'Topic :: Scientific/Engineering :: Information Analysis',
               'Topic :: Scientific/Engineering :: Mathematics',
-- 
GitLab