Skip to content

Commit

Permalink
Drop Py2 support; bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
mattwala committed Jun 4, 2020
1 parent 4129e6e commit b28bb06
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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
-
Expand Down
21 changes: 3 additions & 18 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,13 @@
Python 2.7:
Python 3 Apple:
script:
- py_version=2.7
- EXTRA_INSTALL="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
- gfortran
except:
- tags
artifacts:
reports:
junit: test/pytest.xml

Python 2.7 Apple:
script:
- py_version=2.7
- py_version=3
- EXTRA_INSTALL="numpy mako"
- export PYFMMLIB_BUILD_MODE=setuptools
- 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:
- apple
- python2.7
- python3
except:
- tags
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion pyfmmlib/version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VERSION = (2019, 1, 5)
VERSION = (2020, 1)
VERSION_STATUS = ""
VERSION_TEXT = ".".join(str(x) for x in VERSION) + VERSION_STATUS

0 comments on commit b28bb06

Please sign in to comment.