Pierre-Yves Barriat 3 лет назад
Родитель
Сommit
cad3bb0b55

+ 7 - 8
foss-2020b/ELIC_Python-1-foss-2020b-Python-3.8.6.eb → foss-2020b/ELIC_Python-1-foss-2020b.eb

@@ -2,7 +2,6 @@ easyblock = 'PythonBundle'
 
 name = 'ELIC_Python'
 version = '1'
-versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'https://gogs.elic.ucl.ac.be'
 description = """This repo provides additional Python and R extensions for ELIC ecosystem."""
@@ -16,14 +15,14 @@ builddependencies = [
 dependencies = [
     ('Python', '3.8.6'),
     ('SciPy-bundle', '2020.11'),
-    ('matplotlib', '3.3.3', versionsuffix),
-    ('GDAL', '3.2.0', versionsuffix),
+    ('matplotlib', '3.3.3'),
+    ('GDAL', '3.2.1'),
     ('NCL', '6.6.2'),
-    ('CDO', '1.9.9'),
-    ('NCO', '4.9.5'),
+    ('CDO', '1.9.10'),
+    ('NCO', '4.9.7'),
     ('ncview', '2.1.7'),
-    ('libmo_unpack', '3.1.2'),
-    ('orca', '3.4.3'),
+    #('libmo_unpack', '3.1.2'),
+    #('orca', '3.4.3'),
 ]
 
 exts_defaultclass = 'PythonPackage'
@@ -33,7 +32,7 @@ exts_default_options = {
 
 exts_list = [
     # Python deps, order is important!
-    ('pip', '20.2.4', {
+    ('pip', '21.2.2', {
         'modulename': 'pip',
         'source_tmpl': '%(version)s.tar.gz',
         'source_urls': ['https://github.com/pypa/pip/archive/'],

+ 3 - 4
foss-2020b/ELIC_R-1-foss-2020b-R-4.0.3.eb → foss-2020b/ELIC_R-1-foss-2020b.eb

@@ -2,7 +2,6 @@ easyblock = 'Bundle'
 
 name = 'ELIC_R'
 version = '1'
-versionsuffix = '-R-%(rver)s'
 
 homepage = 'https://gogs.elic.ucl.ac.be'
 description = """This repo provides additional Python and R extensions for ELIC ecosystem."""
@@ -10,9 +9,9 @@ description = """This repo provides additional Python and R extensions for ELIC
 toolchain = {'name': 'foss', 'version': '2020b'}
 
 dependencies = [
-    ('R', '4.0.3'),
-    ('GDAL', '3.2.0', '-Python-3.8.6'),
-    ('PostgreSQL', '12.4'),
+    ('R', '4.0.5'),
+    ('GDAL', '3.2.1'),
+    ('PostgreSQL', '13.2'),
 ]
 
 exts_default_options = {

+ 2 - 2
foss-2020b/NCL-6.6.2-foss-2020b.eb

@@ -28,7 +28,7 @@ osdependencies = [
 ]
 dependencies = [
     ('cURL', '7.72.0'),
-    ('JasPer', '2.0.14'),
+    ('JasPer', '2.0.24'),
     ('g2lib', '3.1.0'),
     ('g2clib', '1.6.0'),
     ('HDF', '4.2.15'),
@@ -38,7 +38,7 @@ dependencies = [
     ('Szip', '2.1.1'),
     ('freetype', '2.10.3'),
     ('zlib', '1.2.11'),
-    ('GDAL', '3.2.0', '-Python-3.8.6'),
+    ('GDAL', '3.2.1'),
     ('UDUNITS', '2.2.26'),
     ('ESMF', '8.0.1'),
     ('bzip2', '1.0.8'),

+ 1 - 1
foss-2020b/g2clib-1.6.0-GCCcore-10.2.0.eb

@@ -17,7 +17,7 @@ checksums = [
 builddependencies = [('binutils', '2.35')]
 
 dependencies = [
-    ('JasPer', '2.0.14'),
+    ('JasPer', '2.0.24'),
     ('libpng', '1.6.37'),
 ]
 

+ 1 - 1
foss-2020b/g2lib-3.1.0-GCCcore-10.2.0.eb

@@ -24,7 +24,7 @@ checksums = [
 builddependencies = [('binutils', '2.35')]
 
 dependencies = [
-    ('JasPer', '2.0.14'),
+    ('JasPer', '2.0.24'),
     ('libpng', '1.6.37'),
 ]
 

+ 1 - 0
intel-2018b/grib_api-1.24.0-intel-2018b.eb

@@ -16,6 +16,7 @@ checksums = ['6b0d443cb0802c5de652e5816c5b88734cb3ead454eb932c5ec12ef8d4f77bcd']
 
 dependencies = [
     ('JasPer', '1.900.1'),  # 2.x doesn't work
+    ('OpenJPEG', '2.3.0'),  # for ecearth
 ]
 
 configopts = '--with-jasper=$EBROOTJASPER'