Skip to content

Commit b3b3fad

Browse files
authored
Merge pull request #93 from Z2PackDev/fix_ci
Drop support for Python3.5 / fix CI
2 parents fd388c0 + 4e98c17 commit b3b3fad

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: python
22
cache: pip
33
python:
4-
- "3.5"
54
- "3.6"
65
- "3.7"
76
- "3.8"

setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from setuptools import setup, find_packages
55

66
import sys
7-
if sys.version_info < (3, 5):
8-
raise 'must use Python version 3.5 or higher'
7+
if sys.version_info < (3, 6):
8+
raise 'must use Python version 3.6 or higher'
99

1010
README = r"""Z2Pack is a tool that computes topological invariants and illustrates non-trivial features of Berry curvature. It works as a post-processing tool with all major first-principles codes (z2pack.fp), as well as with tight-binding models (z2pack.tb) and explicit Hamiltonian matrices -- such as the ones obtained from a k.p model (z2pack.hm).
1111
@@ -25,7 +25,7 @@
2525
'tb': ['tbmodels>=1.1.1'],
2626
'doc': ['sphinx', 'sphinx-rtd-theme', 'sphinx-pyreverse', 'pylint==2.4.4'],
2727
'dev': [
28-
'prospector==1.2.0', 'pytest>=5.3', 'pytest-cov', 'yapf==0.29',
28+
'prospector==1.2.0', 'pytest~=6.0', 'pytest-cov', 'yapf==0.29',
2929
'pre-commit', 'pylint==2.4.4'
3030
],
3131
}
@@ -45,12 +45,12 @@
4545
'fsc.iohelper'
4646
],
4747
extras_require=EXTRAS,
48+
python_requires=">=3.6",
4849
long_description=README,
4950
classifiers=[
5051
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
5152
'Natural Language :: English', 'Operating System :: Unix',
5253
'Programming Language :: Python :: 3',
53-
'Programming Language :: Python :: 3.5',
5454
'Programming Language :: Python :: 3.6',
5555
'Programming Language :: Python :: 3.7',
5656
'Programming Language :: Python :: 3.8',

tests/conftest.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616

1717

1818
def pytest_addoption(parser): # pylint: disable=missing-function-docstring
19-
parser.addoption('-A', action='store_true', help='run ABINIT tests')
20-
parser.addoption('-V', action='store_true', help='run VASP tests')
19+
parser.addoption('--abinit', action='store_true', help='run ABINIT tests')
20+
parser.addoption('--vasp', action='store_true', help='run VASP tests')
2121
parser.addoption(
22-
'-Q', action='store_true', help='run Quantum ESPRESSO tests'
22+
'--quantumespresso',
23+
action='store_true',
24+
help='run Quantum ESPRESSO tests'
2325
)
2426
parser.addoption(
2527
'--no-plot-compare',
@@ -49,13 +51,13 @@ def pytest_runtest_setup(item): # pylint: disable=missing-function-docstring
4951
vasp_marker = item.get_closest_marker("vasp")
5052
qe_marker = item.get_closest_marker("qe")
5153
if abinit_marker is not None:
52-
if not item.config.getoption("-A"):
54+
if not item.config.getoption("--abinit"):
5355
pytest.skip("test runs only with ABINIT")
5456
if vasp_marker is not None:
55-
if not item.config.getoption("-V"):
57+
if not item.config.getoption("--vasp"):
5658
pytest.skip("test runs only with VASP")
5759
if qe_marker is not None:
58-
if not item.config.getoption("-Q"):
60+
if not item.config.getoption("--quantumespresso"):
5961
pytest.skip("test runs only with Quantum ESPRESSO")
6062

6163

0 commit comments

Comments
 (0)