March 2021 - openSUSE Commits - openSUSE Mailing Lists

commit bazel3.7 for openSUSE:Factory
by Source-Sync 30 Mar '21

30 Mar '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bazel3.7 for openSUSE:Factory checked in at 2021-03-30 21:03:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bazel3.7 (Old) and /work/SRC/openSUSE:Factory/.bazel3.7.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bazel3.7" Tue Mar 30 21:03:58 2021 rev:1 rq:871376 version:3.7.2 Changes: -------- New Changes file: --- /dev/null 2021-03-11 01:47:46.020784395 +0100 +++ /work/SRC/openSUSE:Factory/.bazel3.7.new.2401/bazel3.7.changes 2021-03-30 21:05:44.817070374 +0200 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Thu Feb 11 14:10:47 UTC 2021 - Micha�� Rostecki <mrostecki(a)suse.com> + +- Initial release New: ---- 0001-python-Always-use-python3.patch _constraints bazel-3.7.2-dist.zip bazel-3.7.2-dist.zip.sig bazel3.7.changes bazel3.7.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bazel3.7.spec ++++++ # # spec file for package bazel3.7 # # Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) %define shortname bazel %define shortver 3.7 #Workaround for s390x (Java 1.8 runs out of memory) %ifarch s390x %if 0%{?suse_version} > 1500 %define openjdktouse java-12-openjdk-devel %else %define openjdktouse java-11-openjdk-devel %endif %else %define openjdktouse java-1_8_0-openjdk-devel %endif Name: bazel%{shortver} Version: 3.7.2 Release: 0 Summary: Tool for the automation of building and testing of software License: Apache-2.0 Group: Development/Tools/Building URL: http://bazel.io/ Source0: https://github.com/bazelbuild/bazel/releases/download/%{version}/%{shortnam… Source1: https://github.com/bazelbuild/bazel/releases/download/%{version}/%{shortnam… Patch0: 0001-python-Always-use-python3.patch BuildRequires: gcc-c++ BuildRequires: java-1_8_0-openjdk-devel BuildRequires: pkgconfig BuildRequires: python3 BuildRequires: unzip BuildRequires: zip BuildRequires: pkgconfig(bash-completion) BuildRequires: pkgconfig(zlib) Requires(post): update-alternatives Requires(postun): update-alternatives Requires: %{openjdktouse} Provides: bazel = %{version} ExcludeArch: %ix86 %arm %description Tool for the automation of building and testing of software. It supports Java, C++ and Go as programing languages. It also has a support for Android and iOS as mobile operating systems. %prep %setup -q -c %patch0 -p1 # Remove executable permissions chmod 0644 AUTHORS CHANGELOG.md CONTRIBUTORS LICENSE # Use Python 3 find . -type f $ -name "*.py" -o -name "*.txt" $ -exec sed -i 's|#!.*python.*|#!/usr/bin/python3|' "{}" + find . -type f -name "*.java" -exec sed -i 's|#!/usr/bin/env python|#!/usr/bin/python3|' "{}" + # Fix collision between grpc's gettid and glibc's gettid #grep -R "env python" . find third_party/grpc -type f -name "*.cc" -exec sed -i -e 's|gettid(|my_gettid(|g' {} + %build %ifarch aarch64 %arm export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" %endif %ifarch s390x export BAZEL_JAVAC_OPTS="-J-Xmx4g -J-Xms1g" %endif CC=gcc CXX=g++ EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk" ./compile.sh ./scripts/generate_bash_completion.sh \ --bazel=output/bazel \ --output=output/bazel-complete.bash \ --prepend=scripts/bazel-complete-header.bash \ --prepend=scripts/bazel-complete-template.bash ./output/bazel shutdown %install export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define __debug_install_post %{nil} : >debugfiles.list : >debugsources.list : >debugsourcefiles.list install -Dm0755 output/bazel %{buildroot}%{_bindir}/bazel%{shortver} install -Dm0644 output/bazel-complete.bash %{buildroot}%{_datadir}/%{name}/bazel-complete.bash # update-alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives ln -sf %{_sysconfdir}/alternatives/bazel %{buildroot}%{_bindir}/bazel mkdir -p %{buildroot}%{_datadir}/bash-completion/completions ln -sf %{_sysconfdir}/alternatives/bazel-complete.bash %{buildroot}%{_datadir}/bash-completion/completions/bazel %post update-alternatives \ --install %{_bindir}/bazel bazel %{_bindir}/bazel%{shortver} 100 \ --slave %{_datadir}/bash-completion/completions/bazel \ bazel-complete.bash \ %{_datadir}/%{name}/bazel-complete.bash %postun if [ $1 -eq 0 ] ; then update-alternatives --remove bazel %{_bindir}/bazel%{shortver} fi %files %doc AUTHORS CHANGELOG.md CONTRIBUTORS %license LICENSE %{_bindir}/bazel %{_bindir}/bazel%{shortver} %{_datadir}/bash-completion/completions/bazel %dir %{_datadir}/%{name} %{_datadir}/%{name}/bazel-complete.bash %ghost %{_sysconfdir}/alternatives/bazel %ghost %{_sysconfdir}/alternatives/bazel-complete.bash %changelog ++++++ 0001-python-Always-use-python3.patch ++++++ From c351a9d86f705ce14e5b5e1393a3c46331f3920d Mon Sep 17 00:00:00 2001 From: Michal Rostecki <mrostecki(a)opensuse.org> Date: Mon, 20 Apr 2020 11:15:39 +0200 Subject: [PATCH] python: Always use python3 --- .../build/lib/bazel/rules/python/BazelPythonSemantics.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: bazel3.4-3.4.1/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java =================================================================== --- bazel3.4-3.4.1.orig/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java +++ bazel3.4-3.4.1/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java @@ -247,7 +247,7 @@ public class BazelPythonSemantics implem PathFragment shExecutable = ShToolchain.getPathOrError(ruleContext); // TODO(#8685): Remove this special-case handling as part of making the proper shebang a // property of the Python toolchain configuration. - String pythonExecutableName = OS.getCurrent() == OS.OPENBSD ? "python3" : "python"; + String pythonExecutableName = "python3"; // NOTE: keep the following line intact to support nix builds String pythonShebang = "#!/usr/bin/env " + pythonExecutableName; ruleContext.registerAction( ++++++ _constraints ++++++ <constraints> <hardware> <memory> <size unit="G">4</size> </memory> <disk> <size unit="G">4</size> </disk> </hardware> </constraints>

1 0

commit vulkan-validationlayers for openSUSE:Factory
by Source-Sync 30 Mar '21

30 Mar '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vulkan-validationlayers for openSUSE:Factory checked in at 2021-03-30 21:03:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vulkan-validationlayers (Old) and /work/SRC/openSUSE:Factory/.vulkan-validationlayers.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vulkan-validationlayers" Tue Mar 30 21:03:40 2021 rev:28 rq:875921 version:1.2.170.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vulkan-validationlayers/vulkan-validationlayers.changes 2021-02-04 20:24:38.466878051 +0100 +++ /work/SRC/openSUSE:Factory/.vulkan-validationlayers.new.2401/vulkan-validationlayers.changes 2021-03-30 21:03:48.212942270 +0200 @@ -1,0 +2,16 @@ +Sun Feb 28 17:03:21 UTC 2021 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release SDK-1.2.170.0 + * layers: Fix allowed stages for ACCELERATION_STRUCTURE_READ_BIT + * corechecks: Validate memory barriers attached to a subpass dep + * layers: Update ValidationStateTracker for synchronization2 + +------------------------------------------------------------------- +Wed Feb 10 14:05:39 UTC 2021 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 1.2.169 + * layers: Add VK_EXT_depth_range_unrestricted + * layers: Fix crash with null pWaitDstStageMask + * layers: Fix segfault when querying DRM format modifiers + +------------------------------------------------------------------- Old: ---- v1.2.166.tar.gz New: ---- sdk-1.2.170.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan-validationlayers.spec ++++++ --- /var/tmp/diff_new_pack.XqiFnP/_old 2021-03-30 21:03:48.956943088 +0200 +++ /var/tmp/diff_new_pack.XqiFnP/_new 2021-03-30 21:03:48.960943092 +0200 @@ -17,27 +17,27 @@ Name: vulkan-validationlayers -Version: 1.2.166 +Version: 1.2.170.0 Release: 0 -%define lname libVkLayer_utils-1_2_166 +%define lname libVkLayer_utils-1_2_170_0 Summary: Validation layers for Vulkan License: Apache-2.0 Group: Development/Tools/Other URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers -Source: https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/v%version.t… +Source: https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-%versio… Source9: %name-rpmlintrc Patch1: ver.diff Patch2: xxhash.diff BuildRequires: cmake >= 3.4 BuildRequires: gcc-c++ >= 4.8 -BuildRequires: glslang-devel >= 8.13.3727 +BuildRequires: glslang-devel >= 11 BuildRequires: pkg-config BuildRequires: python3-base -BuildRequires: spirv-headers -BuildRequires: spirv-tools-devel >= 2020.2 +BuildRequires: spirv-headers >= 1.5.4.g32 +BuildRequires: spirv-tools-devel >= 2020.7 BuildRequires: xxhash-devel -BuildRequires: pkgconfig(vulkan) >= 1.2.130 +BuildRequires: pkgconfig(vulkan) >= 1.2.161 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) Conflicts: vulkan < 1.1 @@ -69,7 +69,7 @@ This package contains support files for the VkLayer utility library. %prep -%autosetup -n Vulkan-ValidationLayers-%version -p1 +%autosetup -n Vulkan-ValidationLayers-sdk-%version -p1 perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt %build ++++++ ver.diff ++++++ --- /var/tmp/diff_new_pack.XqiFnP/_old 2021-03-30 21:03:48.988943123 +0200 +++ /var/tmp/diff_new_pack.XqiFnP/_new 2021-03-30 21:03:48.988943123 +0200 @@ -7,11 +7,11 @@ CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: Vulkan-ValidationLayers-1.2.148/CMakeLists.txt +Index: Vulkan-ValidationLayers-1.2.169/CMakeLists.txt =================================================================== ---- Vulkan-ValidationLayers-1.2.148.orig/CMakeLists.txt -+++ Vulkan-ValidationLayers-1.2.148/CMakeLists.txt -@@ -320,11 +320,12 @@ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/s +--- Vulkan-ValidationLayers-1.2.169.orig/CMakeLists.txt ++++ Vulkan-ValidationLayers-1.2.169/CMakeLists.txt +@@ -284,11 +284,12 @@ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/s # files directly in layers. add_library(VkLayer_utils @@ -23,5 +23,5 @@ layers/vk_format_utils.cpp) +set_target_properties(VkLayer_utils PROPERTIES OUTPUT_NAME "VkLayer_utils-@PACKAGE_VERSION@") target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers) + set_target_properties(VkLayer_utils PROPERTIES CXX_STANDARD ${VVL_CPP_STANDARD}) if(WIN32) - target_compile_definitions(VkLayer_utils PUBLIC _CRT_SECURE_NO_WARNINGS) ++++++ xxhash.diff ++++++ --- /var/tmp/diff_new_pack.XqiFnP/_old 2021-03-30 21:03:49.012943149 +0200 +++ /var/tmp/diff_new_pack.XqiFnP/_new 2021-03-30 21:03:49.012943149 +0200 @@ -10,10 +10,10 @@ layers/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -Index: Vulkan-ValidationLayers-1.2.165/layers/CMakeLists.txt +Index: Vulkan-ValidationLayers-1.2.169/layers/CMakeLists.txt =================================================================== ---- Vulkan-ValidationLayers-1.2.165.orig/layers/CMakeLists.txt -+++ Vulkan-ValidationLayers-1.2.165/layers/CMakeLists.txt +--- Vulkan-ValidationLayers-1.2.169.orig/layers/CMakeLists.txt ++++ Vulkan-ValidationLayers-1.2.169/layers/CMakeLists.txt @@ -61,8 +61,6 @@ if(BUILD_LAYER_SUPPORT_FILES) vk_layer_utils.h vk_layer_utils.cpp @@ -23,8 +23,8 @@ generated/vk_validation_error_messages.h generated/vk_layer_dispatch_table.h generated/vk_dispatch_table_helper.h -@@ -197,7 +195,7 @@ set(CORE_VALIDATION_LIBRARY_FILES - generated/spirv_validation_helper.cpp +@@ -203,7 +201,7 @@ set(CORE_VALIDATION_LIBRARY_FILES + generated/synchronization_validation_types.cpp gpu_validation.cpp generated/corechecks_optick_instrumentation.cpp - xxhash.c) @@ -32,7 +32,7 @@ set(OBJECT_LIFETIMES_LIBRARY_FILES generated/object_tracker.cpp -@@ -297,7 +295,7 @@ if(BUILD_LAYERS) +@@ -303,7 +301,7 @@ if(BUILD_LAYERS) if(INSTRUMENT_OPTICK) target_include_directories(VkLayer_khronos_validation PRIVATE ${OPTICK_SOURCE_DIR}) endif()

1 0

commit vulkan-tools for openSUSE:Factory
by Source-Sync 30 Mar '21

30 Mar '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vulkan-tools for openSUSE:Factory checked in at 2021-03-30 21:03:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vulkan-tools (Old) and /work/SRC/openSUSE:Factory/.vulkan-tools.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vulkan-tools" Tue Mar 30 21:03:28 2021 rev:28 rq:875920 version:1.2.170.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vulkan-tools/vulkan-tools.changes 2021-01-30 13:57:51.590406409 +0100 +++ /work/SRC/openSUSE:Factory/.vulkan-tools.new.2401/vulkan-tools.changes 2021-03-30 21:03:33.164925738 +0200 @@ -1,0 +2,12 @@ +Sun Feb 28 16:59:50 UTC 2021 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release SDK-1.2.170.0 + * No user-visible changes. + +------------------------------------------------------------------- +Wed Feb 10 14:03:46 UTC 2021 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 1.2.169 + * vkcube: Add options --width and --height + +------------------------------------------------------------------- Old: ---- v1.2.166.tar.gz New: ---- sdk-1.2.170.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan-tools.spec ++++++ --- /var/tmp/diff_new_pack.KJAHEM/_old 2021-03-30 21:03:33.904926550 +0200 +++ /var/tmp/diff_new_pack.KJAHEM/_new 2021-03-30 21:03:33.908926556 +0200 @@ -17,14 +17,14 @@ Name: vulkan-tools -Version: 1.2.166 +Version: 1.2.170.0 Release: 0 Summary: Diagnostic utilities for Vulkan License: Apache-2.0 Group: Development/Tools/Other URL: https://github.com/KhronosGroup/Vulkan-Tools -Source: https://github.com/KhronosGroup/Vulkan-Tools/archive/v%version.tar.gz +Source: https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-%version.tar.gz BuildRequires: cmake >= 3.4 BuildRequires: gcc-c++ >= 4.8 BuildRequires: glslang-devel @@ -44,7 +44,7 @@ This package contains the Khronos official Vulkan tools and utilities. %prep -%autosetup -p1 -n Vulkan-Tools-%version +%autosetup -p1 -n Vulkan-Tools-sdk-%version %build mkdir -p glslang/bin

1 0

commit spirv-cross for openSUSE:Factory
by Source-Sync 30 Mar '21

30 Mar '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package spirv-cross for openSUSE:Factory checked in at 2021-03-30 21:03:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spirv-cross (Old) and /work/SRC/openSUSE:Factory/.spirv-cross.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "spirv-cross" Tue Mar 30 21:03:12 2021 rev:7 rq:870910 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/spirv-cross/spirv-cross.changes 2020-07-08 19:12:48.531070711 +0200 +++ /work/SRC/openSUSE:Factory/.spirv-cross.new.2401/spirv-cross.changes 2021-03-30 21:03:21.740913187 +0200 @@ -1,0 +2,7 @@ +Fri Jan 15 13:10:46 UTC 2021 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 2020-01-25 + * GLSL: Support both SPV_KHR_ray_tracing and NV_ray_tracing. + * Support pull-model interpolation on MSL 2.3+. + +------------------------------------------------------------------- Old: ---- spirv-cross-2020-06-29.tar.gz New: ---- spirv-cross-2021-01-15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spirv-cross.spec ++++++ --- /var/tmp/diff_new_pack.m2DWfW/_old 2021-03-30 21:03:22.436913952 +0200 +++ /var/tmp/diff_new_pack.m2DWfW/_new 2021-03-30 21:03:22.440913957 +0200 @@ -1,7 +1,7 @@ # # spec file for package spirv-cross # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,22 +16,22 @@ # -%define _ver 2020-06-29 -%define _libver 0.35.0 +%define _ver 2021-01-15 +%define _libver 0.44.0 %define _sover 0 %define _libname libspirv-cross-c-shared %define _libpkg %{_libname}%{_sover} %define __builder ninja Name: spirv-cross -Version: 20200629 +Version: 20210115 Release: 0 Summary: Tool and library for SPIR-V reflection and disassembly -License: Apache-2.0 +License: Apache-2.0 OR MIT Group: Development/Libraries/C and C++ URL: https://github.com/KhronosGroup/SPIRV-Cross Source0: https://github.com/KhronosGroup/SPIRV-Cross/archive/%{_ver}.tar.gz#/%{name}… BuildRequires: c++_compiler -BuildRequires: cmake +BuildRequires: cmake >= 3 BuildRequires: ninja BuildRequires: pkgconfig @@ -70,7 +70,7 @@ converting SPIR-V to other shader languages. %prep -%setup -q -n SPIRV-Cross-%{_ver} +%autosetup -p1 -n SPIRV-Cross-%{_ver} sed -i 's,${CMAKE_INSTALL_PREFIX}/lib,%{_libdir},;s,/share/pkgconfig,/%{_lib}/pkgconfig,;s,DESTINATION lib,DESTINATION %{_lib},g' CMakeLists.txt %build ++++++ spirv-cross-2020-06-29.tar.gz -> spirv-cross-2021-01-15.tar.gz ++++++ ++++ 39623 lines of diff (skipped)

1 0

commit python-charset-normalizer for openSUSE:Factory
by Source-Sync 30 Mar '21

30 Mar '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-charset-normalizer for openSUSE:Factory checked in at 2021-03-30 21:03:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-charset-normalizer (Old) and /work/SRC/openSUSE:Factory/.python-charset-normalizer.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-charset-normalizer" Tue Mar 30 21:03:00 2021 rev:6 rq:870785 version:1.3.6 Changes: -------- --- /work/SRC/openSUSE:Factory/python-charset-normalizer/python-charset-normalizer.changes 2020-05-26 17:49:54.363957571 +0200 +++ /work/SRC/openSUSE:Factory/.python-charset-normalizer.new.2401/python-charset-normalizer.changes 2021-03-30 21:03:02.624892186 +0200 @@ -1,0 +2,12 @@ +Tue Feb 9 00:47:34 UTC 2021 - John Vandenberg <jayvdb(a)gmail.com> + +- Switch to PyPI source +- Add Suggests: python-unicodedata2 +- Remove executable bit from charset_normalizer/assets/frequencies.json +- Update to v1.3.6 + * Allow prettytable 2.0 +- from v1.3.5 + * Dependencies refactor and add support for py 3.9 and 3.10 + * Fix version parsing + +------------------------------------------------------------------- Old: ---- charset_normalizer-1.3.4.tar.gz New: ---- charset_normalizer-1.3.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-charset-normalizer.spec ++++++ --- /var/tmp/diff_new_pack.R1QEZf/_old 2021-03-30 21:03:03.280892907 +0200 +++ /var/tmp/diff_new_pack.R1QEZf/_new 2021-03-30 21:03:03.280892907 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-charset-normalizer # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,32 +19,33 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-charset-normalizer -Version: 1.3.4 +Version: 1.3.6 Release: 0 Summary: Python Universal Charset detector License: MIT URL: https://github.com/ousret/charset_normalizer -Source: https://github.com/Ousret/charset_normalizer/archive/%{version}.tar.gz#/cha… +Source: https://files.pythonhosted.org/packages/source/c/charset_normalizer/charset… BuildRequires: %{python_module setuptools} BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-PrettyTable -Requires: python-cached-property -Requires: python-dragonmapper -Requires: python-loguru +Requires: python-cached-property >= 1.5 +Requires: python-dragonmapper >= 0.2 +Requires: python-loguru >= 0.5 Requires: python-zhon Requires(post): update-alternatives Requires(postun): update-alternatives Suggests: python-requests Suggests: python-requests-html +Suggests: python-unicodedata2 BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module PrettyTable} -BuildRequires: %{python_module cached-property} -BuildRequires: %{python_module dragonmapper} -BuildRequires: %{python_module loguru} -BuildRequires: %{python_module pytest-runner} +BuildRequires: %{python_module cached-property >= 1.5} +BuildRequires: %{python_module dragonmapper >= 0.2} +BuildRequires: %{python_module loguru >= 0.5} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module zhon} # /SECTION %python_subpackages @@ -55,6 +56,7 @@ %prep %setup -q -n charset_normalizer-%{version} dos2unix README.md +chmod a-x charset_normalizer/assets/frequencies.json %build %python_build @@ -65,7 +67,7 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_exec setup.py pytest +%pytest %post %python_install_alternative normalizer ++++++ charset_normalizer-1.3.4.tar.gz -> charset_normalizer-1.3.6.tar.gz ++++++ ++++ 2253 lines of diff (skipped)

1 0

commit python-QtAwesome for openSUSE:Factory
by Source-Sync 30 Mar '21

30 Mar '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-QtAwesome for openSUSE:Factory checked in at 2021-03-30 21:02:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-QtAwesome (Old) and /work/SRC/openSUSE:Factory/.python-QtAwesome.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-QtAwesome" Tue Mar 30 21:02:49 2021 rev:8 rq:870784 version:1.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-QtAwesome/python-QtAwesome.changes 2020-07-28 17:26:28.297981883 +0200 +++ /work/SRC/openSUSE:Factory/.python-QtAwesome.new.2401/python-QtAwesome.changes 2021-03-30 21:02:52.388880941 +0200 @@ -1,0 +2,14 @@ +Tue Feb 9 16:02:00 UTC 2021 - Ben Greiner <code(a)bnavigator.de> + +- Update to 1.0.2 + * Perform a font id validation + * Add entries to the mdi charmap to be supported by Spyder + <= 4.1.5 (1.0.1) + * Update Material design icons to 5.4.55 (1.0.0) + * Drop Python 2 support (1.0.0) + * Fix deprecation warnings due to invalid escape sequences + (0.7.3) +- Use pytest-xvfb -- much more stable than the xvfb-run in sequence + for each python flavor + +------------------------------------------------------------------- Old: ---- QtAwesome-0.7.2.tar.gz New: ---- QtAwesome-1.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-QtAwesome.spec ++++++ --- /var/tmp/diff_new_pack.M4NruD/_old 2021-03-30 21:02:52.976881587 +0200 +++ /var/tmp/diff_new_pack.M4NruD/_new 2021-03-30 21:02:52.980881591 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-QtAwesome # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,9 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 Name: python-QtAwesome -Version: 0.7.2 +Version: 1.0.2 Release: 0 Summary: FontAwesome icons in PyQt and PySide applications License: MIT @@ -26,14 +27,14 @@ Source: https://files.pythonhosted.org/packages/source/Q/QtAwesome/QtAwesome-%{vers… BuildRequires: %{python_module QtPy} BuildRequires: %{python_module pytest-qt} +BuildRequires: %{python_module pytest-xvfb} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module six} +BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: xvfb-run Requires: python-QtPy -Requires: python-six BuildArch: noarch Requires(post): update-alternatives Requires(postun): update-alternatives @@ -48,6 +49,7 @@ %prep %setup -q -n QtAwesome-%{version} +dos2unix CHANGELOG.md %build %python_build @@ -58,7 +60,7 @@ %python_clone -a %{buildroot}%{_bindir}/qta-browser %check -%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} xvfb-run py.test-%{$python_bin_suffix} -v qtawesome/tests +%pytest -v qtawesome/tests %post %python_install_alternative qta-browser ++++++ QtAwesome-0.7.2.tar.gz -> QtAwesome-1.0.2.tar.gz ++++++ ++++ 21760 lines of diff (skipped)

1 0

commit python-imagecodecs for openSUSE:Factory
by Source-Sync 30 Mar '21

30 Mar '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-imagecodecs for openSUSE:Factory checked in at 2021-03-30 21:02:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-imagecodecs (Old) and /work/SRC/openSUSE:Factory/.python-imagecodecs.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-imagecodecs" Tue Mar 30 21:02:40 2021 rev:6 rq:878358 version:2021.2.26 Changes: -------- --- /work/SRC/openSUSE:Factory/python-imagecodecs/python-imagecodecs.changes 2020-09-04 11:02:03.754718202 +0200 +++ /work/SRC/openSUSE:Factory/.python-imagecodecs.new.2401/python-imagecodecs.changes 2021-03-30 21:02:44.800872604 +0200 @@ -1,0 +2,48 @@ +Wed Mar 10 10:42:55 UTC 2021 - Ben Greiner <code(a)bnavigator.de> + +- Update to version 2021.2.26 + Pass 4915 tests. Support X2 and X4 floating point predictors + (found in DNG). +- enable additional codecs through imagecodecs_distributor_setup.py +- Add imagecodecs-pr15-test_jpegls.patch + gh#cgohlke/imagecodecs#15 +- disable builds for big-endian platforms as per upstream README + +------------------------------------------------------------------- +Mon Feb 1 19:40:15 UTC 2021 - Ben Greiner <code(a)bnavigator.de> + +- Update to version 2021.1.28 + * Add option to return JPEG XR fixed point pixel types as + integers + * Add LJPEG codec via liblj92 (alternative to JPEGSOF3 codec) + * Change zopfli header location. +- refresh always-cythonize.patch +- drop zopfli-headers.patch fixed upstream +- Add more testing requirements to test backends +- Add skip reporting to pytest to see what is still missing + +------------------------------------------------------------------- +Tue Jan 12 21:54:10 UTC 2021 - andy great <andythe_great(a)pm.me> + +- Update to version 2021.1.11. + * Fix build issues (#7, #8). + * Return bytearray instead of bytes on PyPy. + * Raise TypeError if output provided is bytes (breaking). +- Updates for version 2021.1.8 + * Add float24 codec. + * Update copyrights. +- Updates for version 2020.12.24 + * Update dependencies and build scripts. +- Updates for version 2020.12.22 + * Add AVIF codec via libavif (WIP). + * Add DEFLATE/Zlib and GZIP codecs via libdeflate. + * Add LZ4F codec. + * Add high compression mode option to lz4_encode. + * Convert JPEG XR 16 and 32-bit fixed point pixel types to float32. + * Fix JPEG 2000 lossy encoding. + * Fix GIF disposal handling. + * Remove support for Python 3.6 (NEP 29). +- Rebase always-cythonize.patch +- Rebase zopfli-headers.patch + +------------------------------------------------------------------- Old: ---- imagecodecs-2020.5.30.tar.gz zopfli-headers.patch New: ---- imagecodecs-2021.2.26.tar.gz imagecodecs-pr15-test_jpegls.patch imagecodecs_distributor_setup.py ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-imagecodecs.spec ++++++ --- /var/tmp/diff_new_pack.X3xBcv/_old 2021-03-30 21:02:45.616873500 +0200 +++ /var/tmp/diff_new_pack.X3xBcv/_new 2021-03-30 21:02:45.620873506 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-imagecodecs # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,20 +26,24 @@ %bcond_with test %endif %define skip_python2 1 +%define skip_python36 1 Name: python-imagecodecs%{psuffix} -Version: 2020.5.30 +Version: 2021.2.26 Release: 0 Summary: Image transformation, compression, and decompression codecs License: BSD-3-Clause -URL: https://www.lfd.uci.edu/~gohlke/ +URL: https://github.com/cgohlke/imagecodecs/ Source: https://files.pythonhosted.org/packages/source/i/imagecodecs/imagecodecs-%{… +Source1: imagecodecs_distributor_setup.py Patch0: always-cythonize.patch -Patch1: zopfli-headers.patch +# PATCH-FIX-UPSTREAM imagecodecs-pr15-test_jpegls.patch -- gh#cgohlke/imagecodecs#15 +Patch1: https://github.com/cgohlke/imagecodecs/pull/15.patch#/imagecodecs-pr15-test… BuildRequires: %{python_module Cython >= 0.29.19} BuildRequires: %{python_module numpy-devel >= 1.15.1} BuildRequires: %{python_module setuptools >= 18.0} BuildRequires: dos2unix BuildRequires: fdupes +BuildRequires: python-rpm-macros Requires: python-numpy >= 1.15.1 Requires(post): update-alternatives Requires(postun): update-alternatives @@ -50,27 +54,40 @@ Recommends: python-tifffile >= 2020.5.25 Recommends: python-zstd %if %{with test} +BuildRequires: %{python_module Brotli} BuildRequires: %{python_module Pillow} BuildRequires: %{python_module blosc} +BuildRequires: %{python_module czifile} BuildRequires: %{python_module imagecodecs >= %{version}} BuildRequires: %{python_module lz4} BuildRequires: %{python_module matplotlib >= 3.1} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module python-snappy} BuildRequires: %{python_module scikit-image} BuildRequires: %{python_module tifffile >= 2020.5.25} BuildRequires: %{python_module zstd} +# libraries and python modules not (yet) available: +#BuildRequires: %%{python_module bitshuffle} +#BuildRequires: %%{python_module lzf} +# The zopfli library is linked. User can pip install zopflipy, if needed. +#BuildRequires: %%{python_module zopflipy} %else +BuildRequires: CharLS-devel +BuildRequires: dav1d-devel BuildRequires: gcc-c++ BuildRequires: giflib-devel BuildRequires: jxrlib-devel BuildRequires: libaec-devel +BuildRequires: libaom-devel +BuildRequires: libdeflate-devel BuildRequires: libzopfli-devel BuildRequires: pkgconfig -BuildRequires: python-rpm-macros +BuildRequires: rav1e-devel BuildRequires: snappy-devel BuildRequires: pkgconfig(blosc) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libavif) BuildRequires: pkgconfig(libbrotlicommon) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(liblz4) @@ -81,7 +98,13 @@ BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(zlib) +%ifnarch %ix86 %arm +# zfp is 64 bit only. Note that upstream deprecated 32-bit as a whole +BuildRequires: zfp-devel %endif +%endif +# Upstream: big endian is not supported +ExcludeArch: s390x ppc64 %python_subpackages %description @@ -89,20 +112,27 @@ transformation, compression, and decompression functions for use in the tifffile, czifile, and other scientific imaging modules. -Decode and/or encode functions are currently implemented for Zlib DEFLATE, -ZStandard, Blosc, LZMA, BZ2, LZ4, LZW, LZF, ZFP, NPY, PNG, WebP, JPEG 8-bit, -JPEG 12-bit, JPEG SOF3, JPEG LS, JPEG 2000, JPEG XR, PackBits, Packed Integers, -Delta, XOR Delta, Floating Point Predictor, and Bitorder reversal. +Decode and/or encode functions are implemented for Zlib (DEFLATE), GZIP, +ZStandard (ZSTD), Blosc, Brotli, Snappy, LZMA, BZ2, LZ4, LZ4F, LZ4HC, LZW, LZF, +ZFP, AEC, LERC, NPY, PNG, GIF, TIFF, WebP, JPEG 8-bit, JPEG 12-bit, Lossless +JPEG (LJPEG, SOF3), JPEG 2000, JPEG LS, JPEG XR, JPEG XL, AVIF, PackBits, Packed +Integers, Delta, XOR Delta, Floating Point Predictor, Bitorder reversal, +Bitshuffle, and Float24 (24-bit floating point). %prep %setup -q -n imagecodecs-%{version} +# the patch from github requires unix line endings to apply +dos2unix tests/test_imagecodecs.py %autopatch -p1 - +cp %SOURCE1 ./ dos2unix README.rst +# https://github.com/cgohlke/imagecodecs/pull/15#issuecomment-795744838 +ldd %{_libdir}/libblosc.so.1 | grep -q libsnappy && sed -i "s/if not IS_CG and compressor == 'snappy'/if False/" tests/test_imagecodecs.py %build %if !%{with test} export CFLAGS="%{optflags}" +export INCDIR="%{_includedir}" %python_build %endif @@ -117,11 +147,9 @@ %check %if %{with test} -mv imagecodecs __imagecodecs # Should add --doctest-modules %%{buildroot}%%{$python_sitearch}/imagecodecs/imagecodecs.py # however doctests are currently broken -%pytest_arch tests -mv __imagecodecs imagecodecs +%pytest_arch tests -rs --import-mode append %endif %if !%{with test} @@ -135,7 +163,8 @@ %license LICENSE imagecodecs/licenses/* %doc README.rst %python_alternative %{_bindir}/imagecodecs -%{python_sitearch}/* +%{python_sitearch}/imagecodecs-%{version}*-info +%{python_sitearch}/imagecodecs %endif %changelog ++++++ always-cythonize.patch ++++++ --- /var/tmp/diff_new_pack.X3xBcv/_old 2021-03-30 21:02:45.660873549 +0200 +++ /var/tmp/diff_new_pack.X3xBcv/_new 2021-03-30 21:02:45.660873549 +0200 @@ -1,12 +1,12 @@ -Index: imagecodecs-2020.5.30/setup.py +Index: imagecodecs-2021.1.28/setup.py =================================================================== ---- imagecodecs-2020.5.30.orig/setup.py -+++ imagecodecs-2020.5.30/setup.py -@@ -71,7 +71,7 @@ if 'sdist' in sys.argv: +--- imagecodecs-2021.1.28.orig/setup.py ++++ imagecodecs-2021.1.28/setup.py +@@ -105,7 +105,7 @@ def ext(**kwargs): OPTIONS = { -- 'cythonize': sys.version_info >= (3, 10), +- 'cythonize': sys.version_info >= (3, 10) or 'PyPy' in sys.version, + 'cythonize': True, 'include_dirs': ['imagecodecs'], 'library_dirs': [], ++++++ imagecodecs-2020.5.30.tar.gz -> imagecodecs-2021.2.26.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-imagecodecs/imagecodecs-2020.5.30.tar.gz /work/SRC/openSUSE:Factory/.python-imagecodecs.new.2401/imagecodecs-2021.2.26.tar.gz differ: char 5, line 1 ++++++ imagecodecs-pr15-test_jpegls.patch ++++++ From b14af25da949b88fb09339fd84ac97e67aa9109f Mon Sep 17 00:00:00 2001 From: Ben Greiner <code(a)bnavigator.de> Date: Wed, 10 Mar 2021 13:22:50 +0100 Subject: [PATCH] Check if JPEGLS is present when testing that codec --- tests/test_imagecodecs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_imagecodecs.py b/tests/test_imagecodecs.py index a057e15..c70a155 100644 --- a/tests/test_imagecodecs.py +++ b/tests/test_imagecodecs.py @@ -1535,7 +1535,7 @@ def test_jpeg2k_ycbc(): assert tuple(decoded[-1, -1]) == (0, 0, 0) -(a)pytest.mark.skipif(not imagecodecs.JPEGXL, reason='jpegls missing') +(a)pytest.mark.skipif(not imagecodecs.JPEGLS, reason='jpegls missing') @pytest.mark.parametrize('output', ['new', 'out', 'bytearray']) def test_jpegls_decode(output): """Test JPEG LS decoder with RGBA32 image.""" @@ -1889,7 +1889,7 @@ def encode(data, *args, **kwargs): ) elif codec == 'jpegls': - if not imagecodecs.JPEGXL: + if not imagecodecs.JPEGLS: pytest.skip(f'{codec} missing') if itype in ('view', 'graya') or deout == 'view': pytest.xfail('jpegls does not support this case') ++++++ imagecodecs_distributor_setup.py ++++++ # openSUSE extension setup to build python-imagecodecs import os import subprocess import sys def customize_build(EXTENSIONS, OPTIONS): includedir = os.getenv("INCDIR",'') + '/' del EXTENSIONS['jpeg12'] # jpeg12 requires custom build del EXTENSIONS['lerc'] # LERC library not available del EXTENSIONS['lz4f'] # requires static linking del EXTENSIONS['jpegxl'] # Brunsli library not available EXTENSIONS['avif']['libraries'] = [ 'avif', 'aom', 'dav1d', 'rav1e', ] # no zfp on 32-bit platforms if sys.maxsize < 2**63 - 1: del EXTENSIONS['zfp'] openjpeg_inc = subprocess.check_output( ['pkgconf', '--variable=includedir', 'libopenjp2'], text=True, ).strip() EXTENSIONS['jpeg2k']['include_dirs'].append(openjpeg_inc) EXTENSIONS['jpegxr']['include_dirs'].append(includedir + 'jxrlib') EXTENSIONS['zopfli']['include_dirs'].append(includedir + 'zopfli')

1 0

commit virt-p2v for openSUSE:Factory
by Source-Sync 30 Mar '21

30 Mar '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package virt-p2v for openSUSE:Factory checked in at 2021-03-30 21:02:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-p2v (Old) and /work/SRC/openSUSE:Factory/.virt-p2v.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-p2v" Tue Mar 30 21:02:29 2021 rev:1 rq:871274 version:1.42.0 Changes: -------- New Changes file: --- /dev/null 2021-03-11 01:47:46.020784395 +0100 +++ /work/SRC/openSUSE:Factory/.virt-p2v.new.2401/virt-p2v.changes 2021-03-30 21:02:33.732860445 +0200 @@ -0,0 +1,11 @@ +------------------------------------------------------------------- +Wed Feb 10 22:47:57 UTC 2021 - Jan Engelhardt <jengelh(a)inai.de> + +- Remove old specfile macros and constructs. +- Use noun phrase for summary. + +------------------------------------------------------------------- +Tue May 5 15:26:44 MDT 2020 - carnold(a)suse.com + +- Initial package of virt-p2v version 1.42.0 + New: ---- virt-p2v-1.42.0.tar.gz virt-p2v.changes virt-p2v.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-p2v.spec ++++++ # # spec file for package virt-p2v # # Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # needsbinariesforbuild # If we should verify tarball signature with GPGv2. Name: virt-p2v Version: 1.42.0 Release: 2 Summary: Tools to convert a physical machine to run on KVM URL: http://libguestfs.org/ License: GPL-2.0+ Group: System/Management # virt-p2v works only on x86_64 at the moment. It requires porting # to properly detect the hardware on other architectures, and furthermore # virt-v2v requires porting too. ExclusiveArch: x86_64 # Source and patches. Source0: http://download.libguestfs.org/%{name}/%{name}-%{version}.tar.gz # Basic build requirements. BuildRequires: gcc BuildRequires: perl(Pod::Simple) BuildRequires: perl(Pod::Man) BuildRequires: perl(List::MoreUtils) ####BuildRequires: /usr/bin/pod2text BuildRequires: libxml2-devel BuildRequires: pcre-devel BuildRequires: pkgconfig(bash-completion) >= 2.0 BuildRequires: xz BuildRequires: gtk3-devel #BuildRequires: dbus-devel BuildRequires: pkgconfig(dbus-1) BuildRequires: m4 # Test suite requirements. ####BuildRequires: /usr/bin/qemu-nbd BuildRequires: qemu-tools # https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_gran… Provides: bundled(gnulib) Requires: /usr/bin/gawk Requires: /usr/bin/gzip # virt-p2v-make-disk runs virt-builder: Requires: guestfs-tools >= 1.42 # virt-p2v-make-kickstart runs strip: Requires: binutils # Migrate from the old virt-p2v-maker: ####Provides: virt-p2v-maker = 1:%{version}-%{release} ####Obsoletes: virt-p2v-maker < 1:1.41.5 # The bash completion for p2v were shipped with the others of libguestfs: ####Obsoletes: libguestfs-bash-completion < 1:1.41.5 %description Virt-p2v converts (virtualizes) physical machines so they can be run as virtual machines under KVM. This package contains the tools needed to make a virt-p2v boot CD or USB disk image which is booted on the physical machine to perform the conversion. You also need virt-v2v installed somewhere else to complete the conversion. To convert virtual machines from other hypervisors, see virt-v2v. %prep %autosetup -p1 %build %configure \ --disable-gnulib-tests %make_build #%check # #if ! make check; then # cat test-suite.log # exit 1 #fi %install %make_install # Delete the development man pages. rm %{buildroot}/%{_mandir}/man1/p2v-building.1* \ %{buildroot}/%{_mandir}/man1/p2v-hacking.1* \ %{buildroot}/%{_mandir}/man1/p2v-release-notes.1* %files %doc README %license COPYING %{_bindir}/virt-p2v-make-disk %{_bindir}/virt-p2v-make-kickstart %{_bindir}/virt-p2v-make-kiwi %{_datadir}/bash-completion/completions/virt-* %{_datadir}/virt-p2v %{_libdir}/virt-p2v %{_mandir}/man1/virt-p2v-make-disk.1* %{_mandir}/man1/virt-p2v-make-kickstart.1* %{_mandir}/man1/virt-p2v-make-kiwi.1* %{_mandir}/man1/virt-p2v.1* %changelog

1 0

commit virt-v2v for openSUSE:Factory
by Source-Sync 30 Mar '21

30 Mar '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package virt-v2v for openSUSE:Factory checked in at 2021-03-30 21:02:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-v2v (Old) and /work/SRC/openSUSE:Factory/.virt-v2v.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-v2v" Tue Mar 30 21:02:10 2021 rev:1 rq:871027 version:1.43.3 Changes: -------- New Changes file: --- /dev/null 2021-03-11 01:47:46.020784395 +0100 +++ /work/SRC/openSUSE:Factory/.virt-v2v.new.2401/virt-v2v.changes 2021-03-30 21:02:23.228848905 +0200 @@ -0,0 +1,47 @@ +------------------------------------------------------------------- +Wed Feb 10 22:47:57 UTC 2021 - Jan Engelhardt <jengelh(a)inai.de> + +- Remove old specfile macros and constructs. + +------------------------------------------------------------------- +Thu Jan 28 15:20:40 MST 2021 - carnold(a)suse.com + +- Update to version 1.43.3 + * Support for ALT Linux 9 and up added + * Many upstream bug fixes + * Language file fixes and updates + +------------------------------------------------------------------- +Thu Oct 1 07:16:12 UTC 2020 - Predrag Ivanovi�� <predivan(a)mts.rs> + +- Fix rpmbuild 'directories not owned by package' error on Leap +- Fix Requires referencing wrong/non-existing packages + +------------------------------------------------------------------- +Mon Jul 20 19:53:29 MDT 2020 - carnold(a)suse.com + +- Update to version 1.43.1 + * Several bug fixes +- Drop fix-redefinition-error.patch + +------------------------------------------------------------------- +Tue May 5 14:48:39 MDT 2020 - carnold(a)suse.com + +- Fix error: redefinition of 'glib_autoptr_clear_OsinfoList' + fix-redefinition-error.patch + +------------------------------------------------------------------- +Wed Apr 22 16:10:29 MDT 2020 - carnold(a)suse.com + +- Initial package of virt-v2v version 1.42.0 + * The rhv-upload output mode of virt-v2v is not listed as output + driver, as virt-p2v does not provide all the GUI elements to + properly use it + * Virt-v2v is checked as requirement for the functional tests, + in addition to guestfish, and virt-customize + * Virt-p2v-make-disk now sets p2v.local as hostname in the + generated disk image + * Document p2v as initial password for the root user on the disk + image generated by virt-p2v-make-disk, virt-p2v-make-kickstart, + and virt-p2v-make-kiwi + New: ---- virt-v2v-1.43.3.tar.gz virt-v2v.changes virt-v2v.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-v2v.spec ++++++ # # spec file for package virt-v2v # # Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # needsbinariesforbuild # If there are patches which touch autotools files, set this to 1. %global patches_touch_autotools %{nil} # The source directory. %global source_directory 1.43-development Name: virt-v2v Version: 1.43.3 Release: 1 Summary: Tools to convert a virtual machine to run on KVM URL: https://github.com/libguestfs/virt-v2v License: GPL-2.0+ Group: System/Management Source0: http://download.libguestfs.org/virt-v2v/%{source_directory}/%{name}-%{versi… # libguestfs hasn't been built on i686 for a while since there is no # kernel built for this architecture any longer and libguestfs rather # fundamentally depends on the kernel. Therefore we must exclude this # arch. Note there is no bug filed for this because we do not ever # expect that libguestfs or virt-v2v will be available on i686 so # there is nothing that needs fixing. ExcludeArch: %{ix86} %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif #BuildRequires: /usr/bin/pod2man BuildRequires: gcc BuildRequires: ocaml >= 4.01 BuildRequires: libguestfs-devel >= 1.42 BuildRequires: augeas-devel BuildRequires: pkgconfig(bash-completion) >= 2.0 BuildRequires: file-devel BuildRequires: gettext-devel BuildRequires: glib2-devel BuildRequires: libjansson-devel BuildRequires: libosinfo-devel BuildRequires: libvirt-devel BuildRequires: libxml2-devel BuildRequires: mkisofs BuildRequires: pcre-devel BuildRequires: perl(Sys::Guestfs) BuildRequires: po4a BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-fileutils-devel BuildRequires: ocaml-gettext-devel BuildRequires: ocaml-gettext-stub-devel BuildRequires: ocaml-hivex-devel BuildRequires: ocaml-libguestfs BuildRequires: ocaml-libguestfs-devel BuildRequires: ocaml-libvirt-devel BuildRequires: ocaml-ounit-devel Requires: libguestfs0%{?_isa} >= 1.42 Requires: guestfs-tools >= 1.42 Requires: /usr/bin/gawk Requires: /usr/bin/gzip Requires: unzip Requires: curl Requires: /usr/bin/virsh Recommends: nbdkit Recommends: nbdkit-curl-plugin Recommends: nbdkit-python-plugin Recommends: nbdkit-ssh-plugin Recommends: nbdkit-vddk-plugin %description Virt-v2v converts a single guest from a foreign hypervisor to run on KVM. It can read Linux and Windows guests running on VMware, Xen, Hyper-V and some other hypervisors, and convert them to KVM managed by libvirt, OpenStack, oVirt, Red Hat Virtualisation (RHV) or several other targets. It can modify the guest to make it bootable on KVM and install virtio drivers so it will run quickly. %package bash-completion Summary: Bash tab-completion for %{name} BuildArch: noarch Requires: bash-completion >= 2.0 Requires: %{name} = %{version}-%{release} Supplements: (%{name} and bash-completion) %description bash-completion Install this package if you want intelligent bash tab-completion for %{name}. %package man-pages-ja Summary: Japanese (ja) man pages for %{name} BuildArch: noarch Requires: %{name} = %{version}-%{release} %description man-pages-ja %{name}-man-pages-ja contains Japanese (ja) man pages for %{name}. %package man-pages-uk Summary: Ukrainian (uk) man pages for %{name} BuildArch: noarch Requires: %{name} = %{version}-%{release} %description man-pages-uk %{name}-man-pages-uk contains Ukrainian (uk) man pages for %{name}. %prep %autosetup -p1 %if 0%{patches_touch_autotools} autoreconf -i %endif %build %configure %make_build %install %make_install # Delete libtool crap. find %{buildroot} -name '*.la' -delete # Virt-tools data directory. This contains a symlink to rhsrvany.exe # which is satisfied by the dependency on mingw32-srvany. mkdir -p %{buildroot}/%{_datadir}/virt-tools # Delete the v2v test harness (except for the man page). rm -r %{buildroot}/%{_libdir}/ocaml/v2v_test_harness rm -r %{buildroot}/%{_libdir}/ocaml/stublibs/dllv2v_test_harness* # Find locale files. %find_lang %{name} %check # All tests fail at the moment because of bugs in libvirt blockdev. # # Tests fail on both armv7 and ppc64le in Fedora 31 because the kernel # # cannot boot on qemu. # %ifnarch %{arm} ppc64le # # On x86_64 this single test fails with: "virt-v2v: warning: the # # target hypervisor does not support a x86_64 KVM guest". Missing # # BuildRequires? # %ifarch x86_64 # truncate -s 0 tests/test-v2v-o-libvirt.sh # %endif # # This test fails in mock. # truncate -s 0 tests/test-v2v-oa-option.sh # # Make sure we can see the debug messages (RHBZ#1230160). # export LIBGUESTFS_DEBUG=1 # export LIBGUESTFS_TRACE=1 # make %{?_smp_mflags} check || { # cat tests/test-suite.log # exit 1 # } # %endif %files -f %{name}.lang %license COPYING #doc README %{_bindir}/virt-v2v %{_bindir}/virt-v2v-copy-to-local %{_mandir}/man1/virt-v2v.1* %{_mandir}/man1/virt-v2v-copy-to-local.1* %{_mandir}/man1/virt-v2v-hacking.1* %{_mandir}/man1/virt-v2v-input-vmware.1* %{_mandir}/man1/virt-v2v-input-xen.1* %{_mandir}/man1/virt-v2v-output-local.1* %{_mandir}/man1/virt-v2v-output-openstack.1* %{_mandir}/man1/virt-v2v-output-rhv.1* %{_mandir}/man1/virt-v2v-release-notes-1.42* %{_mandir}/man1/virt-v2v-support.1* %{_mandir}/man1/virt-v2v-test-harness.1* %{_datadir}/virt-tools %files bash-completion %license COPYING %{_datadir}/bash-completion/completions/virt-v2v %{_datadir}/bash-completion/completions/virt-v2v-copy-to-local %files man-pages-ja %license COPYING %lang(ja) %{_mandir}/ja/man1/*.1* %dir %{_mandir}/ja %dir %{_mandir}/ja/man1/ %files man-pages-uk %license COPYING %lang(uk) %{_mandir}/uk/man1/*.1* %dir %{_mandir}/uk %dir %{_mandir}/uk/man1/ %changelog

1 0

commit python-pdfkit for openSUSE:Factory
by Source-Sync 30 Mar '21

30 Mar '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pdfkit for openSUSE:Factory checked in at 2021-03-30 21:01:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pdfkit (Old) and /work/SRC/openSUSE:Factory/.python-pdfkit.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pdfkit" Tue Mar 30 21:01:40 2021 rev:4 rq:870120 version:0.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pdfkit/python-pdfkit.changes 2019-01-08 12:30:26.948143237 +0100 +++ /work/SRC/openSUSE:Factory/.python-pdfkit.new.2401/python-pdfkit.changes 2021-03-30 21:01:40.848802346 +0200 @@ -1,0 +2,5 @@ +Sun Feb 7 15:35:26 UTC 2021 - John Vandenberg <jayvdb(a)gmail.com> + +- Add pdfkit-tests.py to activate test suite + +------------------------------------------------------------------- New: ---- pdfkit-tests.py ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pdfkit.spec ++++++ --- /var/tmp/diff_new_pack.dlHvQS/_old 2021-03-30 21:01:41.420802974 +0200 +++ /var/tmp/diff_new_pack.dlHvQS/_new 2021-03-30 21:01:41.420802974 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-pdfkit # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ Group: Development/Languages/Python URL: https://github.com/JazzCore/python-pdfkit Source: https://files.pythonhosted.org/packages/source/p/pdfkit/pdfkit-%{version}.t… +Source1: https://raw.githubusercontent.com/JazzCore/python-pdfkit/master/tests/pdfki… BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -41,6 +42,13 @@ %prep %setup -q -n pdfkit-%{version} +cp %{SOURCE1} . + +# Replicate https://github.com/JazzCore/python-pdfkit/tree/master/tests/fixtures +mkdir fixtures +echo 'body { font-size: 80px; }' > fixtures/example.css +echo 'a { color: blue; }' > fixtures/example2.css +echo '<html><head></head><body><h1>Oh Hai!</h1></body></html>' > fixtures/example.html %build %python_build @@ -49,6 +57,9 @@ %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%check +%pytest pdfkit-tests.py -k 'not (test_pdf_generation_from_file_like or test_pdf_generation)' + %files %{python_files} %license LICENSE %doc README.rst ++++++ pdfkit-tests.py ++++++ # -*- coding: utf-8 -*- import os import io import sys import codecs import unittest if sys.version_info[0] == 2 and sys.version_info[1] == 7: unittest.TestCase.assertRegex = unittest.TestCase.assertRegexpMatches #Prepend ../ to PYTHONPATH so that we can import PDFKIT form there. TESTS_ROOT = os.path.abspath(os.path.dirname(__file__)) sys.path.insert(0, os.path.realpath(os.path.join(TESTS_ROOT, '..'))) import pdfkit class TestPDFKitInitialization(unittest.TestCase): """Test init""" def test_html_source(self): r = pdfkit.PDFKit('<h1>Oh hai</h1>', 'string') self.assertTrue(r.source.isString()) def test_url_source(self): r = pdfkit.PDFKit('http://ya.ru', 'url') self.assertTrue(r.source.isUrl()) def test_file_source(self): r = pdfkit.PDFKit('fixtures/example.html', 'file') self.assertTrue(r.source.isFile()) def test_file_object_source(self): with open('fixtures/example.html') as fl: r = pdfkit.PDFKit(fl, 'file') self.assertTrue(r.source.isFileObj()) def test_file_source_with_path(self): r = pdfkit.PDFKit('test', 'string') with io.open('fixtures/example.css') as f: self.assertTrue(r.source.isFile(path=f)) with codecs.open('fixtures/example.css', encoding='UTF-8') as f: self.assertTrue(r.source.isFile(path=f)) def test_options_parsing(self): r = pdfkit.PDFKit('html', 'string', options={'page-size': 'Letter'}) test_command = r.command('test') idx = test_command.index('--page-size') # Raise exception in case of not found self.assertTrue(test_command[idx+1] == 'Letter') def test_options_parsing_with_dashes(self): r = pdfkit.PDFKit('html', 'string', options={'--page-size': 'Letter'}) test_command = r.command('test') idx = test_command.index('--page-size') # Raise exception in case of not found self.assertTrue(test_command[idx+1] == 'Letter') def test_options_parsing_with_tuple(self): options = { '--custom-header': [ ('Accept-Encoding','gzip') ] } r = pdfkit.PDFKit('html', 'string', options=options) command = r.command() idx1 = command.index('--custom-header') # Raise exception in case of not found self.assertTrue(command[idx1 + 1] == 'Accept-Encoding') self.assertTrue(command[idx1 + 2] == 'gzip') def test_options_parsing_with_tuple_no_dashes(self): options = { 'custom-header': [ ('Accept-Encoding','gzip') ] } r = pdfkit.PDFKit('html', 'string', options=options) command = r.command() idx1 = command.index('--custom-header') # Raise exception in case of not found self.assertTrue(command[idx1 + 1] == 'Accept-Encoding') self.assertTrue(command[idx1 + 2] == 'gzip') def test_repeatable_options(self): roptions = { '--page-size': 'Letter', 'cookies': [ ('test_cookie1','cookie_value1'), ('test_cookie2','cookie_value2'), ] } r = pdfkit.PDFKit('html', 'string', options=roptions) test_command = r.command('test') idx1 = test_command.index('--page-size') # Raise exception in case of not found self.assertTrue(test_command[idx1 + 1] == 'Letter') self.assertTrue(test_command.count('--cookies') == 2) idx2 = test_command.index('--cookies') self.assertTrue(test_command[idx2 + 1] == 'test_cookie1') self.assertTrue(test_command[idx2 + 2] == 'cookie_value1') idx3 = test_command.index('--cookies', idx2 + 2) self.assertTrue(test_command[idx3 + 1] == 'test_cookie2') self.assertTrue(test_command[idx3 + 2] == 'cookie_value2') def test_custom_configuration(self): conf = pdfkit.configuration() self.assertEqual('pdfkit-', conf.meta_tag_prefix) conf = pdfkit.configuration(meta_tag_prefix='prefix-') self.assertEqual('prefix-', conf.meta_tag_prefix) with self.assertRaises(IOError): conf = pdfkit.configuration(wkhtmltopdf='wrongpath') class TestPDFKitCommandGeneration(unittest.TestCase): """Test command() method""" def test_command_construction(self): r = pdfkit.PDFKit('html', 'string', options={'page-size': 'Letter', 'toc-l1-font-size': 12}) command = r.command() self.assertEqual(command[0], r.wkhtmltopdf) self.assertEqual(command[command.index('--page-size') + 1], 'Letter') self.assertEqual(command[command.index('--toc-l1-font-size') + 1], '12') def test_lists_of_input_args(self): urls = ['http://ya.ru', 'http://google.com'] paths = ['fixtures/example.html', 'fixtures/example.html'] r = pdfkit.PDFKit(urls, 'url') r2 = pdfkit.PDFKit(paths, 'file') cmd = r.command() cmd2 = r2.command() self.assertEqual(cmd[-3:], ['http://ya.ru', 'http://google.com', '-']) self.assertEqual(cmd2[-3:], ['fixtures/example.html', 'fixtures/example.html', '-']) def test_read_source_from_stdin(self): r = pdfkit.PDFKit('html', 'string') self.assertEqual(r.command()[-2:], ['-', '-']) def test_url_in_command(self): r = pdfkit.PDFKit('http://ya.ru', 'url') self.assertEqual(r.command()[-2:], ['http://ya.ru', '-']) def test_file_path_in_command(self): path = 'fixtures/example.html' r = pdfkit.PDFKit(path, 'file') self.assertEqual(r.command()[-2:], [path, '-']) def test_output_path(self): out = '/test/test2/out.pdf' r = pdfkit.PDFKit('html', 'string') self.assertEqual(r.command(out)[-1:], ['/test/test2/out.pdf']) def test_pdfkit_meta_tags(self): body = """ <html> <head> <meta name="pdfkit-page-size" content="Legal"/> <meta name="pdfkit-orientation" content="Landscape"/> </head> """ r = pdfkit.PDFKit(body, 'string') command = r.command() self.assertEqual(command[command.index('--page-size') + 1], 'Legal') self.assertEqual(command[command.index('--orientation') + 1], 'Landscape') def test_pdfkit_meta_tags_in_bad_markup(self): body = """ <html> <head> <meta name="pdfkit-page-size" content="Legal"/> <meta name="pdfkit-orientation" content="Landscape"/> </head> <br> </html> """ r = pdfkit.PDFKit(body, 'string') command = r.command() self.assertEqual(command[command.index('--page-size') + 1], 'Legal') self.assertEqual(command[command.index('--orientation') + 1], 'Landscape') def test_skip_nonpdfkit_tags(self): body = """ <html> <head> <meta name="test-page-size" content="Legal"/> <meta name="pdfkit-orientation" content="Landscape"/> </head> <br> </html> """ r = pdfkit.PDFKit(body, 'string') command = r.command() self.assertEqual(command[command.index('--orientation') + 1], 'Landscape') def test_toc_handling_without_options(self): r = pdfkit.PDFKit('hmtl', 'string', toc={'xsl-style-sheet': 'test.xsl'}) self.assertEqual(r.command()[1], 'toc') self.assertEqual(r.command()[2], '--xsl-style-sheet') def test_toc_with_options(self): options = { 'page-size': 'Letter', 'margin-top': '0.75in', 'margin-right': '0.75in', 'margin-bottom': '0.75in', 'margin-left': '0.75in', 'encoding': "UTF-8" } r = pdfkit.PDFKit('html', 'string', options=options, toc={'xsl-style-sheet': 'test.xsl'}) command = r.command() self.assertEqual(command[1 + len(options) * 2], 'toc') self.assertEqual(command[1 + len(options) * 2 + 1], '--xsl-style-sheet') def test_cover_without_options(self): r = pdfkit.PDFKit('html', 'string', cover='test.html') command = r.command() self.assertEqual(command[1], 'cover') self.assertEqual(command[2], 'test.html') def test_cover_with_options(self): options = { 'page-size': 'Letter', 'margin-top': '0.75in', 'margin-right': '0.75in', 'margin-bottom': '0.75in', 'margin-left': '0.75in', 'encoding': "UTF-8" } r = pdfkit.PDFKit('html', 'string', options=options, cover='test.html') command = r.command() self.assertEqual(command[1 + len(options) * 2], 'cover') self.assertEqual(command[1 + len(options) * 2 + 1], 'test.html') def test_cover_and_toc(self): options = { 'page-size': 'Letter', 'margin-top': '0.75in', 'margin-right': '0.75in', 'margin-bottom': '0.75in', 'margin-left': '0.75in', 'encoding': "UTF-8" } r = pdfkit.PDFKit('html', 'string', options=options, toc={'xsl-style-sheet': 'test.xsl'}, cover='test.html') command = r.command() self.assertEqual(command[-7:], ['toc', '--xsl-style-sheet', 'test.xsl', 'cover', 'test.html', '-', '-']) def test_cover_and_toc_cover_first(self): options = { 'page-size': 'Letter', 'margin-top': '0.75in', 'margin-right': '0.75in', 'margin-bottom': '0.75in', 'margin-left': '0.75in', 'encoding': "UTF-8" } r = pdfkit.PDFKit('html', 'string', options=options, toc={'xsl-style-sheet': 'test.xsl'}, cover='test.html', cover_first=True) command = r.command() self.assertEqual(command[-7:], ['cover', 'test.html', 'toc', '--xsl-style-sheet', 'test.xsl', '-', '-']) def test_outline_options(self): options = { 'outline': None, 'outline-depth': 1 } r = pdfkit.PDFKit('ya.ru', 'url', options=options) cmd = r.command() #self.assertEqual(cmd[1:], ['--outline', '--outline-depth', '1', 'ya.ru', '-']) self.assertIn('--outline', cmd) self.assertEqual(cmd[cmd.index('--outline-depth') + 1], '1') def test_filter_empty_and_none_values_in_opts(self): options = { 'outline': '', 'footer-line': None, 'quiet': False } r = pdfkit.PDFKit('html', 'string', options=options) cmd = r.command() self.assertEqual(len(cmd), 6) class TestPDFKitGeneration(unittest.TestCase): """Test to_pdf() method""" def setUp(self): pass def tearDown(self): if os.path.exists('out.pdf'): os.remove('out.pdf') def test_pdf_generation(self): r = pdfkit.PDFKit('html', 'string', options={'page-size': 'Letter'}) pdf = r.to_pdf('out.pdf') self.assertTrue(pdf) def test_raise_error_with_invalid_url(self): r = pdfkit.PDFKit('wrongurl', 'url') with self.assertRaises(IOError): r.to_pdf('out.pdf') def test_raise_error_with_invalid_file_path(self): paths = ['frongpath.html', 'wrongpath2.html'] with self.assertRaises(IOError): pdfkit.PDFKit('wrongpath.html', 'file') with self.assertRaises(IOError): pdfkit.PDFKit(paths, 'file') def test_stylesheet_adding_to_the_head(self): #TODO rewrite this part of pdfkit.py r = pdfkit.PDFKit('<html><head></head><body>Hai!</body></html>', 'string', css='fixtures/example.css') with open('fixtures/example.css') as f: css = f.read() r._prepend_css('fixtures/example.css') self.assertIn('<style>%s</style>' % css, r.source.to_s()) def test_stylesheet_adding_without_head_tag(self): r = pdfkit.PDFKit('<html><body>Hai!</body></html>', 'string', options={'quiet': None}, css='fixtures/example.css') with open('fixtures/example.css') as f: css = f.read() r._prepend_css('fixtures/example.css') self.assertIn('<style>%s</style><html>' % css, r.source.to_s()) def test_multiple_stylesheets_adding_to_the_head(self): #TODO rewrite this part of pdfkit.py css_files = ['fixtures/example.css', 'fixtures/example2.css'] r = pdfkit.PDFKit('<html><head></head><body>Hai!</body></html>', 'string', css=css_files) css=[] for css_file in css_files: with open(css_file) as f: css.append(f.read()) r._prepend_css(css_files) self.assertIn('<style>%s</style>' % "\n".join(css), r.source.to_s()) def test_multiple_stylesheet_adding_without_head_tag(self): css_files = ['fixtures/example.css', 'fixtures/example2.css'] r = pdfkit.PDFKit('<html><body>Hai!</body></html>', 'string', options={'quiet': None}, css=css_files) css=[] for css_file in css_files: with open(css_file) as f: css.append(f.read()) r._prepend_css(css_files) self.assertIn('<style>%s</style><html>' % "\n".join(css), r.source.to_s()) def test_stylesheet_throw_error_when_url(self): r = pdfkit.PDFKit('http://ya.ru', 'url', css='fixtures/example.css') with self.assertRaises(r.ImproperSourceError): r.to_pdf() def test_stylesheet_adding_to_file_with_option(self): css = 'fixtures/example.css' r = pdfkit.PDFKit('fixtures/example.html', 'file', css=css) self.assertEqual(r.css, css) r._prepend_css(css) self.assertIn('font-size', r.source.to_s()) def test_wkhtmltopdf_error_handling(self): r = pdfkit.PDFKit('clearlywrongurl.asdf', 'url') with self.assertRaises(IOError): r.to_pdf() def test_pdf_generation_from_file_like(self): with open('fixtures/example.html', 'r') as f: r = pdfkit.PDFKit(f, 'file') output = r.to_pdf() self.assertEqual(output[:4].decode('utf-8'), '%PDF') def test_raise_error_with_wrong_css_path(self): css = 'fixtures/wrongpath.css' r = pdfkit.PDFKit('fixtures/example.html', 'file', css=css) with self.assertRaises(IOError): r.to_pdf() def test_raise_error_if_bad_wkhtmltopdf_option(self): r = pdfkit.PDFKit('<html><body>Hai!</body></html>', 'string', options={'bad-option': None}) with self.assertRaises(IOError) as cm: r.to_pdf() raised_exception = cm.exception self.assertRegex(str(raised_exception), '^wkhtmltopdf exited with non-zero code 1. error:\nUnknown long argument --bad-option\r?\n') if __name__ == "__main__": unittest.main()

1 0