From 468ef633448684090e1544a476ee05d9c2db1f83 Mon Sep 17 00:00:00 2001 From: Ari Kraut Date: Thu, 15 Jul 2021 15:37:19 +0200 Subject: [PATCH 01/10] Update several package versions --- cmake/toolchain/heptools-dev-base.cmake | 86 ++++++++++++------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index 519808621..c09549ef6 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -38,14 +38,14 @@ LCG_external_package(astor 0.8.1 LCG_external_package(astroid 2.3.3 ) LCG_external_package(astunparse 1.6.3 ) LCG_external_package(atomicwrites 1.3.0 ) -LCG_external_package(attrs 19.3.0 ) +LCG_external_package(attrs 21.2.0 ) LCG_external_package(autoconf 2.69 ) LCG_external_package(automake 1.16.1 ) LCG_external_package(autopep8 1.4.4 ) LCG_external_package(awkward0 0.15.3 ) LCG_external_package(awkward 1.0.2 ) -LCG_external_package(babel 2.9.0 ) -LCG_external_package(backcall 0.1.0 ) +LCG_external_package(babel 2.9.1 ) +LCG_external_package(backcall 0.2.0 ) LCG_external_package(backports 1.0.0 ) LCG_external_package(backports.functools_lru_cache 1.5 ) LCG_external_package(backports.lzma 0.0.13 ) @@ -57,7 +57,7 @@ LCG_external_package(benchmark 1.5.5 LCG_external_package(bison 3.3.2 ) #LCG_external_package(blas 3.8.0.netlib ) LCG_external_package(blas 0.3.10.openblas ) -LCG_external_package(bleach 3.1.0 ) +LCG_external_package(bleach 3.3.1 ) LCG_external_package(brotli 1.0.7 ) LCG_external_package(bzip2 1.0.6 ) LCG_external_package(bokeh 2.3.1 ) @@ -76,8 +76,8 @@ if(NOT ${LCG_OS}${LCG_OSVERS} MATCHES mac|centos8|ubuntu20) endif() LCG_external_package(Catch2 2.13.4 ) LCG_external_package(ccache 4.3 ) -LCG_external_package(certifi 2019.3.9 ) -LCG_external_package(cffi 1.14.5 ) +LCG_external_package(certifi 2021.5.30 ) +LCG_external_package(cffi 1.14.6 ) LCG_external_package(cfitsio 3.48 ) LCG_external_package(chardet 3.0.4 ) LCG_external_package(clhep 2.4.4.0 ) @@ -109,8 +109,8 @@ LCG_external_package(dask 2021.4.1 if(NOT ${LCG_OS} STREQUAL mac) LCG_external_package(Davix 0.7.6 ) endif() -LCG_external_package(decorator 4.3.2 ) -LCG_external_package(defusedxml 0.6.0 ) +LCG_external_package(decorator 5.0.9 ) +LCG_external_package(defusedxml 0.7.1 ) LCG_external_package(delphes 3.4.3pre09 ) LCG_external_package(deprecation 2.1.0 ) LCG_external_package(dill 0.3.3 ) @@ -224,7 +224,7 @@ if(${LCG_OS}${LCG_OSVERS} STREQUAL slc6) LCG_external_package(hdf5 1.10.5 ) endif() LCG_external_package(hypothesis 5.3.0 ) -LCG_external_package(idna 2.8 ) +LCG_external_package(idna 3.2 ) LCG_external_package(imageio 2.5.0 ) LCG_external_package(imagesize 1.2.0 ) if( NOT ${LCG_OS}${LCG_OSVERS} MATCHES ubuntu18 ) @@ -236,10 +236,10 @@ LCG_external_package(importlib_resources 1.0.2 LCG_external_package(iniconfig 1.1.1 ) LCG_external_package(ipaddress 1.0.22 ) LCG_external_package(ipydatawidgets 4.0.1 ) -LCG_external_package(ipykernel 5.1.1 ) +LCG_external_package(ipykernel 6.0.2 ) LCG_external_package(ipympl 0.7.0 ) LCG_external_package(ipyparallel 6.2.4 ) -LCG_external_package(ipython 7.5.0 ) +LCG_external_package(ipython 7.25.0 ) LCG_external_package(ipython_genutils 0.2.0 ) LCG_external_package(ipywidgets 7.6.3 ) LCG_external_package(isort 4.3.20 ) @@ -257,9 +257,9 @@ endif() LCG_external_package(java 8u222 ) LCG_external_package(jax 0.2.9 ) LCG_external_package(jaxlib 0.1.59 ) -LCG_external_package(jedi 0.13.3 ) +LCG_external_package(jedi 0.18.0 ) LCG_external_package(jemalloc 5.2.1 ) -LCG_external_package(Jinja2 2.11.2 ) +LCG_external_package(Jinja2 3.0.1 ) LCG_external_package(joblib 0.14.0 ) LCG_external_package(jpeg v6b ) LCG_external_package(jsonc 0.12 ) @@ -271,10 +271,10 @@ LCG_external_package(jsonschema 3.2.0 if(NOT ((${LCG_COMP} MATCHES gcc) AND (${LCG_COMPVERS} EQUAL 11))) # remove this for next julia version LCG_external_package(julia 1.6.0 ) endif() -LCG_external_package(pyjson5 0.9.1 ) +LCG_external_package(pyjson5 0.9.6 ) LCG_external_package(jupyter 1.0.0 ) -LCG_external_package(jupyter_client 5.3.4 ) -LCG_external_package(jupyter_core 4.6.1 ) +LCG_external_package(jupyter_client 6.1.12 ) +LCG_external_package(jupyter_core 4.7.1 ) LCG_external_package(jupyter_console 6.1.0 ) LCG_external_package(jupyter_contrib_core 0.3.3 ) LCG_external_package(jupyter_contrib_nbextensions 0.5.1 ) @@ -282,8 +282,8 @@ LCG_external_package(jupyter_highlight_selected_word 0.2.0 LCG_external_package(jupyter_latex_envs 1.4.4 ) LCG_external_package(jupyter_nbextensions_configurator 0.4.1 ) LCG_external_package(jupyter_packaging 0.10.4 ) -LCG_external_package(jupyterlab 1.2.6 ) -LCG_external_package(jupyterlab_server 1.0.6 ) +LCG_external_package(jupyterlab 3.0.16 ) +LCG_external_package(jupyterlab_server 2.6.1 ) LCG_external_package(keras 2.4.3 ) LCG_external_package(keras_applications 1.0.8 ) LCG_external_package(keras_preprocessing 1.1.2 ) @@ -352,7 +352,7 @@ if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL slc6) # Tests fail LCG_external_package(mysql_connector_python 8.0.18 ) endif() LCG_external_package(nanomsg 1.1.5 ) -LCG_external_package(nbconvert 5.5.0 ) +LCG_external_package(nbconvert 6.1.0 ) LCG_external_package(nbformat 5.1.3 ) LCG_external_package(netcdfc 4.7.0 ) LCG_external_package(networkx 2.5.1 ) @@ -362,7 +362,7 @@ if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL slc6) # requires python 2.7 LCG_external_package(node.js 14.16.1 ) endif() LCG_external_package(nose 1.3.7 ) -LCG_external_package(notebook 5.7.8 ) +LCG_external_package(notebook 6.4.0 ) LCG_external_package(numba 0.51.2 ) LCG_external_package(numexpr 2.6.9 ) LCG_external_package(numpy 1.18.2 ) @@ -386,10 +386,10 @@ if(NOT ${LCG_OS} STREQUAL mac) LCG_external_package(oracle 18.3.0.0.0 ) endif() endif() -LCG_external_package(packaging 19.0 ) +LCG_external_package(packaging 21.0 ) LCG_external_package(pacparser 1.3.7 ) LCG_external_package(pandas 1.2.2 ) -LCG_external_package(pandocfilters 1.4.2 ) +LCG_external_package(pandocfilters 1.4.3 ) LCG_external_package(panel 0.11.3 ) if(NOT ${LCG_OS} MATCHES mac) LCG_external_package(pango 1.40.13 ) @@ -397,7 +397,7 @@ endif() LCG_external_package(param 1.10.1 ) LCG_external_package(paramiko 2.4.2 ) LCG_external_package(parsl 0.9.0 ) -LCG_external_package(parso 0.4.0 ) +LCG_external_package(parso 0.8.2 ) LCG_external_package(partd 1.2.0 ) LCG_external_package(patchelf 0.12 ) LCG_external_package(pathlib2 2.3.3 ) @@ -406,7 +406,7 @@ LCG_external_package(patsy 0.5.1 LCG_external_package(pbr 5.2.1 ) LCG_external_package(pcre 8.43 ) LCG_external_package(pcre2 10.36 ) -LCG_external_package(pexpect 4.7.0 ) +LCG_external_package(pexpect 4.8.0 ) LCG_external_package(pickleshare 0.7.5 ) LCG_external_package(pillow 8.2.0 ) LCG_external_package(pip 21.0.1 ) @@ -429,11 +429,11 @@ if(${LCG_OS} STREQUAL slc OR ${LCG_OS} STREQUAL centos OR ${LCG_OS} STREQUAL cc) endif() LCG_external_package(prettytable 0.7.2 ) LCG_external_package(proj 8.0.0 ) -LCG_external_package(prometheus_client 0.7.0 ) -LCG_external_package(prompt_toolkit 2.0.9 ) +LCG_external_package(prometheus_client 0.11.0 ) +LCG_external_package(prompt_toolkit 3.0.19 ) LCG_external_package(protobuf 2.5.0 ) LCG_external_package(psutil 5.6.2 ) -LCG_external_package(ptyprocess 0.6.0 ) +LCG_external_package(ptyprocess 0.7.0 ) LCG_external_package(py 1.9.0 ) # dropped due to dependency conflict: requires py-prompt-toolkit > 2.0, while ipython requires < 2.0 # LCG_external_package(py2neo 4.3.0 ) @@ -446,12 +446,12 @@ LCG_external_package(pyasn1 0.4.5 LCG_external_package(pyasn1_modules 0.2.5 ) LCG_external_package(pycairo 1.18.1 ) LCG_external_package(pycodestyle 2.5.0 ) -LCG_external_package(pycparser 2.19 ) +LCG_external_package(pycparser 2.20 ) LCG_external_package(pyct 0.4.6 ) LCG_external_package(pydot 1.4.1 ) LCG_external_package(pydot_ng 2.0.0 ) LCG_external_package(pyflakes 2.1.1 ) -LCG_external_package(pygments 2.4.2 ) +LCG_external_package(pygments 2.9.0 ) LCG_external_package(pygraphics 2.0 ) LCG_external_package(pygraphviz 1.7 ) if(NOT ${LCG_OS} STREQUAL mac) @@ -462,11 +462,11 @@ if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL slc6) endif() LCG_external_package(PyJWT 2.0.1 ) LCG_external_package(pylint 2.3.1 ) -LCG_external_package(pyparsing 2.4.0 ) +LCG_external_package(pyparsing 2.4.7 ) LCG_external_package(pyqt5 5.12.3 ) #LCG_external_package(pyqtwebengine 5.12.1 ) LCG_external_package(PyRDF 0.2.1 ) -LCG_external_package(pyrsistent 0.15.2 ) +LCG_external_package(pyrsistent 0.18.0 ) LCG_external_package(pyserial 3.4 ) LCG_external_package(pystan 3.1.1 ) LCG_external_package(pyshp 2.1.0 ) @@ -478,18 +478,18 @@ if(${LCG_OS}${LCG_OSVERS} STREQUAL slc6) else() LCG_external_package(Python 3.9.5 ) endif() -LCG_external_package(python_dateutil 2.8.0 ) +LCG_external_package(python_dateutil 2.8.2 ) LCG_external_package(python_gitlab 1.8.0 ) if(${LCG_OS} STREQUAL slc OR ${LCG_OS} STREQUAL centos OR ${LCG_OS} STREQUAL cc ) LCG_external_package(pythonsollya 0.3 ) endif() LCG_external_package(python_vxi11 0.9 ) LCG_external_package(pytools 2019.1.1 ) -LCG_external_package(pytz 2019.1 ) +LCG_external_package(pytz 2021.1 ) LCG_external_package(pyviz_comms 2.0.1 ) LCG_external_package(pywt 1.0.3 ) LCG_external_package(PyYAML 5.3.1 pyyaml ) -LCG_external_package(pyzmq 22.0.3 ) +LCG_external_package(pyzmq 22.1.0 ) LCG_external_package(p7zip 16.02 ) LCG_external_package(QMtest 2.4.1 ) #LCG_external_package(Qt 4.8.7 qt ) @@ -505,7 +505,7 @@ LCG_external_package(rangev3 0.11.0 LCG_external_package(rapidjson 1.1.0 ) LCG_external_package(readline 8.0 ) LCG_external_package(redis 3.2.1 ) -LCG_external_package(requests 2.22.0 ) +LCG_external_package(requests 2.26.0 ) LCG_external_package(requests_oauthlib 1.2.0 ) LCG_external_package(retrying 1.3.3 ) LCG_external_package(rise 5.5.0 ) @@ -517,7 +517,7 @@ LCG_external_package(scikitimage 0.14.3 LCG_external_package(scikitlearn 0.21.2 ) LCG_external_package(scipy 1.5.1 ) LCG_external_package(seaborn 0.9.0 ) -LCG_external_package(send2trash 1.5.0 ) +LCG_external_package(send2trash 1.7.1 ) LCG_external_package(setuptools 57.1.0 ) LCG_external_package(setuptools_scm 3.3.3 ) LCG_external_package(shapely 1.7.1 ) @@ -528,7 +528,7 @@ LCG_external_package(simplegeneric 0.8.1 LCG_external_package(simplejson 3.16.1 ) LCG_external_package(singledispatch 3.4.0.3 ) LCG_external_package(sip 4.19.15 ) -LCG_external_package(six 1.12.0 ) +LCG_external_package(six 1.16.0 ) LCG_external_package(snappy 1.1.7 ) LCG_external_package(snowballstemmer 2.1.0 ) LCG_external_package(sollya 7.0 ) @@ -561,8 +561,8 @@ if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL slc6) LCG_external_package(tensorboard_plugin_wit 1.8.0 ) endif() LCG_external_package(termcolor 1.1.0 ) -LCG_external_package(terminado 0.8.2 ) -LCG_external_package(testpath 0.4.2 ) +LCG_external_package(terminado 0.10.1 ) +LCG_external_package(testpath 0.5.0 ) LCG_external_package(texinfo 6.3 ) LCG_external_package(theano 1.0.5 ) LCG_external_package(thrift 0.13.0 ) @@ -576,7 +576,7 @@ if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL slc6) endif() LCG_external_package(tornado 6.1 ) LCG_external_package(tqdm 4.61.2 ) -LCG_external_package(traitlets 4.3.2 ) +LCG_external_package(traitlets 5.0.5 ) LCG_external_package(traittypes 0.2.1 ) LCG_external_package(tricktrack 1.0.9 ) LCG_external_package(typed_ast 1.4.3 ) @@ -590,7 +590,7 @@ LCG_External_package(upandas 0.2.0 LCG_external_package(uproot 4.0.1 ) LCG_external_package(uproot3 3.14.2 ) LCG_external_package(uproot3_methods 0.10.0 ) -LCG_external_package(urllib3 1.25.3 ) +LCG_external_package(urllib3 1.26.6 ) LCG_external_package(uuid 1.42 ) if(NOT ${LCG_OS} STREQUAL mac) LCG_external_package(valgrind 3.16.1 ) @@ -605,9 +605,9 @@ LCG_external_package(vectorclass 2.01.02 LCG_external_package(virtualenv 20.4.3 ) LCG_external_package(virtualenv_clone 0.5.4 ) LCG_external_package(virtualenvwrapper 4.8.4 ) -LCG_external_package(wcwidth 0.1.7 ) +LCG_external_package(wcwidth 0.2.5 ) LCG_external_package(webencodings 0.5.1 ) -LCG_external_package(websocket_client 0.56.0 ) +LCG_external_package(websocket_client 1.1.0 ) LCG_external_package(werkzeug 0.15.4 ) LCG_external_package(wheel 0.33.4 ) LCG_external_package(widgetsnbextension 3.5.1 ) -- GitLab From ccf808794191e5abf4c8d2520cfd75ce4cfaabf6 Mon Sep 17 00:00:00 2001 From: Ari Kraut Date: Fri, 16 Jul 2021 12:42:15 +0200 Subject: [PATCH 02/10] Use tar.gz for newer version of pycparser --- externals/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index e2bbafaf9..0faa4d873 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -2924,7 +2924,11 @@ LCGPackage_Add( #---pycparser---------------------------------------------------------------------------------------------------- LCGPackage_Add( pycparser + IF VERSION_LESS 2.20 THEN URL ${GenURL}/pycparser-${pycparser_native_version}.zip + ELSE + URL ${GenURL}/pycparser-${pycparser_native_version}.tar.gz + ENDIF CONFIGURE_COMMAND BUILD_COMMAND INSTALL_COMMAND ${MakeSitePackagesDir} -- GitLab From eebfe21fe08ea9ac8b34df9ffcb6da665d2090b6 Mon Sep 17 00:00:00 2001 From: Ari Kraut Date: Sun, 18 Jul 2021 21:14:04 +0200 Subject: [PATCH 03/10] Add deps and jupyter_server --- cmake/toolchain/heptools-dev-base.cmake | 3 ++- pyexternals/CMakeLists.txt | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index c09549ef6..592a06ea9 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -283,7 +283,8 @@ LCG_external_package(jupyter_latex_envs 1.4.4 LCG_external_package(jupyter_nbextensions_configurator 0.4.1 ) LCG_external_package(jupyter_packaging 0.10.4 ) LCG_external_package(jupyterlab 3.0.16 ) -LCG_external_package(jupyterlab_server 2.6.1 ) +LCG_external_package(jupyterlab_server 2.6.1 +LCG_external_package(jupyter_server 1.9.0 ) LCG_external_package(keras 2.4.3 ) LCG_external_package(keras_applications 1.0.8 ) LCG_external_package(keras_preprocessing 1.1.2 ) diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt index 8c6697e65..a582317d3 100644 --- a/pyexternals/CMakeLists.txt +++ b/pyexternals/CMakeLists.txt @@ -2298,6 +2298,19 @@ LCGPackage_Add( DEPENDS jupyter pyjson5 ) +#---jupyter_server------------------------------------------------------------------------------------------------------------- +LCGPackage_Add( + jupyterlab + URL ${GenURL}/jupyter_server-.tar.gz + CONFIGURE_COMMAND + BUILD_COMMAND + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} setup.py install ${PySetupOptions} + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh + BUILD_IN_SOURCE 1 + DEPENDS +) + #---jupyterlab------------------------------------------------------------------------------------------------------------- LCGPackage_Add( jupyterlab @@ -2308,7 +2321,7 @@ LCGPackage_Add( COMMAND ${PYTHON} setup.py install ${PySetupOptions} COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh BUILD_IN_SOURCE 1 - DEPENDS jupyterlab_server + DEPENDS jupyter_core jupyterlab_server jupyter_server ipython packaging tornado jinja2 DEPENDS_OPT node.js ) -- GitLab From 9636dfb64466dd508d57ff097217cdd3e6cfbae9 Mon Sep 17 00:00:00 2001 From: Ari Kraut Date: Sun, 18 Jul 2021 21:24:15 +0200 Subject: [PATCH 04/10] Typo --- cmake/toolchain/heptools-dev-base.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index 592a06ea9..61d29250d 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -283,7 +283,7 @@ LCG_external_package(jupyter_latex_envs 1.4.4 LCG_external_package(jupyter_nbextensions_configurator 0.4.1 ) LCG_external_package(jupyter_packaging 0.10.4 ) LCG_external_package(jupyterlab 3.0.16 ) -LCG_external_package(jupyterlab_server 2.6.1 +LCG_external_package(jupyterlab_server 2.6.1 ) LCG_external_package(jupyter_server 1.9.0 ) LCG_external_package(keras 2.4.3 ) LCG_external_package(keras_applications 1.0.8 ) -- GitLab From bb0a5f06f62b279cad1acbf3883643dc58902a37 Mon Sep 17 00:00:00 2001 From: Ari Kraut Date: Mon, 19 Jul 2021 13:35:02 +0200 Subject: [PATCH 05/10] added several deps and some packages --- cmake/toolchain/heptools-dev-base.cmake | 3 + pyexternals/CMakeLists.txt | 82 +++++++++++++++++++------ 2 files changed, 65 insertions(+), 20 deletions(-) diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index 61d29250d..ce86514eb 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -29,6 +29,7 @@ LCG_external_package(AIDA 3.2.1 LCG_external_package(alabaster 0.7.12 ) LCG_external_package(alpaka 0.5.0 ) LCG_external_package(ant 1.10.7 ) +LCG_external_package(anyio 3.2.1 ) LCG_external_package(appdirs 1.4.4 ) LCG_external_package(archspec 0.1.2 ) LCG_external_package(arrow 3.0.0 ) @@ -353,6 +354,7 @@ if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL slc6) # Tests fail LCG_external_package(mysql_connector_python 8.0.18 ) endif() LCG_external_package(nanomsg 1.1.5 ) +LCG_external_package(nbclassic 0.3.1 ) LCG_external_package(nbconvert 6.1.0 ) LCG_external_package(nbformat 5.1.3 ) LCG_external_package(netcdfc 4.7.0 ) @@ -531,6 +533,7 @@ LCG_external_package(singledispatch 3.4.0.3 LCG_external_package(sip 4.19.15 ) LCG_external_package(six 1.16.0 ) LCG_external_package(snappy 1.1.7 ) +LCG_external_package(sniffio 1.2.0 ) LCG_external_package(snowballstemmer 2.1.0 ) LCG_external_package(sollya 7.0 ) #LCG_external_package(soqt 1.5.0 ) diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt index a582317d3..6c5f7227d 100644 --- a/pyexternals/CMakeLists.txt +++ b/pyexternals/CMakeLists.txt @@ -2285,6 +2285,62 @@ LCGPackage_Add( DEPENDS Python setuptools ) +#---sniffio---------------------------------------------------------------------------------------------------------- +LCGPackage_Add( + sniffio + URL ${GenURL}/sniffio-.tar.gz + CONFIGURE_COMMAND + BUILD_COMMAND + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} setup.py install ${PySetupOptions} + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh + BUILD_IN_SOURCE 1 + DEPENDS Python +) + +#---anyio---------------------------------------------------------------------------------------------------------- +LCGPackage_Add( + anyio + URL ${GenURL}/anyio-.tar.gz + CONFIGURE_COMMAND + BUILD_COMMAND + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} setup.py install ${PySetupOptions} + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh + BUILD_IN_SOURCE 1 + DEPENDS Python idna sniffio pip +) + +#---websocket-client------------------------------------------------------------ +LCGPackage_Add( + websocket_client + URL ${GenURL}/websocket_client-${websocket_client_native_version}.tar.gz + CONFIGURE_COMMAND + BUILD_COMMAND + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} setup.py install ${PySetupOptions} + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh + BUILD_IN_SOURCE 1 + DEPENDS Python setuptools six + IF LCG_PYTHON_VERSION EQUAL 2 THEN backports ENDIF +) + +#---jupyter_server------------------------------------------------------------------------------------------------------------- +LCGPackage_Add( + jupyter_server + URL ${GenURL}/jupyter_server-.tar.gz + CONFIGURE_COMMAND + BUILD_COMMAND + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} setup.py install ${PySetupOptions} + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh + BUILD_IN_SOURCE 1 + DEPENDS anyio Jinja2 tornado pyzmq ipython_genutils traitlets jupyter_core + jupyter_client nbformat nbconvert send2trash terminado + prometheus_client websocket_client +#requests-unixsocket argon2-cffi anyio +) + #---jupyterlab_server------------------------------------------------------------------------------------------------------------- LCGPackage_Add( jupyterlab_server @@ -2295,20 +2351,20 @@ LCGPackage_Add( COMMAND ${PYTHON} setup.py install ${PySetupOptions} COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh BUILD_IN_SOURCE 1 - DEPENDS jupyter pyjson5 + DEPENDS jupyter_server pyjson5 babel jsonschema packaging requests ) -#---jupyter_server------------------------------------------------------------------------------------------------------------- +#---nbclassic---------------------------------------------------------------------------------------------------------- LCGPackage_Add( - jupyterlab - URL ${GenURL}/jupyter_server-.tar.gz + nbclassic + URL ${GenURL}/nbclassic-.tar.gz CONFIGURE_COMMAND BUILD_COMMAND INSTALL_COMMAND ${MakeSitePackagesDir} COMMAND ${PYTHON} setup.py install ${PySetupOptions} COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh BUILD_IN_SOURCE 1 - DEPENDS + DEPENDS jupyter_server notebook ) #---jupyterlab------------------------------------------------------------------------------------------------------------- @@ -2321,7 +2377,7 @@ LCGPackage_Add( COMMAND ${PYTHON} setup.py install ${PySetupOptions} COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh BUILD_IN_SOURCE 1 - DEPENDS jupyter_core jupyterlab_server jupyter_server ipython packaging tornado jinja2 + DEPENDS ipython packaging tornado jupyter_core jupyterlab_server jupyter_server nbclassic Jinja2 DEPENDS_OPT node.js ) @@ -3844,20 +3900,6 @@ LCGPackage_Add( DEPENDS Python setuptools pip wheel tensorboard tensorflow ) -#---websocket-client------------------------------------------------------------ -LCGPackage_Add( - websocket_client - URL ${GenURL}/websocket_client-${websocket_client_native_version}.tar.gz - CONFIGURE_COMMAND - BUILD_COMMAND - INSTALL_COMMAND ${MakeSitePackagesDir} - COMMAND ${PYTHON} setup.py install ${PySetupOptions} - COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh - BUILD_IN_SOURCE 1 - DEPENDS Python setuptools six - IF LCG_PYTHON_VERSION EQUAL 2 THEN backports ENDIF -) - #---kubernetes------------------------------------------------------------------ LCGPackage_Add( kubernetes -- GitLab From eed7aeef5adf32c83a4fdb5058b0705a4fc4ad32 Mon Sep 17 00:00:00 2001 From: Ari Kraut Date: Mon, 19 Jul 2021 13:54:16 +0200 Subject: [PATCH 06/10] Add pip as dep for sniffio --- pyexternals/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt index 6c5f7227d..e057fa215 100644 --- a/pyexternals/CMakeLists.txt +++ b/pyexternals/CMakeLists.txt @@ -2295,7 +2295,7 @@ LCGPackage_Add( COMMAND ${PYTHON} setup.py install ${PySetupOptions} COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh BUILD_IN_SOURCE 1 - DEPENDS Python + DEPENDS Python pip ) #---anyio---------------------------------------------------------------------------------------------------------- -- GitLab From d134cc3aa5331166a89bcffa5d59fe617cb3bdf5 Mon Sep 17 00:00:00 2001 From: akraut Date: Mon, 19 Jul 2021 17:12:46 +0200 Subject: [PATCH 07/10] Added more packages and deps --- cmake/toolchain/heptools-dev-base.cmake | 7 ++ pyexternals/CMakeLists.txt | 103 ++++++++++++++++++++++-- 2 files changed, 104 insertions(+), 6 deletions(-) diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index ce86514eb..72a2631a7 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -31,6 +31,7 @@ LCG_external_package(alpaka 0.5.0 LCG_external_package(ant 1.10.7 ) LCG_external_package(anyio 3.2.1 ) LCG_external_package(appdirs 1.4.4 ) +LCG_external_package(argon2_cffi 20.1.0 ) LCG_external_package(archspec 0.1.2 ) LCG_external_package(arrow 3.0.0 ) LCG_external_package(assimp 5.0.1 ) @@ -38,6 +39,7 @@ LCG_external_package(asn1crypto 0.24.0 LCG_external_package(astor 0.8.1 ) LCG_external_package(astroid 2.3.3 ) LCG_external_package(astunparse 1.6.3 ) +LCG_external_package(async_generator 1.10 ) LCG_external_package(atomicwrites 1.3.0 ) LCG_external_package(attrs 21.2.0 ) LCG_external_package(autoconf 2.69 ) @@ -110,6 +112,7 @@ LCG_external_package(dask 2021.4.1 if(NOT ${LCG_OS} STREQUAL mac) LCG_external_package(Davix 0.7.6 ) endif() +LCG_external_package(debugpy 1.3.0 ) LCG_external_package(decorator 5.0.9 ) LCG_external_package(defusedxml 0.7.1 ) LCG_external_package(delphes 3.4.3pre09 ) @@ -283,6 +286,7 @@ LCG_external_package(jupyter_highlight_selected_word 0.2.0 LCG_external_package(jupyter_latex_envs 1.4.4 ) LCG_external_package(jupyter_nbextensions_configurator 0.4.1 ) LCG_external_package(jupyter_packaging 0.10.4 ) +LCG_external_package(jupyterlab_pygments 0.1.2 ) LCG_external_package(jupyterlab 3.0.16 ) LCG_external_package(jupyterlab_server 2.6.1 ) LCG_external_package(jupyter_server 1.9.0 ) @@ -333,6 +337,7 @@ endif() LCG_external_package(markdown 3.1.1 ) LCG_external_package(MarkupSafe 2.0.1 ) LCG_external_package(matplotlib 3.3.4 ) +LCG_external_package(matplotlib_inline 0.1.2 ) LCG_external_package(maven 3.6.1 ) LCG_external_package(mccabe 0.6.1 ) LCG_external_package(messaging 1.1 ) @@ -355,8 +360,10 @@ if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL slc6) # Tests fail endif() LCG_external_package(nanomsg 1.1.5 ) LCG_external_package(nbclassic 0.3.1 ) +LCG_external_package(nbclient 0.5.3 ) LCG_external_package(nbconvert 6.1.0 ) LCG_external_package(nbformat 5.1.3 ) +LCG_external_package(nest_asyncio 1.5.1 ) LCG_external_package(netcdfc 4.7.0 ) LCG_external_package(networkx 2.5.1 ) #LCG_external_package(nghttp2 1.43.0 ) diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt index e057fa215..ba4b04edc 100644 --- a/pyexternals/CMakeLists.txt +++ b/pyexternals/CMakeLists.txt @@ -1930,6 +1930,32 @@ LCGPackage_Add( DEPENDS Python setuptools jupyter_core traitlets pyzmq python_dateutil tornado ) +#---debugpy------------------------------------------------------------------------------------------------------ +LCGPackage_Add( + debugpy + URL ${GenURL}/debugpy-${debugpy_native_version}.zip + CONFIGURE_COMMAND + BUILD_COMMAND + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} setup.py install ${PySetupOptions} + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh + BUILD_IN_SOURCE 1 + DEPENDS Python setuptools +) + +#---matplotlib_inline------------------------------------------------------------------------------------------------------ +LCGPackage_Add( + matplotlib_inline + URL ${GenURL}/matplotlib_inline-${matplotlib_inline_native_version}.tar.gz + CONFIGURE_COMMAND + BUILD_COMMAND + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} setup.py install ${PySetupOptions} + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh + BUILD_IN_SOURCE 1 + DEPENDS Python traitlets setuptools +) + #---ipykernel------------------------------------------------------------------------------------------------------ LCGPackage_Add( ipykernel @@ -1945,7 +1971,7 @@ LCGPackage_Add( COMMAND ${PYTHON} setup.py install ${PySetupOptions} COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh BUILD_IN_SOURCE 1 - DEPENDS Python setuptools ipython traitlets jupyter_client tornado six + DEPENDS Python debugpy ipython traitlets jupyter_client tornado matplotlib_inline ) @@ -2142,7 +2168,7 @@ LCGPackage_Add( COMMAND ${PYTHON} setup.py install ${PySetupOptions} COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh BUILD_IN_SOURCE 1 - DEPENDS Python setuptools html5lib six + DEPENDS Python setuptools html5lib six packaging ) #---pandocfilters------------------------------------------------------------------------------------------------------ @@ -2185,7 +2211,57 @@ LCGPackage_Add( DEPENDS Python setuptools libxml2 ) +#---jupyterlab_pygments------------------------------------------------------------------------------------------------------------ +LCGPackage_Add( + jupyterlab_pygments + URL ${GenURL}/jupyterlab_pygments-${jupyterlab_pygments_native_version}.tar.gz + CONFIGURE_COMMAND + BUILD_COMMAND + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} setup.py install ${PySetupOptions} + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh + BUILD_IN_SOURCE 1 + DEPENDS Python setuptools pygments +) + +#---async_generator------------------------------------------------------------------------------------------------------------ +LCGPackage_Add( + async_generator + URL ${GenURL}/async_generator-${async_generator_native_version}.tar.gz + CONFIGURE_COMMAND + BUILD_COMMAND + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} setup.py install ${PySetupOptions} + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh + BUILD_IN_SOURCE 1 + DEPENDS Python setuptools +) + +#---nest_asyncio------------------------------------------------------------------------------------------------------------ +LCGPackage_Add( + nest_asyncio + URL ${GenURL}/nest_asyncio-${nest_asyncio_native_version}.tar.gz + CONFIGURE_COMMAND + BUILD_COMMAND + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} setup.py install ${PySetupOptions} + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh + BUILD_IN_SOURCE 1 + DEPENDS Python setuptools +) +#---nbclient------------------------------------------------------------------------------------------------------------ +LCGPackage_Add( + nbclient + URL ${GenURL}/nbclient-${nbclient_native_version}.tar.gz + CONFIGURE_COMMAND + BUILD_COMMAND + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} setup.py install ${PySetupOptions} + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh + BUILD_IN_SOURCE 1 + DEPENDS Python setuptools traitlets jupyter_client nbformat async_generator nest_asyncio +) #---nbconvert----------------------------------------------------------------------------------------------------------- LCGPackage_Add( @@ -2200,7 +2276,21 @@ LCGPackage_Add( COMMAND ${PYTHON} setup.py install ${PySetupOptions} COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh BUILD_IN_SOURCE 1 - DEPENDS Python setuptools defusedxml entrypoints testpath pandocfilters bleach entrypoints mistune nbformat traitlets pygments Jinja2 jupyter_core + DEPENDS Python setuptools mistune Jinja2 pygments jupyterlab_pygments traitlets jupyter_core + nbformat entrypoints bleach pandocfilters testpath defusedxml nbclient +) + +#---argon2_cffi---------------------------------------------------------------------------------------------------------- +LCGPackage_Add( + argon2_cffi + URL ${GenURL}/argon2_cffi-.tar.gz + CONFIGURE_COMMAND + BUILD_COMMAND + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} setup.py install ${PySetupOptions} + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh + BUILD_IN_SOURCE 1 + DEPENDS Python pip cffi six ) #---notebook------------------------------------------------------------------------------------------------------ @@ -2213,7 +2303,8 @@ LCGPackage_Add( COMMAND ${PYTHON} setup.py install ${PySetupOptions} COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh BUILD_IN_SOURCE 1 - DEPENDS Python setuptools prometheus_client ipykernel nbformat tornado jupyter_client ipython_genutils send2trash traitlets nbconvert jupyter_core terminado Jinja2 ipaddress pyzmq + DEPENDS Python Jinja2 tornado pyzmq argon2_cffi ipython_genutils traitlets jupyter_core + jupyter_client nbformat nbconvert ipykernel send2trash terminado prometheus_client ) #---rise---------------------------------------------------------------------------------------------------------------- @@ -2337,8 +2428,8 @@ LCGPackage_Add( BUILD_IN_SOURCE 1 DEPENDS anyio Jinja2 tornado pyzmq ipython_genutils traitlets jupyter_core jupyter_client nbformat nbconvert send2trash terminado - prometheus_client websocket_client -#requests-unixsocket argon2-cffi anyio + prometheus_client websocket_client argon2_cffi +#requests-unixsocket ) #---jupyterlab_server------------------------------------------------------------------------------------------------------------- -- GitLab From 93665ea3f158eb46a29cf977b49c52d959f3eb89 Mon Sep 17 00:00:00 2001 From: akraut Date: Mon, 19 Jul 2021 19:46:48 +0200 Subject: [PATCH 08/10] Python2 compatability changes --- cmake/toolchain/heptools-python27.cmake | 12 ++++++++++++ pyexternals/CMakeLists.txt | 10 ++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/cmake/toolchain/heptools-python27.cmake b/cmake/toolchain/heptools-python27.cmake index 79ca01226..4edbba2ac 100644 --- a/cmake/toolchain/heptools-python27.cmake +++ b/cmake/toolchain/heptools-python27.cmake @@ -2,6 +2,7 @@ LCG_external_package(4suite 1.0.2p1 ) LCG_external_package(arrow 0.16.0 ) LCG_external_package(astroid 1.6.6p1 author=1.6.6 ) +LCG_external_package(decorator 4.3.2 ) LCG_external_package(cartopy 0.17.0 ) LCG_external_package(cffi 1.12.2 ) LCG_external_package(cloudpickle 1.2.1 ) @@ -19,9 +20,12 @@ LCG_external_package(hepdata_converter 0.1.35 ) LCG_external_package(hdf5 1.10.5 ) LCG_external_package(hypothesis 4.57.1 ) LCG_external_package(iminuit 1.3.6 ) +LCG_external_package(idna 2.8 ) LCG_external_package(ipython 5.8.0 ) LCG_external_package(ipykernel 4.10.0 ) LCG_external_package(ipympl 0.4.1 ) +LCG_external_package(jedi 0.13.3 ) +LCG_external_package(Jinja2 2.11.2 ) LCG_external_package(jsonschema 3.0.1 ) LCG_external_package(jupyter_client 5.2.4 ) LCG_external_package(jupyter_console 5.2.0 ) @@ -35,9 +39,12 @@ LCG_external_package(MarkupSafe 1.0 ) LCG_external_package(matplotlib 2.2.4 ) LCG_External_package(more_itertools 5.0.0 ) LCG_external_package(nbformat 4.4.0 ) +LCG_external_package(nbconvert 5.5.0 ) LCG_external_package(networkx 2.2 ) +LCG_external_package(notebook 5.7.8 ) LCG_external_package(numba 0.44.0 ) LCG_external_package(numpy 1.16.4 ) +LCG_external_package(parso 0.4.0 ) LCG_external_package(opt_einsum 2.3.2 ) LCG_external_package(pandas 0.24.2 ) LCG_external_package(pillow 6.2.2 ) @@ -52,6 +59,7 @@ endif() if(NOT ${LCG_OS} STREQUAL mac) LCG_external_package(PyHEADTAIL 1.13.1 ) endif() +LCG_external_package(pygments 2.4.2 ) LCG_external_package(PyJWT 1.7.1 ) LCG_external_package(pylint 1.9.4 ) LCG_external_package(pyproj 2.1.3 ) @@ -86,10 +94,12 @@ if(((${LCG_COMP} MATCHES gcc) AND (${LCG_COMPVERS} LESS 9)) OR (${LCG_COMP} MATC LCG_external_package(torch 1.3.0 ) LCG_external_package(torchvision 0.4.1 ) endif() +LCG_external_package(traitlets 4.3.2 ) LCG_external_package(typed_ast 1.4.0 ) LCG_external_package(typing 3.6.6 ) #---Not supported in Python 2--------------------------------------- +LCG_remove_package(async_generator) LCG_remove_package(jupyter_packaging) LCG_remove_package(jax) LCG_remove_package(jaxlib) @@ -101,6 +111,7 @@ LCG_remove_package(fsspec) LCG_remove_package(dask) LCG_remove_package(distributed) LCG_remove_package(mimesis) +LCG_remove_package(nbclient) LCG_remove_package(bokeh) LCG_remove_package(pygdal) LCG_remove_package(paramiko) @@ -130,5 +141,6 @@ LCG_remove_package(onnxruntime) LCG_remove_package(pyhf) LCG_remove_package(tensorboard_plugin_wit) LCG_remove_package(virtualenvwrapper) +LCG_remove_package(sniffio) LCG_remove_package(stevedore) LCG_remove_package(control) diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt index ba4b04edc..985a7dd29 100644 --- a/pyexternals/CMakeLists.txt +++ b/pyexternals/CMakeLists.txt @@ -1972,6 +1972,8 @@ LCGPackage_Add( COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh BUILD_IN_SOURCE 1 DEPENDS Python debugpy ipython traitlets jupyter_client tornado matplotlib_inline + #Python2 version deps + DEPENDS_OPT setuptools six ) @@ -2277,7 +2279,8 @@ LCGPackage_Add( COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh BUILD_IN_SOURCE 1 DEPENDS Python setuptools mistune Jinja2 pygments jupyterlab_pygments traitlets jupyter_core - nbformat entrypoints bleach pandocfilters testpath defusedxml nbclient + nbformat entrypoints bleach pandocfilters testpath defusedxml + DEPENDS_OPT nbclient ) #---argon2_cffi---------------------------------------------------------------------------------------------------------- @@ -2305,6 +2308,8 @@ LCGPackage_Add( BUILD_IN_SOURCE 1 DEPENDS Python Jinja2 tornado pyzmq argon2_cffi ipython_genutils traitlets jupyter_core jupyter_client nbformat nbconvert ipykernel send2trash terminado prometheus_client + #Python2 version deps: + DEPENDS_OPT ipaddress ) #---rise---------------------------------------------------------------------------------------------------------------- @@ -2399,7 +2404,8 @@ LCGPackage_Add( COMMAND ${PYTHON} setup.py install ${PySetupOptions} COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh BUILD_IN_SOURCE 1 - DEPENDS Python idna sniffio pip + DEPENDS Python idna pip + DEPENDS_OPT sniffio ) #---websocket-client------------------------------------------------------------ -- GitLab From c4dca6b3f7d40e41b374f81c63daa7cdd7c623e5 Mon Sep 17 00:00:00 2001 From: akraut Date: Mon, 19 Jul 2021 20:09:13 +0200 Subject: [PATCH 09/10] Add dep to sniffio --- pyexternals/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt index 985a7dd29..b7f8536b5 100644 --- a/pyexternals/CMakeLists.txt +++ b/pyexternals/CMakeLists.txt @@ -2391,7 +2391,7 @@ LCGPackage_Add( COMMAND ${PYTHON} setup.py install ${PySetupOptions} COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh BUILD_IN_SOURCE 1 - DEPENDS Python pip + DEPENDS Python pip setuptools ) #---anyio---------------------------------------------------------------------------------------------------------- -- GitLab From adcba1a9debba19dd6d8710db0f8f4a3a187d4d0 Mon Sep 17 00:00:00 2001 From: akraut Date: Mon, 19 Jul 2021 20:35:08 +0200 Subject: [PATCH 10/10] Add appnope for mac --- cmake/toolchain/heptools-dev-base.cmake | 3 +++ pyexternals/CMakeLists.txt | 19 ++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index 72a2631a7..311af435c 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -31,6 +31,9 @@ LCG_external_package(alpaka 0.5.0 LCG_external_package(ant 1.10.7 ) LCG_external_package(anyio 3.2.1 ) LCG_external_package(appdirs 1.4.4 ) +if(${LCG_OS} MATCHES mac) + LCG_external_package(appnope 0.1.2 ) +endif() LCG_external_package(argon2_cffi 20.1.0 ) LCG_external_package(archspec 0.1.2 ) LCG_external_package(arrow 3.0.0 ) diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt index b7f8536b5..44d484f63 100644 --- a/pyexternals/CMakeLists.txt +++ b/pyexternals/CMakeLists.txt @@ -1956,6 +1956,19 @@ LCGPackage_Add( DEPENDS Python traitlets setuptools ) +#---appnope------------------------------------------------------------------------------------------------------ +LCGPackage_Add( + appnope + URL ${GenURL}/appnope-${appnope_native_version}.tar.gz + CONFIGURE_COMMAND + BUILD_COMMAND + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} setup.py install ${PySetupOptions} + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh + BUILD_IN_SOURCE 1 + DEPENDS Python setuptools +) + #---ipykernel------------------------------------------------------------------------------------------------------ LCGPackage_Add( ipykernel @@ -1971,9 +1984,9 @@ LCGPackage_Add( COMMAND ${PYTHON} setup.py install ${PySetupOptions} COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh BUILD_IN_SOURCE 1 - DEPENDS Python debugpy ipython traitlets jupyter_client tornado matplotlib_inline - #Python2 version deps - DEPENDS_OPT setuptools six + DEPENDS Python debugpy ipython traitlets jupyter_client tornado matplotlib_inline + #Python2 version deps and appnope for mac + DEPENDS_OPT setuptools six appnope ) -- GitLab