diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 463b78d1fa0d86b3c3c4549e681fbce41e1774ad..149f0473317cd4ffbe6e1f35ed5d2a8f02105369 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,20 +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 sumpy test - pytest2: - name: Conda Pytest 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-pre.yml - grep -v symengine .test-conda-env-py2-pre.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: Conda Pytest Py3 runs-on: ubuntu-latest diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7025cb6349ff83b976428210f52d23a99379ffb2..216048c2a582b2e59b2dc62cfef1e52b08f8607b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,22 +17,6 @@ # reports: # junit: test/pytest.xml -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 - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - Python 3 POCL: script: - export PY_EXE=python3 diff --git a/sumpy/version.py b/sumpy/version.py index f42335928e7fcb0cf6f93e8461714fb436691f8d..f44cfe20283522f87e8ebb10d41fff268d205080 100644 --- a/sumpy/version.py +++ b/sumpy/version.py @@ -43,7 +43,7 @@ else: # }}} -VERSION = (2016, 1) +VERSION = (2020, 1) VERSION_STATUS = "beta1" VERSION_TEXT = ".".join(str(x) for x in VERSION) + VERSION_STATUS