Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
sft
lcgcmake
Commits
7c9b7a6f
Commit
7c9b7a6f
authored
Nov 26, 2019
by
Dmitri Konstantinov
Browse files
Merge branch 'Python-3.8.0' into 'master'
Toolchains and some modifications for Python 3.8.0 See merge request
!304
parents
bb3d959d
eecf8f62
Pipeline
#1253098
passed with stage
in 5 minutes and 34 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
cmake/toolchain/heptools-dev3python38.cmake
0 → 100644
View file @
7c9b7a6f
#---List of externals
set
(
LCG_PYTHON_VERSION 3
)
include
(
heptools-dev-base
)
#---Additional External packages------(Generators)-----------------
include
(
heptools-dev-generators
)
LCG_external_package
(
ROOT HEAD GIT=http://root.cern.ch/git/root.git
)
LCG_external_package
(
hepmc3 HEAD GIT=https://gitlab.cern.ch/hepmc/HepMC3.git
)
LCG_remove_package
(
Gaudi
)
LCG_remove_package
(
Python
)
LCG_external_package
(
Python 3.8.0
)
cmake/toolchain/heptools-dev4python38.cmake
0 → 100644
View file @
7c9b7a6f
#---List of externals----------------------------------------------
set
(
LCG_PYTHON_VERSION 3
)
include
(
heptools-dev-base
)
#---Additional External packages------(Generators)-----------------
include
(
heptools-dev-generators
)
LCG_external_package
(
ROOT v6-18-00-patches GIT=http://root.cern.ch/git/root.git
)
LCG_external_package
(
hepmc3 3.1.1
)
# Latest tagged version of COOL, CORAL instead of master (if required)
if
(
NOT
${
LCG_OS
}${
LCG_OSVERS
}
MATCHES ubuntu18|mac[0-9]+
)
LCG_remove_package
(
CORAL
)
LCG_AA_project
(
CORAL 3_2_2
)
LCG_remove_package
(
COOL
)
LCG_AA_project
(
COOL 3_2_2
)
endif
()
LCG_remove_package
(
Python
)
LCG_external_package
(
Python 3.8.0
)
generators/CMakeLists.txt
View file @
7c9b7a6f
...
...
@@ -224,6 +224,9 @@ LCGPackage_Add(
ROOTCONFIG=
${
ROOT_home
}
/bin/root-config
ENDIF
PYTHON=
${
Python_home
}
/bin/
${
PYTHON
}
COMMAND $ENV{SHELL} -c
"touch <SOURCE_DIR>/pyext/yoda/core.pyx <SOURCE_DIR>/pyext/yoda/util.pyx <SOURCE_DIR>/pyext/yoda/rootcompat.pyx"
BUILD_COMMAND
${
MAKE
}
all
INSTALL_COMMAND
${
MAKE
}
install
BUILD_IN_SOURCE 1
...
...
pyexternals/CMakeLists.txt
View file @
7c9b7a6f
...
...
@@ -2253,12 +2253,12 @@ LCGPackage_Add(
URL
${
GenURL
}
/tables-
${
pytables_native_version
}
.tar.gz
# ENVIRONMENT DISABLE_AVX2=1
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND
<VOID>
BUILD_COMMAND
$ENV{SHELL} -c
"touch <SOURCE_DIR>/tables/*.pyx"
INSTALL_COMMAND
${
MakeSitePackagesDir
}
COMMAND
${
PYTHON
}
setup.py install --hdf5=
${
hdf5_home
}
IF NOT
${
xz_home
}
STREQUAL TakenFromSystem THEN --bzip2=
${
xz_home
}
ENDIF
${
PySetupOptions
}
COMMAND
${
CMAKE_SOURCE_DIR
}
/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
DEPENDS Python numpy numexpr hdf5 xz
DEPENDS Python numpy numexpr hdf5 xz
cython
)
...
...
@@ -2942,7 +2942,7 @@ LCGPackage_Add(
LCGPackage_Add
(
statsmodels
URL
${
GenURL
}
/statsmodels-
${
statsmodels_native_version
}
.tar.gz
CONFIGURE_COMMAND
<VOID>
CONFIGURE_COMMAND
$ENV{SHELL} -c
"touch <SOURCE_DIR>/*/*/*/*.pyx <SOURCE_DIR>/*/*/*.pyx"
BUILD_COMMAND <VOID>
INSTALL_COMMAND
${
MakeSitePackagesDir
}
COMMAND
${
PYTHON
}
setup.py install
${
PySetupOptions
}
...
...
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