Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Core Modules
dune-common
Commits
2d3ef5a7
Commit
2d3ef5a7
authored
2 years ago
by
Timo Koch
Committed by
Robert K
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[cmake][python] Do not create install rule for Python packages when DUNE_PYTHON_USE_VENV=FALSE
parent
42f1fd9f
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!1222
[feature][Python] Make use of venv optional. Default is ON.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/modules/DunePythonInstallPackage.cmake
+7
-0
7 additions, 0 deletions
cmake/modules/DunePythonInstallPackage.cmake
with
7 additions
and
0 deletions
cmake/modules/DunePythonInstallPackage.cmake
+
7
−
0
View file @
2d3ef5a7
...
...
@@ -471,6 +471,7 @@ function(dune_python_configure_package)
# installation command for dune package into local env - external requirements are already sorted and we want this step to not require
# internet access. Dune packages need to be installed at this stage and should not be obtained from pypi (those packages include the C++ part
# of the module which we don't want to install. So only use available wheels.
# Only install dependencies if the use of virtual environments is enabled.
if
(
NOT SKBUILD AND DUNE_PYTHON_USE_VENV
)
message
(
STATUS
"Installing python package at
${
PYPKGCONF_PATH
}
into Dune virtual environment
${
DUNE_PIP_INDEX
}
"
)
dune_execute_process
(
...
...
@@ -536,6 +537,12 @@ function(dune_python_configure_package)
endif
()
endif
()
# Only add installation rules to make install if virtual environments are enabled
# Otherwise installation of Python packages is in user-hands
if
(
NOT DUNE_PYTHON_USE_VENV
)
return
()
endif
()
# Construct the wheel installation commandline
# TODO should the wheel be build for the internal env setup or for the external one?
set
(
WHEEL_COMMAND
${
DUNE_PYTHON_VIRTUALENV_EXECUTABLE
}
-m pip wheel -w
${
DUNE_PYTHON_WHEELHOUSE
}
--no-deps
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment