December 2021 - openSUSE Commits - openSUSE Mailing Lists

commit 00Meta for openSUSE:Leap:15.2:Images
by Source-Sync 31 Dec '21

31 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 00Meta for openSUSE:Leap:15.2:Images checked in at 2021-12-31 22:30:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2:Images/00Meta (Old) and /work/SRC/openSUSE:Leap:15.2:Images/.00Meta.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "00Meta" Fri Dec 31 22:30:18 2021 rev:1153 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ version_snapshot ++++++ --- /var/tmp/diff_new_pack.YBptli/_old 2021-12-31 22:30:20.319438912 +0100 +++ /var/tmp/diff_new_pack.YBptli/_new 2021-12-31 22:30:20.323438915 +0100 @@ -1,3 +1,3 @@ -31.628 +31.632 (No newline at EOF)

1 0

commit 000update-repos for openSUSE:Factory
by Source-Sync 31 Dec '21

31 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000update-repos for openSUSE:Factory checked in at 2021-12-31 21:07:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000update-repos (Old) and /work/SRC/openSUSE:Factory/.000update-repos.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000update-repos" Fri Dec 31 21:07:27 2021 rev:1882 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! Old: ---- 15.2:update_1639940936_and_before.packages.xz 15.2:update_1639996418.packages.xz 15.2:update_1640153708.packages.xz 15.2:update_1640264528.packages.xz 15.2:update_1640362258.packages.xz 15.2:update_1640430595.packages.xz 15.2:update_1640531309.packages.xz 15.2:update_1640611428.packages.xz 15.2:update_1640719336.packages.xz 15.2:update_1640768617.packages.xz 15.2:update_1640883876.packages.xz New: ---- 15.2:update_1640883876_and_before.packages.xz 15.2:update_1640974476.packages.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit 00Meta for openSUSE:Leap:15.2:Images
by Source-Sync 31 Dec '21

31 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 00Meta for openSUSE:Leap:15.2:Images checked in at 2021-12-31 20:01:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2:Images/00Meta (Old) and /work/SRC/openSUSE:Leap:15.2:Images/.00Meta.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "00Meta" Fri Dec 31 20:01:37 2021 rev:1152 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ version_totest ++++++ --- /var/tmp/diff_new_pack.r2qBNz/_old 2021-12-31 20:01:39.408654040 +0100 +++ /var/tmp/diff_new_pack.r2qBNz/_new 2021-12-31 20:01:39.412654043 +0100 @@ -1,3 +1,3 @@ -31.631 +31.632 (No newline at EOF)

1 0

commit systemd for openSUSE:Leap:15.2:Update
by Source-Sync 31 Dec '21

31 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package systemd for openSUSE:Leap:15.2:Update checked in at 2021-12-31 19:02:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2:Update/systemd (Old) and /work/SRC/openSUSE:Leap:15.2:Update/.systemd.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd" Fri Dec 31 19:02:11 2021 rev:13 rq:941935 version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.VFUMor/_old 2021-12-31 19:02:11.809900744 +0100 +++ /var/tmp/diff_new_pack.VFUMor/_new 2021-12-31 19:02:11.813900746 +0100 @@ -1,2 +1,2 @@ -<link package='systemd.17199' cicount='copy' /> +<link package='systemd.17298' cicount='copy' />

1 0

commit systemd-mini for openSUSE:Leap:15.2:Update
by Source-Sync 31 Dec '21

31 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package systemd-mini for openSUSE:Leap:15.2:Update checked in at 2021-12-31 19:02:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2:Update/systemd-mini (Old) and /work/SRC/openSUSE:Leap:15.2:Update/.systemd-mini.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd-mini" Fri Dec 31 19:02:09 2021 rev:13 rq:941935 version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.rQ0ura/_old 2021-12-31 19:02:10.801900028 +0100 +++ /var/tmp/diff_new_pack.rQ0ura/_new 2021-12-31 19:02:10.805900031 +0100 @@ -1,2 +1,2 @@ -<link package='systemd-mini.17199' cicount='copy' /> +<link package='systemd-mini.17298' cicount='copy' />

1 0

commit 00Meta for openSUSE:Leap:15.2:Images
by Source-Sync 31 Dec '21

31 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 00Meta for openSUSE:Leap:15.2:Images checked in at 2021-12-31 16:01:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2:Images/00Meta (Old) and /work/SRC/openSUSE:Leap:15.2:Images/.00Meta.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "00Meta" Fri Dec 31 16:01:35 2021 rev:1151 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ version_totest ++++++ --- /var/tmp/diff_new_pack.mquCnH/_old 2021-12-31 16:01:37.062239808 +0100 +++ /var/tmp/diff_new_pack.mquCnH/_new 2021-12-31 16:01:37.066239810 +0100 @@ -1,3 +1,3 @@ -31.630 +31.631 (No newline at EOF)

1 0

commit python-gwcs for openSUSE:Factory
by Source-Sync 31 Dec '21

31 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-gwcs for openSUSE:Factory checked in at 2021-12-31 13:50:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-gwcs (Old) and /work/SRC/openSUSE:Factory/.python-gwcs.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-gwcs" Fri Dec 31 13:50:20 2021 rev:7 rq:942994 version:0.18.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-gwcs/python-gwcs.changes 2021-02-15 23:16:57.391454614 +0100 +++ /work/SRC/openSUSE:Factory/.python-gwcs.new.1896/python-gwcs.changes 2021-12-31 13:50:21.669563442 +0100 @@ -1,0 +2,37 @@ +Tue Dec 28 14:59:01 UTC 2021 - Ben Greiner <code(a)bnavigator.de> + +- Update to 0.18.0 + * Bug Fixes + * Updated code in region.py with latest improvements and bug + fixes from stsci.skypac.regions.py [#382] + * New Features + * Enabled CompoundBoundingBox support for wcs. [#375] + * Moved schemas to standalone package asdf-wcs-schemas. Reworked + the serialization code to use ASDF converters. [#388] +- Release 0.17.1 + * Bug Fixes + * Fixed a bug with StokesProfile and array types. [#384] +- Release 0.17.0 + * Bug Fixes + * world_axis_object_components and world_axis_object_classes now + ensure unique keys in CompositeFrame and CoordinateFrame. + [#356] + * Fix issue where RuntimeWarning is raised when there are NaNs in + coordinates in angle wrapping code [#367] + * Fix deprecation warning when wcs is initialized with a pipeline + [#368] + * Use CD formalism in WCS.to_fits_sip(). [#380] + * New Features + * wcs_from_points now includes fitting for the inverse transform. + [#349] + * Generalized WCS.to_fits_sip to be able to create a 2D celestial + FITS WCS from celestial subspace of the WCS. Also, now + WCS.to_fits_sip` supports arbitrary order of output axes. + [#357] + * API Changes + * Modified interface to wcs_from_points function to better match + analogous function in astropy. [#349] + * Model._BoundingBox was renamed to Model.ModelBoundingBox. + [#376, #377] + +------------------------------------------------------------------- Old: ---- gwcs-0.16.1.tar.gz New: ---- gwcs-0.18.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gwcs.spec ++++++ --- /var/tmp/diff_new_pack.ezX0UC/_old 2021-12-31 13:50:22.165563848 +0100 +++ /var/tmp/diff_new_pack.ezX0UC/_new 2021-12-31 13:50:22.173563855 +0100 @@ -22,14 +22,16 @@ # But gwcs still supports it, so keep the -base, requirement below for potential Leap backports %define skip_python36 1 Name: python-gwcs -Version: 0.16.1 +Version: 0.18.0 Release: 0 Summary: Generalized World Coordinate System License: BSD-3-Clause Group: Productivity/Scientific/Astronomy URL: https://gwcs.readthedocs.io/en/latest/ Source: https://files.pythonhosted.org/packages/source/g/gwcs/gwcs-%{version}.tar.gz -BuildRequires: %{python_module asdf} +BuildRequires: %{python_module asdf >= 2.8.1} +BuildRequires: %{python_module asdf-astropy} +BuildRequires: %{python_module asdf_wcs_schemas} BuildRequires: %{python_module astropy >= 4.1} BuildRequires: %{python_module base >= 3.6} BuildRequires: %{python_module numpy} @@ -38,13 +40,15 @@ BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-asdf +Requires: python-asdf >= 2.8.1 +Requires: python-asdf-astropy +Requires: python-asdf_wcs_schemas Requires: python-astropy >= 4.1 Requires: python-numpy Requires: python-scipy BuildArch: noarch # SECTION test requirements -BuildRequires: %{python_module pytest-doctestplus} +BuildRequires: %{python_module pytest-astropy} BuildRequires: %{python_module pytest} # /SECTION %python_subpackages @@ -72,6 +76,6 @@ %doc README.rst %license licenses/LICENSE.rst licenses/README.rst %{python_sitelib}/gwcs -%{python_sitelib}/gwcs-%{version}-py*.egg-info +%{python_sitelib}/gwcs-%{version}*-info %changelog ++++++ gwcs-0.16.1.tar.gz -> gwcs-0.18.0.tar.gz ++++++ ++++ 7586 lines of diff (skipped)

1 0

commit python-pytest-httpbin for openSUSE:Factory
by Source-Sync 31 Dec '21

31 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pytest-httpbin for openSUSE:Factory checked in at 2021-12-31 13:44:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pytest-httpbin (Old) and /work/SRC/openSUSE:Factory/.python-pytest-httpbin.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pytest-httpbin" Fri Dec 31 13:44:24 2021 rev:8 rq:943223 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pytest-httpbin/python-pytest-httpbin.changes 2019-02-26 22:14:41.230226278 +0100 +++ /work/SRC/openSUSE:Factory/.python-pytest-httpbin.new.1896/python-pytest-httpbin.changes 2021-12-31 13:44:32.089270008 +0100 @@ -1,0 +2,10 @@ +Wed Dec 29 09:56:27 UTC 2021 - Ben Greiner <code(a)bnavigator.de> + +- Update to v1.0.1 + * httpbin_secure: fix redirect Location to have "https://" + scheme (#62) - thanks @immerrr + * Include regression tests in pypi tarball (#56) - thanks + @kmosiejczuk +- Add rpmlintrc filter for test certificates + +------------------------------------------------------------------- Old: ---- v1.0.0.tar.gz New: ---- pytest-httpbin-1.0.1.tar.gz pytest-httpbin-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pytest-httpbin.spec ++++++ --- /var/tmp/diff_new_pack.9szPMk/_old 2021-12-31 13:44:32.485270346 +0100 +++ /var/tmp/diff_new_pack.9szPMk/_new 2021-12-31 13:44:32.489270349 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-pytest-httpbin # -# 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 @@ -18,13 +18,14 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pytest-httpbin -Version: 1.0.0 +Version: 1.0.1 Release: 0 Summary: Web service for testing HTTP libraries License: MIT Group: Development/Languages/Python URL: https://github.com/kevin1024/pytest-httpbin -Source: https://github.com/kevin1024/pytest-httpbin/archive/v%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/p/pytest-httpbin/pytest-http… +Source99: pytest-httpbin-rpmlintrc BuildRequires: %{python_module httpbin} BuildRequires: %{python_module pytest} BuildRequires: %{python_module requests} @@ -58,10 +59,11 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} -v +%pytest %files %{python_files} %doc README.md DESCRIPTION.rst -%{python_sitelib}/* +%{python_sitelib}/pytest_httpbin +%{python_sitelib}/pytest_httpbin-%{version}*-info %changelog ++++++ pytest-httpbin-rpmlintrc ++++++ # These are test certificates and keys for localhost only addFilter("pem-certificate .*pytest_httpbin/certs")

1 0

commit wireshark for openSUSE:Factory
by Source-Sync 31 Dec '21

31 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wireshark for openSUSE:Factory checked in at 2021-12-31 13:44:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wireshark (Old) and /work/SRC/openSUSE:Factory/.wireshark.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wireshark" Fri Dec 31 13:44:23 2021 rev:180 rq:943194 version:3.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2021-12-22 20:18:48.111867727 +0100 +++ /work/SRC/openSUSE:Factory/.wireshark.new.1896/wireshark.changes 2021-12-31 13:44:30.933269023 +0100 @@ -1,0 +2,13 @@ +Thu Dec 30 09:41:01 UTC 2021 - Robert Frohl <rfrohl(a)suse.com> + +- Wireshark 3.6.1: + * CVE-2021-4185: RTMPT dissector infinite loop. + * CVE-2021-4184: BitTorrent DHT dissector infinite loop. + * CVE-2021-4183: pcapng file parser crash. + * CVE-2021-4182: RFC 7468 file parser infinite loop. + * CVE-2021-4181: Sysdig Event dissector crash. + * Kafka dissector infinite loop. Issue 17811. +- Further features, bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-3.6.1.html + +------------------------------------------------------------------- Old: ---- wireshark-3.6.0.tar.xz wireshark-3.6.0.tar.xz.asc New: ---- wireshark-3.6.1.tar.xz wireshark-3.6.1.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireshark.spec ++++++ --- /var/tmp/diff_new_pack.FdMIfg/_old 2021-12-31 13:44:31.849269803 +0100 +++ /var/tmp/diff_new_pack.FdMIfg/_new 2021-12-31 13:44:31.853269807 +0100 @@ -28,7 +28,7 @@ %bcond_with lz4 %endif Name: wireshark -Version: 3.6.0 +Version: 3.6.1 Release: 0 Summary: A Network Traffic Analyser License: GPL-2.0-or-later AND GPL-3.0-or-later ++++++ wireshark-3.6.0.tar.xz -> wireshark-3.6.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/wireshark/wireshark-3.6.0.tar.xz /work/SRC/openSUSE:Factory/.wireshark.new.1896/wireshark-3.6.1.tar.xz differ: char 26, line 1 ++++++ wireshark-3.6.0.tar.xz.asc -> wireshark-3.6.1.tar.xz.asc ++++++ --- /work/SRC/openSUSE:Factory/wireshark/wireshark-3.6.0.tar.xz.asc 2021-12-22 20:18:48.099867722 +0100 +++ /work/SRC/openSUSE:Factory/.wireshark.new.1896/wireshark-3.6.1.tar.xz.asc 2021-12-31 13:44:30.921269012 +0100 @@ -1,50 +1,50 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -wireshark-3.6.0.tar.xz: 39687684 bytes -SHA256(wireshark-3.6.0.tar.xz)=9cc8f7fc5bb1d66fbdfdf95cde6e1c98633c303f9af9b33ae9f1fcf022fedf06 -RIPEMD160(wireshark-3.6.0.tar.xz)=1ecec1acd1c10be69654afac3f4f2d0acaf42a3c -SHA1(wireshark-3.6.0.tar.xz)=98248f0e6c19408fbb796398f998cf90d7ed9ca6 - -Wireshark-win64-3.6.0.exe: 77270896 bytes -SHA256(Wireshark-win64-3.6.0.exe)=8ffa9f2c7943d1e8ed8020d7d08c8015ec649c3e3af901808a9ec858564cd255 -RIPEMD160(Wireshark-win64-3.6.0.exe)=b9f85e1a331c04feb43548e7b69279a9c69dedb3 -SHA1(Wireshark-win64-3.6.0.exe)=a847cd6fcc0764429601e7ab7967936d83f1a9f8 - -Wireshark-win32-3.6.0.exe: 61175712 bytes -SHA256(Wireshark-win32-3.6.0.exe)=798462bc710d4560e24ed408f2861efe22e9e4ea87d16271b192d7524239fd23 -RIPEMD160(Wireshark-win32-3.6.0.exe)=3551defbcdb4c7a61d5ae37756c16d9f5299b071 -SHA1(Wireshark-win32-3.6.0.exe)=a4b5097cec28938a9077c55f0ef30158c363d06c - -Wireshark-win32-3.6.0.msi: 45277184 bytes -SHA256(Wireshark-win32-3.6.0.msi)=69e28782a4e8b901a6450215f9306b1c1b4aa818778a42af4f7820c267d57b85 -RIPEMD160(Wireshark-win32-3.6.0.msi)=ce80145ba7ccebc46fde241184a57c3b4c988d07 -SHA1(Wireshark-win32-3.6.0.msi)=6538c4a10effe314103d50b14d11e6d8728ed8dd - -Wireshark-win64-3.6.0.msi: 50749440 bytes -SHA256(Wireshark-win64-3.6.0.msi)=d4f9fe9e907f91e272e48e4497f8ce18717bac65f8890bbfb925172617169758 -RIPEMD160(Wireshark-win64-3.6.0.msi)=3b75bada21b4a116fa4e08681b440829135e99c2 -SHA1(Wireshark-win64-3.6.0.msi)=eb369134cc7cdd7a9c205d71dc8852749c5a151d - -WiresharkPortable32_3.6.0.paf.exe: 39317904 bytes -SHA256(WiresharkPortable32_3.6.0.paf.exe)=0dbeaa8d882dc50a839c5c33cea2cffce1f606d5ff38999d5186d1e89ac0ee0e -RIPEMD160(WiresharkPortable32_3.6.0.paf.exe)=f4686440dbdccb5372071b90c6adf990fd47353a -SHA1(WiresharkPortable32_3.6.0.paf.exe)=2451a05080f61c0d59221cb8431fa5bdf436ace1 - -WiresharkPortable64_3.6.0.paf.exe: 44098272 bytes -SHA256(WiresharkPortable64_3.6.0.paf.exe)=1b54a694ec2714a8744c19afa7bf15531ea6e0e9a71f91fc2d4ea42bccb8f392 -RIPEMD160(WiresharkPortable64_3.6.0.paf.exe)=7840e70b98600c786efbb16845db9879202c394b -SHA1(WiresharkPortable64_3.6.0.paf.exe)=c2ce950aa36143cfe39043bce8cc112ed482a22f - -Wireshark 3.6.0 Arm 64.dmg: 140005503 bytes -SHA256(Wireshark 3.6.0 Arm 64.dmg)=9893a985693c01b29b532745ca0f999590b119a3e8e9820a403291ffce11fd97 -RIPEMD160(Wireshark 3.6.0 Arm 64.dmg)=5b21989294768b79cf312061ba1dd21884aed5e7 -SHA1(Wireshark 3.6.0 Arm 64.dmg)=bf2ff02c32fb4b53688d8dcd8f081031cc631527 - -Wireshark 3.6.0 Intel 64.dmg: 138589061 bytes -SHA256(Wireshark 3.6.0 Intel 64.dmg)=c571417d3318074fbe73814a0180e84262e10b58cadb2e80c9fc05cf97e99645 -RIPEMD160(Wireshark 3.6.0 Intel 64.dmg)=73a102fa432c9857cd20d280d2ac751cf2a81285 -SHA1(Wireshark 3.6.0 Intel 64.dmg)=aeca14c89ede6fe358553d4889ed5888a6c6a200 +wireshark-3.6.1.tar.xz: 39632140 bytes +SHA256(wireshark-3.6.1.tar.xz)=0434eda8fb6bf88e2b42a67eb5d1de254a67d505bec3bb51fee9d7cad7925a38 +RIPEMD160(wireshark-3.6.1.tar.xz)=04bf556bcb1313b323cfcd1fbee2df281a7de4db +SHA1(wireshark-3.6.1.tar.xz)=ce592bc9b71491793cfe0b6c456727a4be04b805 + +Wireshark-win64-3.6.1.exe: 77397160 bytes +SHA256(Wireshark-win64-3.6.1.exe)=1bec695388724ce8d40d0403b150706daa9991e088d240779b9b16e60241ec31 +RIPEMD160(Wireshark-win64-3.6.1.exe)=b8b37fc0a80855f1e09da1d80336d1b6d1da83b0 +SHA1(Wireshark-win64-3.6.1.exe)=0f3d9c8729c016952a56aa883255a1f367d343f7 + +Wireshark-win32-3.6.1.exe: 61293672 bytes +SHA256(Wireshark-win32-3.6.1.exe)=f2a315f304156b7b0874ce6971a3c526264b35f515f58f27b622f9509cfcd26c +RIPEMD160(Wireshark-win32-3.6.1.exe)=3e74e0f8aeb8cb69fd141782624348f320c7eaa6 +SHA1(Wireshark-win32-3.6.1.exe)=c98c38ccc0cfc0bb1a129c8f4477560801574b7d + +Wireshark-win32-3.6.1.msi: 45436928 bytes +SHA256(Wireshark-win32-3.6.1.msi)=177fd53740429ec3887d62efa99bb28d17fe9454899fcab447b3beaf04013d7c +RIPEMD160(Wireshark-win32-3.6.1.msi)=bc38e5acfec61ec15aa2b41bd02c3cc4c166afc8 +SHA1(Wireshark-win32-3.6.1.msi)=41a5364ff473373bf8c512f1e9b96e604af39b1d + +Wireshark-win64-3.6.1.msi: 50946048 bytes +SHA256(Wireshark-win64-3.6.1.msi)=c2b32b5ba00caa9168b32f19ffbcfd9ce351c379661533a4096ae0b063550131 +RIPEMD160(Wireshark-win64-3.6.1.msi)=f6b049eeb306b991787c5ba9c7f1aaeef30573e9 +SHA1(Wireshark-win64-3.6.1.msi)=f3b1c81a5e772ae1b32f45e3c9896d7d2e1a19b8 + +WiresharkPortable32_3.6.1.paf.exe: 39516080 bytes +SHA256(WiresharkPortable32_3.6.1.paf.exe)=0dc6b9a6604f1d6bfe9b2d290db13e3d87615d6e402f3ff252c0b025ac367a1c +RIPEMD160(WiresharkPortable32_3.6.1.paf.exe)=2c4e0d90d1a508a3c607e774871fc1910ee0ee3c +SHA1(WiresharkPortable32_3.6.1.paf.exe)=b41711ae3731ae0842808af9a3afc56cad1abe04 + +WiresharkPortable64_3.6.1.paf.exe: 44267152 bytes +SHA256(WiresharkPortable64_3.6.1.paf.exe)=feb2594c9aa564b04cacf078e9ca56642ace29a82215d5916b89ca3ae4039cf7 +RIPEMD160(WiresharkPortable64_3.6.1.paf.exe)=946fb7ef1542d6658e3c068c77938e16dbf40425 +SHA1(WiresharkPortable64_3.6.1.paf.exe)=3486ed5f3ca9d519ea8178736347283be8cc43d7 + +Wireshark 3.6.1 Arm 64.dmg: 140000615 bytes +SHA256(Wireshark 3.6.1 Arm 64.dmg)=878bd09f9bfb6e058e37020902eea92d3111480b4db3114357219042ff126fde +RIPEMD160(Wireshark 3.6.1 Arm 64.dmg)=8ed0977c4ca561c813d25d59a5ee3d00dbbaffee +SHA1(Wireshark 3.6.1 Arm 64.dmg)=a3b8a53e4c770f6377208c169c2933de328a347b + +Wireshark 3.6.1 Intel 64.dmg: 138727831 bytes +SHA256(Wireshark 3.6.1 Intel 64.dmg)=f348d9fc1f67f4bf75aef3c45aca864dfc9b43cac488b86af8a7b85c671eb46e +RIPEMD160(Wireshark 3.6.1 Intel 64.dmg)=d592e1a3c45d7d445d3991218b2cae3a11ecd76a +SHA1(Wireshark 3.6.1 Intel 64.dmg)=b04a11c42674b34c2c9a690db0fb92c4bfab761f You can validate these hashes using the following commands (among others): @@ -54,17 +54,17 @@ Other: openssl sha256 wireshark-x.y.z.tar.xz -----BEGIN PGP SIGNATURE----- -iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmGb7S8ACgkQgiRKeOb+ -rurLoQ//W30fjYhihrUcgXo52bhdJEFujVRrmdS4PAUnmMspy4rnbvEZnKlji9nl -vUxCEzyrbrQHjKxUjkedNo4Najhp1R3NqULB8C0OPiHfEFOLWVGDdOuUzFSTk5rW -7XxxOiEV8D/1P4uv7xlAC2aXDZ4k2BPZ+vuz0+6wrtNiG6G87hysqiWkDErjS5h1 -r61G70LnQ74xCdtBdB36NcGqydOKoRuaWurfXWEhVOASy5hpvNm+iTN7nqW+mEaD -9KIWHhPwjoVoc6G2RMtjDu72qLl4/0u0wiTYr2wCfjYJvmLezHB/GR0obNttLrhK -H1YSRgnz29Ko7lfbDdyJCj8iMCHwOf9n/8D+UMBd7v2/CnUrxa5ACnLccRvTLUVG -GUf/ggLxB6MzbIAN5PR/kwOxDJCBi6yoxO3AM+upcglsJ0VBAsDnkar7gXd6eOCf -duHHC9HTaReXzopEIf7CIal1Bduqnn439RNdiD8qn1tyZ905WhUoHaaH/LPRevh0 -JaApvVyDxkSeTxfwOD3sIPT5Y5E2u5vXlWkKszp+fxKlEPZ2TknsuXEppMx5U6aq -2ZtB64ueMCE2/lBA9J+Yk4ebJSWyMtKuTso+qSbnc9zGkST7YKhAs1E7+xWv0dKs -Wv1n0PuTCZc+lMQdj+rzDug/047pD1fM6kF1WLHoHYZkimYMoS0= -=d/rn +iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmHMyyUACgkQgiRKeOb+ +ruoJ0A/7BPLuGRKgW2QifY6BITZ8nbS0BVJ1N8hMiaB/j7i+pJFUVMG/pehWcbNe +eA3h0OEy0yHzYJhv7TKnafZGZsHMVjeo3AD4vul9jjbPN1b4F2WnfqmFjFeHGWwB +08E+Ffr6jg9lTF3bx6r6kIip5hnaFgt/xtK4MV3nDGDZ280ib3L47apHBy5m1CQX +1VLvb7BrpEZ2ayHXHmSc584NOQ/WB+TYCjYoS7fPtthnSSp2h+xrqtFq6iW7ePt+ +RNUEEISrZG6HXuUZ4g70BSGkz4Brp2zoYkPAfMODqt9bQI/NYMZYfoN2FAP5N/1V +gzt/ReiX/mgPohqy4EwfGVJxDC8iZg6fjITKLR71vZ1sNNHfXK5rbKQ619F2NTjq +ocSOOLmnBNegOoJK8PVTCymN73/IQkot9iZ4LZSKz+UojDt0bW5C7KivIkWlqSg/ +tEtD/kr2VV2TWbMUpftJojLi3ULAjNPHbNWJmWWZpTGruMm/Q3WnSiS8fp/aDjJv +oKO1CAt3OaWUmSw40rxfIWj1kWVB+1ddpUxI9UwcOfz5Zro/PgsfKf+upI8VPAsI +tSw+OEmwnWJyTqjgEbQ3SJNe0CWgEw9fAAfclC9IM4wYpjc/obOyH6BWFwbntA3E +rSnlDbxa4jq4oZLnfbZwt8M4+S/W5/Ga/nwPsVnCQdhdK+criY8= +=kOS2 -----END PGP SIGNATURE-----

1 0

commit obs-service-tar_scm for openSUSE:Factory
by Source-Sync 31 Dec '21

31 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package obs-service-tar_scm for openSUSE:Factory checked in at 2021-12-31 13:44:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old) and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-tar_scm" Fri Dec 31 13:44:22 2021 rev:70 rq:943188 version:0.10.29.1634038025.85bfc3f Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes 2021-09-26 21:48:13.582744901 +0200 +++ /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new.1896/obs-service-tar_scm.changes 2021-12-31 13:44:29.537267832 +0100 @@ -1,0 +2,12 @@ +Thu Dec 23 09:01:11 UTC 2021 - FSchreiner(a)suse.com + +- Update to version 0.10.29.1634038025.85bfc3f: + * fix test cases + * fix various linter problems with pylint 2.11.1 + * disable consider-using-f-string in pylint + * added TC for _stash_pop_required + * assertTarIsDeeply now more verbose in case of failure + * remove tearDown/Trace from testenv.py + * fix regression to keep local changes when running in osc + +------------------------------------------------------------------- Old: ---- obs-service-tar_scm-0.10.28.1632141620.a8837d3.tar.gz New: ---- obs-service-tar_scm-0.10.29.1634038025.85bfc3f.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-tar_scm.spec ++++++ --- /var/tmp/diff_new_pack.5v1ZKO/_old 2021-12-31 13:44:30.097268310 +0100 +++ /var/tmp/diff_new_pack.5v1ZKO/_new 2021-12-31 13:44:30.101268314 +0100 @@ -119,8 +119,8 @@ %define pkg_name obs-service-tar_scm Name: %{pkg_name}%{nsuffix} -%define version_unconverted 0.10.28.1632141620.a8837d3 -Version: 0.10.28.1632141620.a8837d3 +%define version_unconverted 0.10.29.1634038025.85bfc3f +Version: 0.10.29.1634038025.85bfc3f Release: 0 Summary: An OBS source service: create tar ball from svn/git/hg License: GPL-2.0-or-later ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.5v1ZKO/_old 2021-12-31 13:44:30.133268341 +0100 +++ /var/tmp/diff_new_pack.5v1ZKO/_new 2021-12-31 13:44:30.137268344 +0100 @@ -1,5 +1,5 @@ pkgname=obs-service-tar_scm -pkgver=0.10.28.1632141620.a8837d3 +pkgver=0.10.29.1634038025.85bfc3f pkgrel=0 pkgdesc="Source Service for the OpenSUSE Build Service (OBS)" arch=('any') @@ -9,9 +9,14 @@ makedepends=('python' 'python-yaml' 'python-dateutil' 'python-lxml' 'python-mock' 'bzr' 'git' 'mercurial' 'subversion' ) depends=('python' 'python-yaml' 'python-dateutil' 'python-argparse' 'cpio' 'git' 'bzr' 'mercurial' 'subversion' ) source=("obs-service-tar_scm-${pkgver}.tar.gz") +noextract=("obs-service-tar_scm-${pkgver}.tar.gz") provides=('obs-service-tar') sha256sums=('SKIP') +prepare() { + tar -axf "obs-service-tar_scm-${pkgver}.tar.gz" +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" PREFIX=/usr install ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.5v1ZKO/_old 2021-12-31 13:44:30.173268375 +0100 +++ /var/tmp/diff_new_pack.5v1ZKO/_new 2021-12-31 13:44:30.177268379 +0100 @@ -7,6 +7,6 @@ <param name="changesrevision">9e8b88b088778c44db56781e6a908a0e82e27cf2</param></service> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param> - <param name="changesrevision">a8837d3a97e8eb6640d219514bc21d3dd6be8d3a</param></service></servicedata> + <param name="changesrevision">85bfc3fabb06212b49a389afb3310bfbf2996913</param></service></servicedata> (No newline at EOF) ++++++ debian.dsc ++++++ --- /var/tmp/diff_new_pack.5v1ZKO/_old 2021-12-31 13:44:30.193268392 +0100 +++ /var/tmp/diff_new_pack.5v1ZKO/_new 2021-12-31 13:44:30.197268395 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.10.28.1632141620.a8837d3 +Version: 0.10.29.1634038025.85bfc3f Provides: obs-service-obs_scm, obs-service-tar Binary: obs-service-tar_scm Maintainer: Adrian Schroeter <adrian(a)suse.de> ++++++ obs-service-tar_scm-0.10.28.1632141620.a8837d3.tar.gz -> obs-service-tar_scm-0.10.29.1634038025.85bfc3f.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/.pylintrc new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/.pylintrc --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/.pylintrc 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/.pylintrc 2021-10-12 13:27:05.000000000 +0200 @@ -84,7 +84,7 @@ # a feature request to improve pylint in this respect: # https://github.com/PyCQA/pylint/issues/246 -disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,missing-docstring,old-style-class,bad-whitespace,consider-using-with +disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,missing-docstring,old-style-class,bad-whitespace,consider-using-with,consider-using-f-string [REPORTS] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/.pylinttestsrc new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/.pylinttestsrc --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/.pylinttestsrc 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/.pylinttestsrc 2021-10-12 13:27:05.000000000 +0200 @@ -84,7 +84,7 @@ # a feature request to improve pylint in this respect: # https://github.com/PyCQA/pylint/issues/246 -disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,missing-docstring,old-style-class,bad-whitespace,duplicate-code,too-many-public-methods,protected-access,too-many-locals,consider-using-with +disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,missing-docstring,old-style-class,bad-whitespace,duplicate-code,too-many-public-methods,protected-access,too-many-locals,consider-using-with,c onsider-using-f-string [REPORTS] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/TarSCM/cli.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/TarSCM/cli.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/TarSCM/cli.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/TarSCM/cli.py 2021-10-12 13:27:05.000000000 +0200 @@ -26,7 +26,7 @@ aloc_tmp, _ = subprocess.Popen(['locale', '-a'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate() - aloc = dict() + aloc = {} for tloc in aloc_tmp.split(b'\n'): aloc[tloc] = 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/TarSCM/scm/git.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/TarSCM/scm/git.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/TarSCM/scm/git.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/TarSCM/scm/git.py 2021-10-12 13:27:05.000000000 +0200 @@ -21,6 +21,7 @@ class Git(Scm): scm = 'git' + _stash_pop_required = False def _get_scm_cmd(self): """Compose a GIT-specific command line using http proxies""" @@ -94,6 +95,8 @@ if 'LANG' in os.environ: lang_bak = os.environ['LANG'] os.environ['LANG'] = "C" + + logging.debug("[switch_revision] GIT STASHING") stash_text = self.helpers.safe_run( self._get_scm_cmd() + ['stash'], cwd=self.clone_dir)[1] @@ -117,11 +120,8 @@ sys.exit('%s: No such revision' % self.revision) if stash_text != "No local changes to save\n": - logging.debug("[switch_revision] GIT STASHING") - self.helpers.run_cmd( - self._get_scm_cmd() + ['stash', 'pop'], - cwd=self.clone_dir, - interactive=True) + self._stash_pop_required = [self.get_current_branch(), + self.get_current_commit()] if lang_bak: os.environ['LANG'] = lang_bak @@ -318,7 +318,13 @@ def get_current_commit(self): return self.helpers.safe_run(self._get_scm_cmd() + ['rev-parse', 'HEAD'], - self.clone_dir)[1] + self.clone_dir)[1].rstrip() + + def get_current_branch(self): + return self.helpers.safe_run(self._get_scm_cmd() + ['rev-parse', + '--abbrev-ref', + 'HEAD'], + self.clone_dir)[1].rstrip() def _ref_exists(self, rev): rcode, _ = self.helpers.run_cmd( @@ -405,9 +411,26 @@ self.helpers.safe_run( cmd, cwd=self.clone_dir, interactive=sys.stdout.isatty()) - # no cleanup is necessary for git def cleanup(self): - pass + logging.debug("Doing cleanup") + if self._stash_pop_required: + logging.debug("Stash pop required!") + branch = self._stash_pop_required[0] + commit = self._stash_pop_required[1] + self.helpers.safe_run( + self._get_scm_cmd() + ['checkout', branch], + self.clone_dir) + + self.helpers.safe_run( + self._get_scm_cmd() + ['reset', '--hard', commit], + self.clone_dir) + + self.helpers.safe_run( + self._get_scm_cmd() + ['stash', 'pop'], + cwd=self.clone_dir, + interactive=True) + self._stash_pop_required = False + return True def check_url(self): """check if url is a remote url""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/TarSCM/tasks.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/TarSCM/tasks.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/TarSCM/tasks.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/TarSCM/tasks.py 2021-10-12 13:27:05.000000000 +0200 @@ -67,9 +67,8 @@ if args.appimage: # we read the SCM config from appimage.yml - filehandle = open('appimage.yml') - self.data_map = yaml.safe_load(filehandle) - filehandle.close() + with open('appimage.yml', encoding='utf-8') as filehandle: + self.data_map = yaml.safe_load(filehandle) args.use_obs_scm = True build_scms = () try: @@ -88,9 +87,8 @@ elif args.snapcraft: # we read the SCM config from snapcraft.yaml instead # getting it via parameters - filehandle = open('snapcraft.yaml') - self.data_map = yaml.safe_load(filehandle) - filehandle.close() + with open('snapcraft.yaml', encoding='utf-8') as filehandle: + self.data_map = yaml.safe_load(filehandle) args.use_obs_scm = True # run for each part an own task for part in self.data_map['parts'].keys(): @@ -128,7 +126,7 @@ # we prefix our own here to be sure to not overwrite user files, # if he is using us in "disabled" mode new_file = args.outdir + '/_service:snapcraft:snapcraft.yaml' - with open(new_file, 'w') as outfile: + with open(new_file, 'w', encoding='utf-8') as outfile: outfile.write(yaml.dump(self.data_map, default_flow_style=False)) @@ -152,8 +150,8 @@ return args # is it a branch request? - ofh = open("_branch_request", "r") - dat = json.load(ofh) + with open("_branch_request", "r", encoding='utf-8') as ofh: + dat = json.load(ofh) if dat.get('object_kind') == 'merge_request': # gitlab merge request args.url = dat['project']['http_url'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/archiveobscpiotestcases.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/archiveobscpiotestcases.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/archiveobscpiotestcases.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/archiveobscpiotestcases.py 2021-10-12 13:27:05.000000000 +0200 @@ -62,7 +62,8 @@ infofile = os.path.join(outdir, bname + ".obsinfo") self.assertTrue(os.path.isfile(cpiofile)) self.assertTrue(os.path.isfile(infofile)) - data = yaml.safe_load(open(infofile, 'r')) + with open(infofile, 'r', encoding='UTF-8') as fhl: + data = yaml.safe_load(fhl) self.assertDictEqual( data, { 'name': bname, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/commontests.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/commontests.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/commontests.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/commontests.py 2021-10-12 13:27:05.000000000 +0200 @@ -283,7 +283,6 @@ ) self.scmlogs.nextlog() - self.postRun() def test_switch_revision_and_subdir(self): self._switch_revision_and_subdir() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/fixtures.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/fixtures.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/fixtures.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/fixtures.py 2021-10-12 13:27:05.000000000 +0200 @@ -118,9 +118,8 @@ newly_created.append(subdir) for fname in ('a', subdir + '/b'): - fhandle = open(fname, 'w') - fhandle.write(str(new_rev)) - fhandle.close() + with open(fname, 'w', encoding="UTF-8") as fhn: + fhn.write(str(new_rev)) self.scmlogs.annotate("Wrote %s to %s" % (new_rev, fname)) # we never commit through symlink 'c' but instead see the updated @@ -156,9 +155,8 @@ new_rev = self.next_commit_rev(wdir) fname = 'd' - cfh = open(fname, 'w') - cfh.write(str(new_rev)) - cfh.close() + with open(fname, 'w', encoding='UTF-8') as cfh: + cfh.write(str(new_rev)) self.scmlogs.annotate("Wrote %s to %s" % (new_rev, fname)) self.safe_run('add .') date = self.get_committer_date() @@ -167,7 +165,8 @@ self.scmlogs.annotate("Created 1 commit; now at %s" % (new_rev)) def touch(self, fname, times=None): - with open(os.path.join(self.wdir, fname), 'a'): + fpath = os.path.join(self.wdir, fname) + with open(fpath, 'a', encoding='UTF-8'): os.utime(fname, times) def remove(self, fname): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/gittests.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/gittests.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/gittests.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/gittests.py 2021-10-12 13:27:05.000000000 +0200 @@ -204,7 +204,9 @@ dirents = self.assertNumDirents(self.outdir, expected_dirents) self.assertTrue('_servicedata' in dirents, '_servicedata in %s' % repr(dirents)) - sdat = open(os.path.join(self.outdir, '_servicedata')).read() + sdf = os.path.join(self.outdir, '_servicedata') + with open(sdf, 'r', encoding='UTF-8') as sdatf: + sdat = sdatf.read() expected = ( r"\s*<servicedata>" r"\s*<service name=\"tar_scm\">" @@ -295,8 +297,7 @@ # create fix.create_repo(r_dir) - f_h = open('f1', 'a') - f_h.close() + fix.touch('f1') fix.safe_run('add .') fix.safe_run('commit -m "initial commit"') @@ -368,7 +369,7 @@ repo_path = fix.repo_path os.chdir(repo_path) os.mkdir("test") - with open("test/myfile.txt", 'w') as file: + with open("test/myfile.txt", 'w', encoding="UTF-8") as file: file.write("just for testing") fix.safe_run('add test') fix.safe_run('commit -m "added tests"') @@ -391,16 +392,21 @@ # git._stash_and_merge() would not be executed repo_dir = os.path.join(self.pkgdir, 'repo') fix.safe_run('clone %s %s' % (fix.wdir, repo_dir)) + test_txt = os.path.join(repo_dir, 'test.txt') + fix.touch(test_txt) + file4 = os.path.join(repo_dir, 'file.4') + with open(file4, 'a', encoding='UTF-8') as fh4: + fh4.write("just for testing") # disable cachedirectory (would not be used with osc by default) os.environ['CACHEDIRECTORY'] = "" # enable osc mode os.environ['OSC_VERSION'] = "1" + self.tar_scm_std("--revision", '0.0.3', '--version', '0.0.3') # reset osc mode del os.environ['OSC_VERSION'] - # check result expected = [ 'repo-0.0.3', @@ -409,7 +415,13 @@ 'repo-0.0.3/file.1', 'repo-0.0.3/file.3', 'repo-0.0.3/subdir', - 'repo-0.0.3/subdir/b' + 'repo-0.0.3/subdir/b', + 'repo-0.0.3/test.txt' ] - tar = os.path.join(self.test_dir, 'out', 'repo-0.0.3.tar') + tar = os.path.join(self.outdir, 'repo-0.0.3.tar') self.assertTarIsDeeply(tar, expected) + cwd = os.getcwd() + os.chdir(repo_dir) + status = fix.safe_run('status -s') + os.chdir(cwd) + self.assertTrue(status[0] == b' M file.4\n?? test.txt\n') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/hgfixtures.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/hgfixtures.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/hgfixtures.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/hgfixtures.py 2021-10-12 13:27:05.000000000 +0200 @@ -29,7 +29,7 @@ os.makedirs(self.repo_path) os.chdir(self.repo_path) self.safe_run('init') - with open('.hg/hgrc', 'w') as rcf: + with open('.hg/hgrc', 'w', encoding='UTF-8') as rcf: rcf.write("[ui]\nusername = %s\n" % self.name_and_email) self.wdir = self.repo_path diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/scmlogs.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/scmlogs.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/scmlogs.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/scmlogs.py 2021-10-12 13:27:05.000000000 +0200 @@ -75,16 +75,13 @@ os.environ['SCM_INVOCATION_LOG'] = self.current_log_path def annotate(self, msg): - log = open(self.current_log_path, 'a') - log.write('# ' + msg + "\n") print(msg) - log.close() + with open(self.current_log_path, 'a', encoding="UTF-8") as log: + log.write('# ' + msg + "\n") def read(self): if not os.path.exists(self.current_log_path): return '<no %s log>' % self.scm - - log = open(self.current_log_path) - loglines = log.readlines() - log.close() + with open(self.current_log_path, 'r', encoding="UTF-8") as log: + loglines = log.readlines() return loglines diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/svnfixtures.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/svnfixtures.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/svnfixtures.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/svnfixtures.py 2021-10-12 13:27:05.000000000 +0200 @@ -37,7 +37,7 @@ quietrun('svnadmin create ' + self.repo_path) # allow revprop changes to explicitly set svn:date hook = self.repo_path + '/hooks/pre-revprop-change' - with open(hook, 'w') as cfh: + with open(hook, 'w', encoding='UTF-8') as cfh: cfh.write("#!/bin/sh\nexit 0;\n") sta = os.stat(hook) @@ -60,7 +60,7 @@ return new_rev def get_metadata(self, formatstr): - return self.safe_run('log -n1' % formatstr)[0] + return self.safe_run("log -n1 %s" % formatstr)[0] def record_rev(self, *args): rev_num = args[0] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/svntests.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/svntests.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/svntests.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/svntests.py 2021-10-12 13:27:05.000000000 +0200 @@ -56,7 +56,8 @@ dirents = self.assertNumDirents(self.outdir, expected_dirents) self.assertTrue('_servicedata' in dirents, '_servicedata in %s' % repr(dirents)) - sdat = open(os.path.join(self.outdir, '_servicedata')).read() + with open(os.path.join(self.outdir, '_servicedata')) as sdata: + sdat = sdata.read() expected = ( r"<servicedata>" r"\s*<service name=\"tar_scm\">" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/tartests.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/tartests.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/tartests.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/tartests.py 2021-10-12 13:27:05.000000000 +0200 @@ -26,14 +26,13 @@ info = os.path.join(wdir, "test.obsinfo") print("INFOFILE: '%s'" % info) os.chdir(self.pkgdir) - obsinfo = open(info, 'w') - obsinfo.write( - "name: pkgname\n" + - "version: 0.1.1\n" + - "mtime: 1476683264\n" + - "commit: fea6eb5f43841d57424843c591b6c8791367a9e5\n" - ) - obsinfo.close() + with open(info, 'w', encoding='UTF-8') as obsinfo: + obsinfo.write( + "name: pkgname\n" + + "version: 0.1.1\n" + + "mtime: 1476683264\n" + + "commit: fea6eb5f43841d57424843c591b6c8791367a9e5\n" + ) src_dir = os.path.join(wdir, "pkgname") os.mkdir(src_dir) self.tar_scm_std() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/tasks.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/tasks.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/tasks.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/tasks.py 2021-10-12 13:27:05.000000000 +0200 @@ -163,10 +163,9 @@ tasks.generate_list() tasks.finalize() self._restore_cwd() - scf = open(os.path.join(self.cli.outdir, - '_service:snapcraft:snapcraft.yaml'), 'r') - got = scf.read() - scf.close() + snf = os.path.join(self.cli.outdir,'_service:snapcraft:snapcraft.yaml') + with open(snf, 'r', encoding='utf-8') as scf: + got = scf.read() self.assertEqual(got, expected) def test_cleanup(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/testassertions.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/testassertions.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/testassertions.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/testassertions.py 2021-10-12 13:27:05.000000000 +0200 @@ -140,11 +140,18 @@ self.update_cache_command, should_not_find) def assertTarIsDeeply(self, tar, expected): + if not os.path.isfile(tar): + print("File '%s' not found" % tar) + return False th = tarfile.open(tar) got = [] for mem in th.getmembers(): got.append(mem.name) - self.assertTrue(got == expected) + result = got == expected + if result == False: + print("got: %r" % got) + print("expected: %r" % expected) + self.assertTrue(result) def _find(self, logpath, loglines, should_find, should_not_find): found = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/testenv.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/testenv.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/testenv.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/testenv.py 2021-10-12 13:27:05.000000000 +0200 @@ -109,46 +109,6 @@ os.unsetenv('CACHEDIRECTORY') os.environ['CACHEDIRECTORY'] = "" - def tearDown(self): - print() - print("--v-v-- begin tearDown for %s --v-v--" % self.test_name) - self.postRun() - print("--^-^-- end tearDown for %s --^-^--" % self.test_name) - print() - - def postRun(self): - self.service = {'mode': 'disabled'} - if os.path.exists(self.outdir): - self.simulate_osc_postrun() - - def simulate_osc_postrun(self): - """ - Simulate osc copying files from temporary --outdir back to - package source directory, so our tests can catch any - potential side-effects due to the persistent nature of the - package source directory. - """ - - temp_dir = self.outdir - pdir = self.pkgdir - service = self.service - - # This code was copied straight out of osc/core.py's - # Serviceinfo.execute() (and then line-wrapped for PEP8): - # --------- 8< --------- 8< --------- 8< --------- 8< --------- - if service['mode'] == "disabled" or \ - service['mode'] == "trylocal" or \ - service['mode'] == "localonly": - for filename in os.listdir(temp_dir): - shutil.move(os.path.join(temp_dir, filename), - os.path.join(pdir, filename)) - else: - for filename in os.listdir(temp_dir): - shutil.move(os.path.join(temp_dir, filename), - os.path.join(pdir, - "_service::" + filename)) - # --------- 8< --------- 8< --------- 8< --------- 8< --------- - def tar_scm_std(self, *args, **kwargs): return self.tar_scm(self.stdargs(*args), **kwargs) @@ -190,13 +150,7 @@ succeeded = True ret = 0 try: - tracer = trace.Trace( - ignoredirs=[sys.prefix, sys.exec_prefix], - trace=0, - count=0) - tracer.runfunc(TarSCM.run) - # r = tracer.results() - # r.write_results(show_missing=True, coverdir=".") + TarSCM.run() except SystemExit as exp: print("raised system exit %r" % exp) if exp.code == 0: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/unittestcases.py new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/unittestcases.py --- old/obs-service-tar_scm-0.10.28.1632141620.a8837d3/tests/unittestcases.py 2021-09-20 14:40:20.000000000 +0200 +++ new/obs-service-tar_scm-0.10.29.1634038025.85bfc3f/tests/unittestcases.py 2021-10-12 13:27:05.000000000 +0200 @@ -287,14 +287,13 @@ print("INFOFILE: '%s'" % info) # check for slash in name - f_h = open(info, 'w') - f_h.write( - "name: test/test\n" + - "version: 0.1.1\n" + - "mtime: 1476683264\n" + - "commit: fea6eb5f43841d57424843c591b6c8791367a9e5\n" - ) - f_h.close() + with open(info, 'w', encoding='UTF-8') as f_h: + f_h.write( + "name: test/test\n" + + "version: 0.1.1\n" + + "mtime: 1476683264\n" + + "commit: fea6eb5f43841d57424843c591b6c8791367a9e5\n" + ) os.chdir(wdir) six.assertRaisesRegex( self, @@ -304,14 +303,13 @@ ) # check for slash in version - f_h = open(info, 'w') - f_h.write( - "name: test\n" + - "version: a/0.1.1\n" + - "mtime: 1476683264\n" + - "commit: fea6eb5f43841d57424843c591b6c8791367a9e5\n" - ) - f_h.close() + with open(info, 'w', encoding='UTF-8') as f_h: + f_h.write( + "name: test\n" + + "version: a/0.1.1\n" + + "mtime: 1476683264\n" + + "commit: fea6eb5f43841d57424843c591b6c8791367a9e5\n" + ) os.chdir(wdir) six.assertRaisesRegex( self, @@ -321,14 +319,13 @@ ) # check for .. in version - f_h = open(info, 'w') - f_h.write( - "name: test\n" + - "version: ..0.1.1\n" + - "mtime: 1476683264\n" + - "commit: fea6eb5f43841d57424843c591b6c8791367a9e5\n" - ) - f_h.close() + with open(info, 'w', encoding='UTF-8') as f_h: + f_h.write( + "name: test\n" + + "version: ..0.1.1\n" + + "mtime: 1476683264\n" + + "commit: fea6eb5f43841d57424843c591b6c8791367a9e5\n" + ) os.chdir(wdir) six.assertRaisesRegex( self,

1 0