File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 44
55from six .moves .urllib .request import urlretrieve
66
7+ try :
8+ import pathlib
9+ except ImportError :
10+ # Python 2.7
11+ import pathlib2 as pathlib
12+
713import os
814import os .path
915
@@ -60,11 +66,11 @@ def test_sha256(tmpdir, some_text):
6066 assert checksum == "4446bfb2ec5dedfbd981d059d6005f5144b067b392a00e3bcf98f8302ec8f765"
6167
6268@pytest .mark .parametrize ('data_home,location' , [
63- (None , os . path . expanduser ("~/MDAnalysis_data" )),
64- ("/tmp/MDAnalysisData" , "/tmp/MDAnalysisData" ),
69+ (None , pathlib . Path ("~/MDAnalysis_data" ). expanduser ( )),
70+ (str ( pathlib . Path ( "/tmp/MDAnalysisData" )), pathlib . Path ( "/tmp/MDAnalysisData" ) ),
6571 ])
6672def test_get_data_home (data_home , location ):
67- assert base .get_data_home (data_home = data_home ) == location
73+ assert base .get_data_home (data_home = data_home ) == str ( location )
6874
6975def test_clear_data_home (tmpdir , some_text ):
7076 data_home_path = tmpdir .join ("MDAnalysis_data_test" )
Original file line number Diff line number Diff line change 2020import versioneer
2121
2222import os
23+ import sys
2324import warnings
2425import codecs
2526
@@ -129,6 +130,11 @@ def dynamic_author_list():
129130 'Topic :: Software Development :: Libraries :: Python Modules' ,
130131 ]
131132
133+ # Python 2.7 compatibility
134+ test_requirements = ['pytest' , 'pytest-mock' ]
135+ if sys .version_info .major < 3 :
136+ test_requirements .append ("pathlib2" )
137+
132138 setup (name = 'MDAnalysisData' ,
133139 version = versioneer .get_version (),
134140 cmdclass = versioneer .get_cmdclass (),
@@ -155,6 +161,6 @@ def dynamic_author_list():
155161 'setuptools' ,
156162 'tqdm' ,
157163 ],
158- tests_require = [ 'pytest' , 'pytest-mock' ] ,
164+ tests_require = test_requirements ,
159165 zip_safe = True ,
160166 )
You can’t perform that action at this time.
0 commit comments