diff --git a/.gitignore b/.gitignore index 43180ab..d2443a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1,2 @@ /xeus-0.23.1.tar.gz /xeus-0.23.2.tar.gz -/xeus-0.23.3.tar.gz -/xeus-0.23.5.tar.gz -/xeus-0.23.6.tar.gz -/xeus-0.23.8.tar.gz -/xeus-0.23.9.tar.gz -/xeus-0.23.14.tar.gz -/xeus-0.24.0.tar.gz -/xeus-0.24.1.tar.gz -/xeus-0.24.2.tar.gz -/xeus-0.24.3.tar.gz -/xeus-0.24.4.tar.gz -/xeus-0.25.0.tar.gz -/xeus-0.25.1.tar.gz -/xeus-0.25.3.tar.gz -/xeus-1.0.0.tar.gz -/xeus-1.0.1.tar.gz -/xeus-1.0.3.tar.gz -/xeus-1.0.4.tar.gz -/xeus-2.0.0.tar.gz -/xeus-3.0.5.tar.gz -/xeus-3.1.1.tar.gz -/xeus-3.1.3.tar.gz -/xeus-3.1.4.tar.gz -/xeus-3.1.5.tar.gz -/xeus-5.1.1.tar.gz -/xeus-5.2.3.tar.gz -/xeus-5.2.4.tar.gz -/xeus-5.2.6.tar.gz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index d11d5ba..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# See the documentation for more information: -# https://packit.dev/docs/configuration/ ---- -jobs: - - job: pull_from_upstream - trigger: release - dist_git_branches: - rawhide: - fast_forward_merge_into: - - fedora-branched - - job: koji_build - trigger: commit - dist_git_branches: - - fedora-all - - job: bodhi_update - trigger: commit - dist_git_branches: - - fedora-all diff --git a/0001-Don-t-set-_any_-options-if-DISABLE_ARCH_NATIVE-ON.patch b/0001-Don-t-set-_any_-options-if-DISABLE_ARCH_NATIVE-ON.patch new file mode 100644 index 0000000..389c248 --- /dev/null +++ b/0001-Don-t-set-_any_-options-if-DISABLE_ARCH_NATIVE-ON.patch @@ -0,0 +1,31 @@ +From c15a7b64d1ab035dbdf0f4fdb0bada91cc4495f8 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Sat, 7 Sep 2019 20:42:41 -0400 +Subject: [PATCH] Don't set _any_ options if DISABLE_ARCH_NATIVE=ON. + +On some platforms (e.g., s390x), even -mtune=generic is not allowed, so +just don't pass anything. + +Signed-off-by: Elliott Sales de Andrade +--- + CMakeLists.txt | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a331df6..9d54cf3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -236,9 +236,7 @@ macro(xeus_create_target target_name linkage output_name) + + target_compile_options(${target_name} PUBLIC -Wunused-parameter -Wextra -Wreorder) + +- if (DISABLE_ARCH_NATIVE) +- target_compile_options(${target_name} PUBLIC -mtune=generic) +- else () ++ if (NOT DISABLE_ARCH_NATIVE) + target_compile_options(${target_name} PUBLIC -march=native) + endif () + +-- +2.21.0 + diff --git a/184.patch b/184.patch new file mode 100644 index 0000000..2615a6b --- /dev/null +++ b/184.patch @@ -0,0 +1,37 @@ +From aba9b9899f38849f6ac6ad668c72083efd92e4c9 Mon Sep 17 00:00:00 2001 +From: Sylvain Corlay +Date: Thu, 5 Sep 2019 00:31:00 +0200 +Subject: [PATCH] Do not use MDC2 + +--- + CMakeLists.txt | 2 +- + src/xauthentication.cpp | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fb91263..a331df6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,7 +49,7 @@ message(STATUS "xeus binary version: v${XEUS_BINARY_VERSION}") + set(nlohmann_json_REQUIRED_VERSION 3.2.0) + set(xtl_REQUIRED_VERSION 0.5) + set(cppzmq_REQUIRED_VERSION 4.3.0) +-set(zeromq_REQUIRED_VERSION 4.2.3) ++set(zeromq_REQUIRED_VERSION 4.2.5) + + find_package(nlohmann_json ${nlohmann_json_REQUIRED_VERSION} REQUIRED) + find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED) +diff --git a/src/xauthentication.cpp b/src/xauthentication.cpp +index 8039fa9..ff95141 100644 +--- a/src/xauthentication.cpp ++++ b/src/xauthentication.cpp +@@ -108,7 +108,8 @@ namespace xeus + static const std::map schemes = { + {"hmac-md5", EVP_md5}, + {"hmac-sha1", EVP_sha1}, +- {"hmac-mdc2", EVP_mdc2}, ++ // MDC2 is disabled by default unless enable-mdc2 is specified ++ // {"hmac-mdc2", EVP_mdc2}, + {"hmac-ripemd160", EVP_ripemd160}, + #if OPENSSL_VERSION_NUMBER >= 0x10100000L + {"hmac-blake2b512", EVP_blake2b512}, diff --git a/README.packit b/README.packit deleted file mode 100644 index a901bca..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 1.12.0.post1.dev18+gc39b0e7d4. diff --git a/changelog b/changelog deleted file mode 100644 index 9dbe962..0000000 --- a/changelog +++ /dev/null @@ -1,78 +0,0 @@ -* Fri Jul 23 2021 Fedora Release Engineering - 1.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sun Jul 11 2021 Elliott Sales de Andrade - 1.0.3-1 -- Update to latest version (#1965198) -- Fix build with Sphinx 4 (#1977665) -- Remove unnecessary RPATH directories - -* Wed Feb 24 2021 Elliott Sales de Andrade - 1.0.1-1 -- Update to latest version (#1929422) - -* Sun Feb 07 2021 Elliott Sales de Andrade - 1.0.0-1 -- Update to latest version (#1919068) - -* Wed Jan 27 2021 Fedora Release Engineering - 0.25.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Dec 12 2020 Elliott Sales de Andrade - 0.25.3-1 -- Update to latest version (#1906253) - -* Sat Nov 28 2020 Elliott Sales de Andrade - 0.25.1-1 -- Update to latest version (#1900027) - -* Thu Nov 19 2020 Elliott Sales de Andrade - 0.25.0-1 -- Update to latest version (#1898255) - -* Mon Nov 09 2020 Elliott Sales de Andrade - 0.24.4-1 -- Update to latest version (#1896206) - -* Sun Nov 08 2020 Elliott Sales de Andrade - 0.24.3-1 -- Update to latest version (#1895579) - -* Tue Oct 06 2020 Elliott Sales de Andrade - 0.24.2-1 -- Update to latest version (#1884918) - -* Sat Aug 01 2020 Fedora Release Engineering - 0.24.1-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.24.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jun 26 2020 Elliott Sales de Andrade - 0.24.1-1 -- Update to latest version - -* Sat Jun 13 2020 Elliott Sales de Andrade - 0.24.0-1 -- Update to latest version - -* Mon May 18 2020 Elliott Sales de Andrade - 0.23.14-1 -- Update to latest version - -* Wed Mar 25 2020 Elliott Sales de Andrade - 0.23.9-1 -- Update to latest version - -* Sat Mar 14 2020 Elliott Sales de Andrade - 0.23.8-1 -- Update to latest version - -* Tue Mar 03 2020 Elliott Sales de Andrade - 0.23.6-1 -- Update to latest version - -* Fri Feb 14 2020 Elliott Sales de Andrade - 0.23.5-1 -- Update to latest version -- Re-enable build on armv7hl and ppc64le - -* Fri Jan 31 2020 Fedora Release Engineering - 0.23.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jan 09 2020 Elliott Sales de Andrade - 0.23.3-1 -- Update to latest version - -* Tue Sep 24 2019 Elliott Sales de Andrade - 0.23.2-2 -- rebuilt - -* Mon Sep 23 2019 Elliott Sales de Andrade - 0.23.2-1 -- Update to latest version - -* Sat Sep 07 2019 Elliott Sales de Andrade - 0.23.1-1 -- Initial package release diff --git a/fix-tests-cmake.patch b/fix-tests-cmake.patch new file mode 100644 index 0000000..d8ac7ca --- /dev/null +++ b/fix-tests-cmake.patch @@ -0,0 +1,162 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a331df6..228fb0b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -301,14 +301,14 @@ endif () + # Tests + # ===== + +-OPTION(BUILD_TESTS "xeus test suite" OFF) ++include(CTest) + OPTION(DOWNLOAD_GTEST "build gtest from downloaded sources" OFF) + + if(DOWNLOAD_GTEST OR GTEST_SRC_DIR) +- set(BUILD_TESTS ON) ++ set(BUILD_TESTING ON) + endif() + +-if(BUILD_TESTS) ++if(BUILD_TESTING) + add_subdirectory(test) + endif() + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 4061248..e04d98d 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -81,6 +81,9 @@ endif() + + find_package(Threads) + ++find_program(PYTEST ++ NAMES pytest-3 pytest py.test-3 py.test) ++ + include_directories(${GTEST_INCLUDE_DIRS}) + + set(XEUS_TESTS +@@ -115,23 +118,21 @@ foreach(filename IN LISTS XEUS_TESTS) + add_test(NAME ${targetname} COMMAND ${targetname}) + endforeach() + +-add_executable(test_xeus ${XEUS_TESTS} ${XEUS_HEADERS}) + if(DOWNLOAD_GTEST OR GTEST_SRC_DIR) +- add_dependencies(test_xeus gtest_main) +- + # https://github.com/QuantStack/xeus/pull/126 ++ # This should really just be post gtest and gtest_main targets, but CMake ++ # won't allow us to do that. So do it after the last test (which depends on ++ # those anyway.) + if (BUILD_SHARED_LIBS) + add_custom_command( +- TARGET test_xeus POST_BUILD ++ TARGET ${targetname} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy "$" "${CMAKE_CURRENT_BINARY_DIR}/") ++ + add_custom_command( +- TARGET test_xeus POST_BUILD ++ TARGET ${targetname} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy "$" "${CMAKE_CURRENT_BINARY_DIR}/") + endif () + endif() +-target_link_libraries(test_xeus ${xeus_TARGET} ${GTEST_BOTH_LIBRARIES} Threads::Threads ${nlohmann_json_TARGET}) +- +-add_custom_target(xtest COMMAND test_xeus DEPENDS test_xeus) + + # Test_kernel tests + # ================= +@@ -141,9 +142,9 @@ set(TEST_KERNEL_SOURCES + test_interpreter.hpp + main.cpp) + +-configure_file ( ++configure_file( + "${XEUS_TEST_DIR}/test_kernel/kernel.json.in" +- "${XEUS_TEST_DIR}/test_kernel/kernel.json" ++ "kernels/test_kernel/kernel.json" + ) + + add_executable(test_kernel ${TEST_KERNEL_SOURCES}) +@@ -153,12 +154,16 @@ target_compile_features(test_kernel PRIVATE cxx_std_11) + + set(CONNECTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/connection.json) + +-add_custom_command( +- TARGET test_kernel POST_BUILD +- COMMAND jupyter-kernelspec install "${XEUS_TEST_DIR}/test_kernel" --sys-prefix) +-add_custom_command( +- TARGET test_kernel POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy "${XEUS_TEST_DIR}/test_kernel.py" "${CMAKE_CURRENT_BINARY_DIR}/") ++configure_file( ++ "${XEUS_TEST_DIR}/test_kernel.py" ++ "${CMAKE_CURRENT_BINARY_DIR}/" ++ COPYONLY) ++ ++add_test(NAME test_kernel ++ COMMAND ${PYTEST} test_kernel.py) ++set_tests_properties(test_kernel ++ PROPERTIES ++ ENVIRONMENT "JUPYTER_PATH=${CMAKE_CURRENT_BINARY_DIR}") + + # Test_kernel_control tests + # ========================= +@@ -170,7 +175,7 @@ set(TEST_KERNEL_SPLIT_SOURCES + + configure_file( + "${XEUS_TEST_DIR}/test_kernel_control/kernel.json.in" +- "${XEUS_TEST_DIR}/test_kernel_control/kernel.json" ++ "kernels/test_kernel_control/kernel.json" + ) + + add_executable(test_kernel_control ${TEST_KERNEL_SPLIT_SOURCES}) +@@ -180,12 +185,16 @@ target_compile_features(test_kernel_control PRIVATE cxx_std_11) + + set(CONNECTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/connection.json) + +-add_custom_command( +- TARGET test_kernel_control POST_BUILD +- COMMAND jupyter-kernelspec install "${XEUS_TEST_DIR}/test_kernel_control" --sys-prefix) +-add_custom_command( +- TARGET test_kernel_control POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy "${XEUS_TEST_DIR}/test_kernel_control.py" "${CMAKE_CURRENT_BINARY_DIR}/") ++configure_file( ++ "${XEUS_TEST_DIR}/test_kernel_control.py" ++ "${CMAKE_CURRENT_BINARY_DIR}/" ++ COPYONLY) ++ ++add_test(NAME test_kernel_control ++ COMMAND ${PYTEST} test_kernel_control.py) ++set_tests_properties(test_kernel_control ++ PROPERTIES ++ ENVIRONMENT "JUPYTER_PATH=${CMAKE_CURRENT_BINARY_DIR}") + + # Test_kernel_shell tests + # ======================= +@@ -197,7 +206,7 @@ set(TEST_KERNEL_SPLIT_SOURCES + + configure_file( + "${XEUS_TEST_DIR}/test_kernel_shell/kernel.json.in" +- "${XEUS_TEST_DIR}/test_kernel_shell/kernel.json" ++ "kernels/test_kernel_shell/kernel.json" + ) + + add_executable(test_kernel_shell ${TEST_KERNEL_SPLIT_SOURCES}) +@@ -207,9 +216,13 @@ target_compile_features(test_kernel_shell PRIVATE cxx_std_11) + + set(CONNECTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/connection.json) + +-add_custom_command( +- TARGET test_kernel_shell POST_BUILD +- COMMAND jupyter-kernelspec install "${XEUS_TEST_DIR}/test_kernel_shell" --sys-prefix) +-add_custom_command( +- TARGET test_kernel_shell POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy "${XEUS_TEST_DIR}/test_kernel_shell.py" "${CMAKE_CURRENT_BINARY_DIR}/") ++configure_file( ++ "${XEUS_TEST_DIR}/test_kernel_shell.py" ++ "${CMAKE_CURRENT_BINARY_DIR}/" ++ COPYONLY) ++ ++add_test(NAME test_kernel_shell ++ COMMAND ${PYTEST} test_kernel_shell.py) ++set_tests_properties(test_kernel_shell ++ PROPERTIES ++ ENVIRONMENT "JUPYTER_PATH=${CMAKE_CURRENT_BINARY_DIR}") diff --git a/sources b/sources index 2d23942..1724683 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xeus-5.2.6.tar.gz) = f931ed1ba0122ee3855f4ce6bb3e30506a3fd56011c9594679baad7382372aa39e2088d1e84c6c730334e27c94080fc3b381073e987afd68186d64626abb32f6 +SHA512 (xeus-0.23.2.tar.gz) = c322503ae6686f79028717cfb5e2355dc8dc5a5395537f76d0d1803d1dd6cf664010b8e59d5c9be140324a6bb74c580857cef3f06010b66c623b253db0a3e7db diff --git a/xeus.spec b/xeus.spec index dcdfba4..7a767b9 100644 --- a/xeus.spec +++ b/xeus.spec @@ -1,23 +1,27 @@ Name: xeus -Version: 5.2.6 -Release: %autorelease +Version: 0.23.2 +Release: 1%{?dist} Summary: C++ implementation of the Jupyter kernel protocol -License: BSD-3-Clause -URL: https://github.com/jupyter-xeus/xeus -Source0: https://github.com/jupyter-xeus/xeus/archive/%{version}/%{name}-%{version}.tar.gz +License: BSD +URL: https://github.com/QuantStack/xeus +Source0: https://github.com/QuantStack/xeus/archive/%{version}/%{name}-%{version}.tar.gz -# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -ExcludeArch: %{ix86} +# xtl is broken on some arches. +# https://bugzilla.redhat.com/show_bug.cgi?id=1745840 +# https://bugzilla.redhat.com/show_bug.cgi?id=1745841 +ExcludeArch: armv7hl ppc64le BuildRequires: cmake >= 3.8 -BuildRequires: cmake(nlohmann_json) >= 3.11.0 -BuildRequires: doctest-devel +BuildRequires: cmake(cppzmq) >= 4.3.0 +BuildRequires: cmake(nlohmann_json) >= 3.2.0 +BuildRequires: cmake(xtl) >= 0.5 BuildRequires: doxygen BuildRequires: gcc-c++ +BuildRequires: gtest-devel BuildRequires: libuuid-devel -BuildRequires: make -BuildRequires: pkgconfig(uuid) +BuildRequires: openssl-devel >= 1.0.1 +BuildRequires: pkgconfig(libzmq) >= 4.2.5 BuildRequires: python3dist(breathe) BuildRequires: python3dist(jupyter-kernel-test) BuildRequires: python3dist(pytest) @@ -43,25 +47,27 @@ Development files for %{name} library. %build -%cmake -DXEUS_BUILD_STATIC_LIBS=OFF -DXEUS_DISABLE_ARCH_NATIVE=ON -DXEUS_BUILD_TESTS=ON -%cmake_build +mkdir build && cd build +%cmake -DBUILD_STATIC_LIBS=OFF -DDISABLE_ARCH_NATIVE=ON .. +%make_build -make -C docs SPHINXBUILD=sphinx-build-3 html -rm docs/build/html/.buildinfo +make -C ../docs SPHINXBUILD=sphinx-build-3 html BUILDDIR=${PWD} +rm html/.buildinfo %install -%cmake_install +%make_install -C build %check -%ctest +cd build +ctest -V %files -%doc README.md docs/build/html +%doc README.md build/html %license LICENSE -%{_libdir}/libxeus.so.13{,.*} +%{_libdir}/libxeus.so.1* %files devel %{_includedir}/xeus/ @@ -70,4 +76,8 @@ rm docs/build/html/.buildinfo %changelog -%autochangelog +* Mon Sep 23 2019 Elliott Sales de Andrade - 0.23.2-1 +- Update to latest version + +* Sat Sep 07 2019 Elliott Sales de Andrade - 0.23.1-1 +- Initial package release