Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
FSL
conda
fsl-ci-rules
Commits
a8411142
Commit
a8411142
authored
Aug 16, 2021
by
Paul McCarthy
🚵
Browse files
RF: Generate cuda package name properly if CUDA_VER is set, fall back
to, and accept, (verbatim) "cuda-X.Y" if not set
parent
64dd84aa
Changes
3
Hide whitespace changes
Inline
Side-by-side
fsl_ci/__init__.py
View file @
a8411142
...
...
@@ -19,7 +19,7 @@ import subprocess as sp
import
yaml
__version__
=
'0.14.
5
'
__version__
=
'0.14.
6
'
"""Current version of the fsl-ci-rules."""
...
...
fsl_ci/conda.py
View file @
a8411142
...
...
@@ -108,7 +108,8 @@ def load_meta_yaml(filename, ignore_env=False):
if
not
ignore_env
:
template_os
.
environ
=
os
.
environ
.
copy
()
template_os
.
environ
[
'CUDA_VER'
]
=
'CUDA_VER'
if
'CUDA_VER'
not
in
template_os
.
environ
:
template_os
.
environ
[
'CUDA_VER'
]
=
'X.Y'
env
=
{
'os'
:
template_os
,
...
...
fsl_ci/platform.py
View file @
a8411142
...
...
@@ -26,7 +26,7 @@ def get_platform(meta : dict) -> str:
(
'noarch'
in
meta
[
'build'
]))
# CUDA package names end with "-cuda-X.Y"
cudapat
=
r
'.*-cuda-\d+\.\d+'
cudapat
=
r
'.*-cuda-
(
\d+\.\d+
|X\.Y)
'
cuda
=
((
'package'
in
meta
)
and
(
'name'
in
meta
[
'package'
])
and
re
.
fullmatch
(
cudapat
,
meta
[
'package'
][
'name'
]))
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment