Skip to content

Commit ab703dd

Browse files
jfgrimmjfgrimm
committed
fix conflicts
2 parents 9ae700d + e530513 commit ab703dd

File tree

1 file changed

+35
-32
lines changed

1 file changed

+35
-32
lines changed

‎easybuild/framework/easyconfig/templates.py‎

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@
115115
TEMPLATE_CONSTANTS = {
116116
# source url constants
117117
'APACHE_SOURCE': ('https://archive.apache.org/dist/%(namelower)s',
118-
'apache.org source url'),
118+
'apache.org source URL'),
119119
'BITBUCKET_SOURCE': ('https://bitbucket.org/%(bitbucket_account)s/%(namelower)s/get',
120-
'bitbucket.org source url '
120+
'bitbucket.org source URL '
121121
'(namelower is used if bitbucket_account easyconfig parameter is not specified)'),
122122
'BITBUCKET_DOWNLOADS': ('https://bitbucket.org/%(bitbucket_account)s/%(namelower)s/downloads',
123-
'bitbucket.org downloads url '
123+
'bitbucket.org downloads URL '
124124
'(namelower is used if bitbucket_account easyconfig parameter is not specified)'),
125125
'CRAN_SOURCE': ('https://cran.r-project.org/src/contrib',
126-
'CRAN (contrib) source url'),
126+
'CRAN (contrib) source URL'),
127127
'FTPGNOME_SOURCE': ('https://ftp.gnome.org/pub/GNOME/sources/%(namelower)s/%(version_major_minor)s',
128128
'http download for gnome ftp server'),
129129
'GITHUB_SOURCE': ('https://github.com/%(github_account)s/%(name)s/archive',
@@ -139,33 +139,36 @@
139139
'GitHub release URL with lowercase name (if github_account easyconfig '
140140
'parameter is not specified, namelower is used in its place)'),
141141
'GNU_SAVANNAH_SOURCE': ('https://download-mirror.savannah.gnu.org/releases/%(namelower)s',
142-
'download.savannah.gnu.org source url'),
143-
'GNU_SOURCE': ('https://ftpmirror.gnu.org/gnu/%(namelower)s',
144-
'gnu.org source url (ftp mirror)'),
145-
'GNU_FTP_SOURCE': ('https://ftp.gnu.org/gnu/%(namelower)s',
146-
'gnu.org source url (main ftp)'),
142+
'download.savannah.gnu.org source URL'),
143+
'GNU_FTP_URLS': (['https://ftpmirror.gnu.org/gnu/%(namelower)s', 'https://ftp.gnu.org/gnu/%(namelower)s'],
144+
'gnu.org source URLs (ftp mirror and main)'),
147145
'GOOGLECODE_SOURCE': ('http://%(namelower)s.googlecode.com/files',
148-
'googlecode.com source url'),
146+
'googlecode.com source URL'),
149147
'LAUNCHPAD_SOURCE': ('https://launchpad.net/%(namelower)s/%(version_major_minor)s.x/%(version)s/+download/',
150-
'launchpad.net source url'),
148+
'launchpad.net source URL'),
151149
'PYPI_SOURCE': ('https://pypi.python.org/packages/source/%(nameletter)s/%(name)s',
152-
'pypi source url'), # e.g., Cython, Sphinx
150+
'pypi source URL'), # e.g., Cython, Sphinx
153151
'PYPI_LOWER_SOURCE': ('https://pypi.python.org/packages/source/%(nameletterlower)s/%(namelower)s',
154-
'pypi source url (lowercase name)'), # e.g., Greenlet, PyZMQ
152+
'pypi source URL (lowercase name)'), # e.g., Greenlet, PyZMQ
155153
'R_SOURCE': ('https://cran.r-project.org/src/base/R-%(version_major)s',
156-
'cran.r-project.org (base) source url'),
154+
'cran.r-project.org (base) source URL'),
157155
'SOURCEFORGE_SOURCE': ('https://download.sourceforge.net/%(namelower)s',
158-
'sourceforge.net source url'),
159-
'XORG_DATA_SOURCE': ('https://www.x.org/archive/individual/data/',
160-
'xorg data source url'),
161-
'XORG_LIB_SOURCE': ('https://www.x.org/archive/individual/lib/',
162-
'xorg lib source url'),
163-
'XORG_PROTO_SOURCE': ('https://www.x.org/archive/individual/proto/',
164-
'xorg proto source url'),
165-
'XORG_UTIL_SOURCE': ('https://www.x.org/archive/individual/util/',
166-
'xorg util source url'),
167-
'XORG_XCB_SOURCE': ('https://www.x.org/archive/individual/xcb/',
168-
'xorg xcb source url'),
156+
'sourceforge.net source URL'),
157+
'XORG_DATA_URLS': (['https://www.x.org/archive/individual/data/',
158+
'https://xorg.freedesktop.org/archive/individual/data/'],
159+
'xorg data source URLs'),
160+
'XORG_LIB_URLS': (['https://www.x.org/archive/individual/lib/',
161+
'https://xorg.freedesktop.org/archive/individual/lib/'],
162+
'xorg lib source URLs'),
163+
'XORG_PROTO_URLS': (['https://www.x.org/archive/individual/proto/',
164+
'https://xorg.freedesktop.org/archive/individual/proto/'],
165+
'xorg proto source URLs'),
166+
'XORG_UTIL_URLS': (['https://www.x.org/archive/individual/util/',
167+
'https://xorg.freedesktop.org/archive/individual/util/'],
168+
'xorg util source URLs'),
169+
'XORG_XCB_URLS': (['https://www.x.org/archive/individual/xcb/',
170+
'https://xorg.freedesktop.org/archive/individual/xcb/'],
171+
'xorg xcb source URLs'),
169172

170173
# TODO, not urgent, yet nice to have:
171174
# CPAN_SOURCE GNOME KDE_I18N XCONTRIB DEBIAN KDE GENTOO TEX_CTAN MOZILLA_ALL
@@ -224,19 +227,12 @@
224227
'GITHUB_RELEASE_URL': 'GITHUB_RELEASE',
225228
'GITHUB_RELEASE_URL_LOWER': 'GITHUB_LOWER_RELEASE',
226229
'GNU_SAVANNAH_URL': 'GNU_SAVANNAH_SOURCE',
227-
'GNU_FTP_URL': 'GNU_FTP_SOURCE',
228-
'GNU_URL': 'GNU_SOURCE',
229230
'GOOGLECODE_URL': 'GOOGLECODE_SOURCE',
230231
'LAUNCHPAD_URL': 'LAUNCHPAD_SOURCE',
231232
'PYPI_URL': 'PYPI_SOURCE',
232233
'PYPI_URL_LOWER': 'PYPI_LOWER_SOURCE',
233234
'R_URL': 'R_SOURCE',
234235
'SOURCEFORGE_URL': 'SOURCEFORGE_SOURCE',
235-
'XORG_DATA_URL': 'XORG_DATA_SOURCE',
236-
'XORG_LIB_URL': 'XORG_LIB_SOURCE',
237-
'XORG_PROTO_URL': 'XORG_PROTO_SOURCE',
238-
'XORG_UTIL_URL': 'XORG_UTIL_SOURCE',
239-
'XORG_XCB_URL': 'XORG_XCB_SOURCE',
240236
'SOURCE_LOWER_TAR_GZ': 'SOURCELOWER_TAR_GZ',
241237
'SOURCE_LOWER_TAR_XZ': 'SOURCELOWER_TAR_XZ',
242238
'SOURCE_LOWER_TAR_BZ2': 'SOURCELOWER_TAR_BZ2',
@@ -257,6 +253,13 @@
257253
# deprecated template constants, and their replacements
258254
DEPRECATED_EASYCONFIG_TEMPLATE_CONSTANTS = {
259255
# <old_template_constant>: (<new_template_constant>, <deprecation_version>),
256+
'GNU_FTP_SOURCE': ('GNU_FTP_URLS', '6.0'),
257+
'GNU_SOURCE': ('GNU_FTP_URLS', '6.0'),
258+
'XORG_DATA_SOURCE': ('XORG_DATA_URLS', '6.0'),
259+
'XORG_LIB_SOURCE': ('XORG_LIB_URLS', '6.0'),
260+
'XORG_PROTO_SOURCE': ('XORG_PROTO_URLS', '6.0'),
261+
'XORG_UTIL_SOURCE': ('XORG_PROTO_URLS', '6.0'),
262+
'XORG_XCB_SOURCE': ('XORG_XCB_SOURCE', '6.0'),
260263
}
261264

262265
EXTENSIONS = ['tar.gz', 'tar.xz', 'tar.bz2', 'tgz', 'txz', 'tbz2', 'tb2', 'gtgz', 'zip', 'tar', 'xz', 'tar.Z']

0 commit comments

Comments
 (0)