Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
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
RadioObservatory
LOFAR
Commits
9bed43a7
Commit
9bed43a7
authored
6 years ago
by
Jörn Künsemöller
Browse files
Options
Downloads
Patches
Plain Diff
Task
LSMR-8
: attempt to switch to Python 3
parent
8fea5d91
No related branches found
No related tags found
1 merge request
!87
Lsmr epic
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
SAS/LSMR/CMakeLists.txt
+0
-1
0 additions, 1 deletion
SAS/LSMR/CMakeLists.txt
SAS/LSMR/src/CMakeLists.txt
+2
-1
2 additions, 1 deletion
SAS/LSMR/src/CMakeLists.txt
SAS/LSMR/test/CMakeLists.txt
+3
-1
3 additions, 1 deletion
SAS/LSMR/test/CMakeLists.txt
with
5 additions
and
3 deletions
SAS/LSMR/CMakeLists.txt
+
0
−
1
View file @
9bed43a7
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
lofar_package
(
LSMR 0.1
)
lofar_package
(
LSMR 0.1
)
# set(Python_ADDITIONAL_VERSIONS 3.4) # FIXME: Find proper solution to manage Python environments with cmake!
include
(
PythonInstall
)
include
(
PythonInstall
)
add_subdirectory
(
src
)
add_subdirectory
(
src
)
...
...
This diff is collapsed.
Click to expand it.
SAS/LSMR/src/CMakeLists.txt
+
2
−
1
View file @
9bed43a7
lofar_find_package
(
PythonInterp 3.4 REQUIRED
)
lofar_find_package
(
PythonInterp 3.4 REQUIRED
)
include
(
PythonInstall
)
include
(
PythonInstall
)
include
(
FindPythonModule
)
include
(
FindPythonModule
)
set
(
Python_ADDITIONAL_VERSIONS 3.4
)
# FIXME: Find proper solution to manage Python environments with cmake!
find_python_module
(
django REQUIRED
)
find_python_module
(
django REQUIRED
)
find_python_module
(
rest_framework REQUIRED
)
# pip install djangorestframework
find_python_module
(
rest_framework REQUIRED
)
# pip install djangorestframework
find_python_module
(
ldap REQUIRED
)
find_python_module
(
ldap REQUIRED
)
#
find_python_module(markdown REQUIRED)
# FIXME: not detected
find_python_module
(
markdown REQUIRED
)
# find_python_module(django-filter REQUIRED) # FIXME: not detected
# find_python_module(django-filter REQUIRED) # FIXME: not detected
set
(
_py_files
set
(
_py_files
...
...
This diff is collapsed.
Click to expand it.
SAS/LSMR/test/CMakeLists.txt
+
3
−
1
View file @
9bed43a7
include
(
LofarCTest
)
include
(
LofarCTest
)
include
(
FindPythonModule
)
include
(
FindPythonModule
)
set
(
Python_ADDITIONAL_VERSIONS 3.4
)
# FIXME: Find proper solution to manage Python environments with cmake!
find_python_module
(
mock REQUIRED
)
find_python_module
(
mock REQUIRED
)
find_python_module
(
requests REQUIRED
)
#
find_python_module(requests REQUIRED)
# FIXME: Not detected
lofar_add_test
(
t_lsmrapp_models
)
lofar_add_test
(
t_lsmrapp_models
)
lofar_add_test
(
t_functional
)
lofar_add_test
(
t_functional
)
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