diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01e2cbfc5ee45291dbc4054c48ef98aec487e150..1e93235eb01aadc42a04c867974cc98ebf3ad143 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 8ec4e2344bd54b6705cf1ccecbaeef2a1fa54571..3c9da79026468f29eb8bb90358d05e882fde8293 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 d26fbc2f9341a880b1119e7e6079bd51e59e11b9..5cea8857d9550183c2caabd0948032faac48e0ae 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 688e9f92c8dbf573b4b5702da2cd50b420ca08d1..dd63663dc010dd920acafe5acb9062799e22e795 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',