From dbae411614d6a871ea7458442a47a98013d57cd7 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Thu, 4 Jun 2020 00:51:54 -0500 Subject: [PATCH 1/2] Drop Py2 support; bump version --- .github/workflows/ci.yml | 2 +- .gitlab-ci.yml | 21 +++------------------ pymetis/version.py | 2 +- setup.py | 5 ----- 4 files changed, 5 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a18cda..0ba1648 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,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 0101bd7..91d6e59 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,26 +1,11 @@ -Python 2.7: +Python 3 Apple: script: - - py_version=2.7 - - EXTRA_INSTALL="numpy pybind11" - - 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 - - linux - except: - - tags - artifacts: - reports: - junit: test/pytest.xml - -Python 2.7 Apple: - script: - - py_version=2.7 + - py_version=3 - EXTRA_INSTALL="numpy pybind11" - 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 + - python3 - apple except: - tags diff --git a/pymetis/version.py b/pymetis/version.py index f382400..c967993 100644 --- a/pymetis/version.py +++ b/pymetis/version.py @@ -1,2 +1,2 @@ -version_tuple = (2019, 1, 1) +version_tuple = (2020, 1) version = ".".join(str(n) for n in version_tuple) diff --git a/setup.py b/setup.py index 3d55e57..92315ad 100644 --- a/setup.py +++ b/setup.py @@ -57,12 +57,7 @@ def main(): 'Programming Language :: C', 'Programming Language :: C++', 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', 'Topic :: Multimedia :: Graphics :: 3D Modeling', 'Topic :: Scientific/Engineering', 'Topic :: Scientific/Engineering :: Mathematics', -- GitLab From 78a46900d78c2bf56d7c6dac00ea6b21fa4c4798 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Thu, 4 Jun 2020 07:57:06 +0200 Subject: [PATCH 2/2] Update setup.py --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 92315ad..49387c3 100644 --- a/setup.py +++ b/setup.py @@ -58,6 +58,8 @@ def main(): 'Programming Language :: C++', 'Programming Language :: Python', 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', 'Topic :: Multimedia :: Graphics :: 3D Modeling', 'Topic :: Scientific/Engineering', 'Topic :: Scientific/Engineering :: Mathematics', -- GitLab