Merge pull request #16 from RoanKanninga/main

new versions of RPlus and PythonPlus
molgenis · Jan 4, 2023 · 55324ed · 55324ed
2 parents 024e668 + c934984
commit 55324ed
Show file tree

Hide file tree

Showing 18 changed files with 14,743 additions and 10,076 deletions.
diff --git a/b/BeadArrayFiles/BeadArrayFiles-1.3.3-foss-2022a-Python-3.10.4.eb b/b/BeadArrayFiles/BeadArrayFiles-1.3.3-foss-2022a-Python-3.10.4.eb
@@ -2,7 +2,7 @@ easyblock = 'PythonPackage'
 
 name = 'BeadArrayFiles'
 version = '1.3.3'
-versionsuffix = '-Python-%(pyver)s'
+versionsuffix = '-Python-3.10.4'
 
 homepage = 'https://github.com/Illumina/BeadArrayFiles'
 description = """Library to parse file formats related to Illumina bead arrays."""
@@ -16,15 +16,14 @@ checksums = [
 ]
 
 dependencies = [
-    ('Python', '3.10.4'),
-    ('PythonPlus', '3.10.4', '-v22.11.1'),
+    ('PythonPlus', '3.10.4', '-v23.01.1'),
 ]
 
 exts_filter = ('python -c "from IlluminaBeadArrayFiles import GenotypeCalls, BeadPoolManifest, code2genotype"', "")
 
 sanity_check_paths = {
-    'files': ['lib/python%(pyshortver)s/site-packages/IlluminaBeadArrayFiles/BeadArrayUtility.py'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/IlluminaBeadArrayFiles/'],
+    'files': ['lib/python3.10/site-packages/IlluminaBeadArrayFiles/BeadArrayUtility.py'],
+    'dirs': ['lib/python3.10/site-packages/IlluminaBeadArrayFiles/'],
 }
 
 moduleclass = 'bio'
diff --git a/c/chronqc/chronqc-1.0.4-GCCcore-11.3.0-Python-3.10.4-bare.eb b/c/chronqc/chronqc-1.0.4-GCCcore-11.3.0-Python-3.10.4-bare.eb
@@ -6,7 +6,7 @@ version = '1.0.4'
 
 homepage = 'https://github.com/nilesh-tawari/ChronQC'
 description = """A Quality Control Monitoring System for Clinical Next Generation Sequencing."""
-versionsuffix = '-Python-%(pyver)s-bare'
+versionsuffix = '-Python-3.10.4-bare'
 toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
 
 builddependencies = [
@@ -16,8 +16,7 @@ builddependencies = [
 dependencies = [
     ('libyaml', '0.2.5'),
     ('libjpeg-turbo', '2.1.3'),
-    ('Python', '3.10.4', '-bare'),
-    ('PythonPlus', '3.10.4', '-v22.11.2'),
+    ('PythonPlus', '3.10.4', '-v23.01.1'),
 ]
 
 
@@ -51,8 +50,8 @@ full_sanity_check = True
 
 sanity_check_paths = {
     'files': ['bin/chronqc'],
-    'dirs':  ['lib/python%(pyshortver)s/site-packages'],
+    'dirs':  ['lib/python3.10/site-packages'],
 }
 
-modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+modextrapaths = {'PYTHONPATH': ['lib/python3.10/site-packages']}
 moduleclass = 'bio'
diff --git a/h/HTSeq/HTSeq-0.11.0-GCCcore-7.3.0-Python-3.7.4.eb b/h/HTSeq/HTSeq-0.11.0-GCCcore-7.3.0-Python-3.7.4.eb
diff --git a/m/Mako/Mako-1.2.0-GCCcore-11.3.0.eb b/m/Mako/Mako-1.2.0-GCCcore-11.3.0.eb
@@ -18,13 +18,12 @@ sanity_pip_check = True
 builddependencies = [('binutils', '2.38')]
 
 dependencies = [
-	('PythonPlus', '3.10.4','-v22.11.2'),
-	('Python', '3.10.4'),
+	('PythonPlus', '3.10.4','-v23.01.1')
 ]
 
 sanity_check_paths = {
     'files': ['bin/mako-render'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/%(namelower)s'],
+    'dirs': ['lib/python3.10/site-packages/%(namelower)s'],
 }
 
 sanity_check_commands = ["mako-render --help"]

diff --git a/m/mpi4py/mpi4py-3.1.4-GCCcore-11.3.0.eb b/m/mpi4py/mpi4py-3.1.4-GCCcore-11.3.0.eb
@@ -14,14 +14,13 @@ sources = [SOURCE_TAR_GZ]
 checksums = ['17858f2ebc623220d0120d1fa8d428d033dde749c4bc35b33d81a66ad7f93480']
 
 dependencies = [
-	('PythonPlus', '3.10.4','-v22.11.3'),
-	('Python', '3.10.4','-bare'),
+	('PythonPlus', '3.10.4','-v23.01.1'),
 	('OpenMPI','4.1.4','',('GCC','11.3.0'))
 ]
 
 sanity_check_paths = {
     'files': [],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
+    'dirs': ['lib/python3.10/site-packages/mpi4py'],
 }
 
 moduleclass = 'lib'
diff --git a/p/PythonPlus/PythonPlus-3.10.4-GCCcore-11.3.0-v22.11.1-requirements.txt b/p/PythonPlus/PythonPlus-3.10.4-GCCcore-11.3.0-v22.11.1-requirements.txt