Upgrade

foss-2018b/ELIC-0.1-foss-2018b-Python-2.7.15.eb

@@ -39,7 +39,15 @@ exts_default_options = {
     'source_tmpl': '%(name)s-%(version)s.tar.gz',
 }
 
-exts_classmap = {'ncdf4': 'RPackage'}
+exts_classmap = {
+    'ncdf4': 'RPackage',
+    'gdtools': 'RPackage',
+    'leaflet': 'RPackage',
+    'satellite': 'RPackage',
+    'sf': 'RPackage',
+    'svglite': 'RPackage',
+    'mapview': 'RPackage'
+}
 exts_list = [
     # Python deps, order is important!
     ('pip', '19.0.3', {
@@ -344,6 +352,15 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/s/scikit-image/'],
     }),
     ################################
+    ('futures', '3.2.0', {
+        'modulename': '__future__',
+        'source_urls': ['https://pypi.python.org/packages/source/f/futures/'],
+    }),
+    ('PyNaCl', '1.3.0', {
+        'modulename': 'nacl',
+        'source_urls': ['https://pypi.python.org/packages/source/p/PyNaCl/'],
+    }),
+    ################################
     # R extension
     ('ncdf4', '1.16', {
         'source_tmpl': '%(name)s_%(version)s.tar.gz',
@@ -354,8 +371,61 @@ exts_list = [
         ],
         'checksums': ['edd5731a805bbece3a8f6132c87c356deafc272351e1dd07256ca00574949253'],
     }),
+    ('gdtools', '0.1.7', {
+        'source_tmpl': '%(name)s_%(version)s.tar.gz',
+        'source_urls': [
+            'http://cran.r-project.org/src/contrib/Archive/gdtools',
+            'http://cran.r-project.org/src/contrib/',
+            'http://cran.freestatistics.org/src/contrib',
+        ],
+    }),
+    ('leaflet', '2.0.2', {
+        'source_tmpl': '%(name)s_%(version)s.tar.gz',
+        'source_urls': [
+            'http://cran.r-project.org/src/contrib/Archive/leaflet',
+            'http://cran.r-project.org/src/contrib/',
+            'http://cran.freestatistics.org/src/contrib',
+        ],
+    }),
+    ('satellite', '1.0.1', {
+        'source_tmpl': '%(name)s_%(version)s.tar.gz',
+        'source_urls': [
+            'http://cran.r-project.org/src/contrib/Archive/satellite',
+            'http://cran.r-project.org/src/contrib/',
+            'http://cran.freestatistics.org/src/contrib',
+        ],
+    }),
+    ('sf', '0.7-3', {
+        'source_tmpl': '%(name)s_%(version)s.tar.gz',
+        'source_urls': [
+            'http://cran.r-project.org/src/contrib/Archive/sf',
+            'http://cran.r-project.org/src/contrib/',
+            'http://cran.freestatistics.org/src/contrib',
+        ],
+    }),
+    ('svglite', '1.2.1', {
+        'source_tmpl': '%(name)s_%(version)s.tar.gz',
+        'source_urls': [
+            'http://cran.r-project.org/src/contrib/Archive/svglite',
+            'http://cran.r-project.org/src/contrib/',
+            'http://cran.freestatistics.org/src/contrib',
+        ],
+    }),
+    ('mapview', '2.6.3', {
+        'source_tmpl': '%(name)s_%(version)s.tar.gz',
+        'source_urls': [
+            'http://cran.r-project.org/src/contrib/Archive/mapview',
+            'http://cran.r-project.org/src/contrib/',
+            'http://cran.freestatistics.org/src/contrib',
+        ],
+    }),
 ]
 
+sanity_check_paths = {
+    'files': ['sf/libs/sf.so'],
+    'dirs': [],
+}
+
 postinstallcmds = [
     "cd %(installdir)s/bin && " +
     'chmod 755 pip'

foss-2018b/ELIC-0.2-foss-2018b-Python-2.7.15.eb

@@ -15,22 +15,6 @@ sources = [{'filename': 'ESMValTool.tar.gz', 'download_filename': 'v2.0a1.tar.gz
 
 dependencies = [
     ('Python', '2.7.15'),
-    ('NCL', '6.5.0-Python-2.7.15'),
-    ('R', '3.5.1', versionsuffix),
-    ('CDO', '1.9.5'),
-    ('GEOS', '3.6.2', versionsuffix),
-    ('libjpeg-turbo', '2.0.0'),
-    ('libpng', '1.6.34'),
-    ('zlib', '1.2.11'),
-    ('LibTIFF', '4.0.9'),
-    ('freetype', '2.9.1'),
-    ('PROJ', '5.0.0'),
-    ('netCDF', '4.6.1'),
-    ('GDAL', '2.2.3', versionsuffix),
-    ('PyGTK', '2.24.0', versionsuffix),
-    ('ecCodes', '2.8.2'),
-    ('libmo_unpack', '3.1.2'),
-    ('numba', '0.43.0', versionsuffix),
     ('ELIC', '0.1', versionsuffix),
 ]
 
@@ -49,11 +33,6 @@ exts_classmap = {
 }
 exts_list = [
     # Python deps, order is important!
-    #('pyproj', '1.9.6rel', {
-    #    'modulename': 'pyproj',
-    #    'source_tmpl': 'v%(version)s.tar.gz',
-    #    'source_urls': ['https://github.com/pyproj4/pyproj/archive/'],
-    #}),
     ('futures', '3.2.0', {
         'modulename': '__future__',
         'source_urls': ['https://pypi.python.org/packages/source/f/futures/'],