diff --git a/.travis.yml b/.travis.yml index d4b7b9af03868a9c4b0756e079541798668a05f5..6de9aa3f9e5ce10e9dbd55c6c98081ef5209077c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,10 @@ notifications: email: false python: - - 3.5 - 3.6 - 3.7 - 3.8 + - 3.9 install: - pip install --upgrade pip setuptools wheel diff --git a/MANIFEST.in b/MANIFEST.in index cfc15b6fcf8b10dcd50fcde1cfc2913ba5f043dd..c064323654d5607c63d59b19ef4b3e9a3b39e059 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ include MANIFEST.in -include VERSION include setup.py +include setup.cfg include README.md include LICENSE include COPYING diff --git a/nd2reader/__init__.py b/nd2reader/__init__.py index 39414611f1702c439e8df1d32088736a4f648a45..353176e72720c3fb9eed4ce5718e470d1ff47ef6 100644 --- a/nd2reader/__init__.py +++ b/nd2reader/__init__.py @@ -4,7 +4,7 @@ from nd2reader.legacy import Nd2 try: import importlib.metadata as importlib_metadata -except ModuleNotFoundError: +except: import importlib_metadata try: diff --git a/requirements.txt b/requirements.txt index b6d1992ca9d2f64c02663f5842b3f4d156d86aa7..b8ab71ab540bb1e0d79526719dc88dd2b097642a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -numpy>=1.9.2 +numpy>=1.14 six>=1.4 xmltodict>=0.9.2 -pims>=0.3.0 \ No newline at end of file +pims>=0.3.0 diff --git a/setup.py b/setup.py index 73f7bf7d8d0d4178b299399a5914e1a3fdd94cf6..8612353acc078ce13839bd1f384b5a004ddb57d1 100644 --- a/setup.py +++ b/setup.py @@ -7,11 +7,12 @@ if __name__ == '__main__': name='nd2reader', packages=['nd2reader'], install_requires=[ - 'numpy>=1.6.2', + 'numpy>=1.14', 'six>=1.4', 'xmltodict>=0.9.2', 'pims>=0.3.0' ], + python_requires=">=3.6", version=VERSION, description='A tool for reading ND2 files produced by NIS Elements', author='Ruben Verweij',