Skip to content

add templates for architecture independent Python wheels #3618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boegel merged 2 commits into from
Apr 5, 2021
Merged

add templates for architecture independent Python wheels #3618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3674a8
Add templates for architecture independent Python wheels
Flamefire Mar 24, 2021
90bbe8c
Merge branch 'develop' into whlTemplates
boegel Apr 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions easybuild/framework/easyconfig/templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,19 @@
('SOURCE_%s' % suffix, '%(name)s-%(version)s.' + ext, "Source .%s bundle" % ext),
('SOURCELOWER_%s' % suffix, '%(namelower)s-%(version)s.' + ext, "Source .%s bundle with lowercase name" % ext),
]
for pyver in ('py2.py3', 'py2', 'py3'):
if pyver == 'py2.py3':
desc = 'Python 2 & Python 3'
name_infix = ''
else:
desc = 'Python ' + pyver[-1]
name_infix = pyver.upper() + '_'
TEMPLATE_CONSTANTS += [
('SOURCE_%sWHL' % name_infix, '%%(name)s-%%(version)s-%s-none-any.whl' % pyver,
'Generic (non-compiled) %s wheel package' % desc),
('SOURCELOWER_%sWHL' % name_infix, '%%(namelower)s-%%(version)s-%s-none-any.whl' % pyver,
'Generic (non-compiled) %s wheel package with lowercase name' % desc),
]

# TODO derived config templates
# versionmajor, versionminor, versionmajorminor (eg '.'.join(version.split('.')[:2])) )
Expand Down
32 changes: 32 additions & 0 deletions test/framework/easyconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import stat
import sys
import tempfile
import textwrap
from distutils.version import LooseVersion
from test.framework.utilities import EnhancedTestCase, TestLoaderFiltered, init_config
from unittest import TextTestRunner
Expand Down Expand Up @@ -1183,6 +1184,37 @@ def test_java_wrapper_templating(self):

self.assertEqual(eb['modloadmsg'], "Java: 11, 11, 11")

def test_python_whl_templating(self):
"""test templating for Python wheels"""

self.contents = textwrap.dedent("""
easyblock = "ConfigureMake"
name = "Pi"
version = "3.14"
homepage = "https://example.com"
description = "test easyconfig"
toolchain = {"name":"GCC", "version": "4.6.3"}
sources = [
SOURCE_WHL,
SOURCELOWER_WHL,
SOURCE_PY2_WHL,
SOURCELOWER_PY2_WHL,
SOURCE_PY3_WHL,
SOURCELOWER_PY3_WHL,
]
""")
self.prep()
ec = EasyConfig(self.eb_file)

sources = ec['sources']

self.assertEqual(sources[0], 'Pi-3.14-py2.py3-none-any.whl')
self.assertEqual(sources[1], 'pi-3.14-py2.py3-none-any.whl')
self.assertEqual(sources[2], 'Pi-3.14-py2-none-any.whl')
self.assertEqual(sources[3], 'pi-3.14-py2-none-any.whl')
self.assertEqual(sources[4], 'Pi-3.14-py3-none-any.whl')
self.assertEqual(sources[5], 'pi-3.14-py3-none-any.whl')

def test_templating_doc(self):
"""test templating documentation"""
doc = avail_easyconfig_templates()
Expand Down