From aeb7e20032f8e3f991f74646da7c66b53b5f8fd7 Mon Sep 17 00:00:00 2001 From: Javier Vegas-Regidor Date: Mon, 20 Mar 2017 17:20:20 +0100 Subject: [PATCH 1/2] Changed dependencies order --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 05db1e10..e52bb16f 100644 --- a/setup.py +++ b/setup.py @@ -24,8 +24,8 @@ setup( author_email='javier.vegas@bsc.es', url='http://www.bsc.es/projects/earthscience/autosubmit/', keywords=['climate', 'weather', 'diagnostic'], - install_requires=['numpy', 'netCDF4', 'bscearth.utils', 'cdo', 'pygrib', 'nco', 'cfunits>=1.1.4', 'coverage', - 'pyproj', 'openpyxl', 'mock'], + install_requires=['numpy', 'netCDF4', 'bscearth.utils', 'cdo', 'nco', 'cfunits>=1.1.4', 'coverage', + 'pyproj', 'pygrib', 'openpyxl', 'mock'], packages=find_packages(), include_package_data=True, scripts=['bin/earthdiags'] -- GitLab From 97368b0428aab633de4aacdd3506fe4fdcf6cb15 Mon Sep 17 00:00:00 2001 From: Javier Vegas-Regidor Date: Mon, 20 Mar 2017 17:39:02 +0100 Subject: [PATCH 2/2] Moved pyproj to setup requires --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index e52bb16f..3e079b5c 100644 --- a/setup.py +++ b/setup.py @@ -22,10 +22,11 @@ setup( description='EarthDiagnostics', author='BSC-CNS Earth Sciences Department', author_email='javier.vegas@bsc.es', - url='http://www.bsc.es/projects/earthscience/autosubmit/', + url='http://www.bsc.es/projects/earthscixºence/autosubmit/', keywords=['climate', 'weather', 'diagnostic'], + setup_requires=['pyproj'], install_requires=['numpy', 'netCDF4', 'bscearth.utils', 'cdo', 'nco', 'cfunits>=1.1.4', 'coverage', - 'pyproj', 'pygrib', 'openpyxl', 'mock'], + 'pygrib', 'openpyxl', 'mock'], packages=find_packages(), include_package_data=True, scripts=['bin/earthdiags'] -- GitLab