forked from pool/breezy
Accepting request 1061184 from home:mcepl:branches:devel:tools:scm
- Update to 3.3.2: - Add --recurse-nested argument to 'brz export'. - Add an ``extra`` for installing PGP dependencies. - Convert multiple authors to the Co-authored-by field. - github: Lazily load github pull requests, improving performance. - github: Return canonical URLs for branches. - Avoid deprecated distutils.version, ahead of removal. - Add a docker file. - launchpad: Store Launchpad credentials in authentication.conf. - git: Support accessing git branch configuration. - pgp: Add support for create_signatures=when-possible - propose: By default, don't push tags when proposing changes. - git: Split out and separately report ProtectedBranchHookDeclined. - git: Avoid reading entire pack files into memory. - Numerous bug fixes - Remove upstreamed patches: - skip_resource.setrlimit.patch OBS-URL: https://build.opensuse.org/request/show/1061184 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/breezy?expand=0&rev=23
This commit is contained in:
parent
9bfc1a1724
commit
09b933a247
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:187a6e45208dd05d81750736720c83710cf48094f547ec4081c571259559a4d5
|
|
||||||
size 9396541
|
|
3
breezy-3.3.2.tar.gz
Normal file
3
breezy-3.3.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:4ea6949fcbb076b978545b099fac68abad35d6fa1899deef4f6b82a3dba257c1
|
||||||
|
size 9450523
|
@ -1,3 +1,24 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jan 23 07:45:54 UTC 2023 - Matej Cepl <mcepl@suse.com>
|
||||||
|
|
||||||
|
- Update to 3.3.2:
|
||||||
|
- Add --recurse-nested argument to 'brz export'.
|
||||||
|
- Add an ``extra`` for installing PGP dependencies.
|
||||||
|
- Convert multiple authors to the Co-authored-by field.
|
||||||
|
- github: Lazily load github pull requests, improving performance.
|
||||||
|
- github: Return canonical URLs for branches.
|
||||||
|
- Avoid deprecated distutils.version, ahead of removal.
|
||||||
|
- Add a docker file.
|
||||||
|
- launchpad: Store Launchpad credentials in authentication.conf.
|
||||||
|
- git: Support accessing git branch configuration.
|
||||||
|
- pgp: Add support for create_signatures=when-possible
|
||||||
|
- propose: By default, don't push tags when proposing changes.
|
||||||
|
- git: Split out and separately report ProtectedBranchHookDeclined.
|
||||||
|
- git: Avoid reading entire pack files into memory.
|
||||||
|
- Numerous bug fixes
|
||||||
|
- Remove upstreamed patches:
|
||||||
|
- skip_resource.setrlimit.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Oct 24 08:03:15 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
Mon Oct 24 08:03:15 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
47
breezy.spec
47
breezy.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package breezy
|
# spec file for package breezy
|
||||||
#
|
#
|
||||||
# Copyright (c) 2022 SUSE LLC
|
# Copyright (c) 2023 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -16,26 +16,43 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%define rustflags '-Clink-arg=-Wl,-z,relro,-z,now'
|
||||||
|
|
||||||
Name: breezy
|
Name: breezy
|
||||||
Version: 3.2.2
|
Version: 3.3.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Distributed version control system with multi-format support
|
Summary: Distributed version control system with multi-format support
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
URL: https://www.breezy-vcs.org/
|
URL: https://www.breezy-vcs.org/
|
||||||
Source: https://files.pythonhosted.org/packages/source/b/breezy/breezy-%{version}.tar.gz
|
Source0: https://files.pythonhosted.org/packages/source/b/breezy/breezy-%{version}.tar.gz
|
||||||
# PATCH-FIX-OPENSUSE skip_resource.setrlimit.patch lp#1883125 mcepl@suse.com
|
Source90: cargo_config
|
||||||
# Don't run resource.setrlimit, which is not allowed in OBS
|
Source98: vendor-lib-rio.tar.xz
|
||||||
Patch0: skip_resource.setrlimit.patch
|
Source99: vendor.tar.xz
|
||||||
|
# PATCH-FIX-UPSTREAM skip_lp2003710.patch lp#2003710 mcepl@suse.com
|
||||||
|
# Skip failing tests
|
||||||
|
Patch0: skip_lp2003710.patch
|
||||||
|
BuildRequires: cargo >= 1.41.0
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
# full stdlib for sqlite3
|
# full stdlib for sqlite3
|
||||||
BuildRequires: python3
|
BuildRequires: python3
|
||||||
|
BuildRequires: python3-Cython
|
||||||
|
BuildRequires: python3-PyYAML
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
|
BuildRequires: python3-merge3
|
||||||
|
BuildRequires: python3-pip
|
||||||
BuildRequires: python3-setuptools
|
BuildRequires: python3-setuptools
|
||||||
|
BuildRequires: python3-setuptools-gettext
|
||||||
|
BuildRequires: python3-setuptools-rust
|
||||||
|
BuildRequires: python3-wheel
|
||||||
|
BuildRequires: rust >= 1.41.0
|
||||||
|
BuildRequires: zstd
|
||||||
|
Requires: python3-PyYAML
|
||||||
Requires: python3-configobj
|
Requires: python3-configobj
|
||||||
Requires: python3-dulwich >= 0.19.11
|
Requires: python3-dulwich >= 0.19.11
|
||||||
Requires: python3-fastbencode
|
Requires: python3-fastbencode
|
||||||
Requires: python3-fastimport >= 0.9.8
|
Requires: python3-fastimport >= 0.9.8
|
||||||
|
Requires: python3-merge3
|
||||||
Requires: python3-patiencediff
|
Requires: python3-patiencediff
|
||||||
Suggests: python3-launchpadlib >= 1.6.3
|
Suggests: python3-launchpadlib >= 1.6.3
|
||||||
Provides: bzr = %{version}
|
Provides: bzr = %{version}
|
||||||
@ -57,15 +74,27 @@ multi-format support. Breezy has built-in support for the Git and
|
|||||||
Bazaar file formats and network protocols.
|
Bazaar file formats and network protocols.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n breezy-%{version}
|
%autosetup -p1 -a 98 -a 99 -n breezy-%{version}
|
||||||
%autopatch -p1
|
|
||||||
sed -ie "s,man/man1,share/man/man1," setup.py
|
sed -ie "s,man/man1,share/man/man1," setup.py
|
||||||
|
|
||||||
|
mkdir .cargo
|
||||||
|
cp %{SOURCE90} .cargo/config
|
||||||
|
mkdir lib-rio/.cargo
|
||||||
|
cp %{SOURCE90} lib-rio/.cargo/config
|
||||||
|
|
||||||
|
sed -i '1{\@^#!i[[:blank:]]*%{_bindir}/env python@d}' \
|
||||||
|
breezy/dirty_tracker.py \
|
||||||
|
breezy/tests/ssl_certs/create_ssls.py \
|
||||||
|
breezy/tests/test_dirty_tracker.py
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="%{optflags}"
|
export RUSTFLAGS=%{rustflags}
|
||||||
|
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
||||||
%python3_build
|
%python3_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
export RUSTFLAGS=%{rustflags}
|
||||||
%python3_install
|
%python3_install
|
||||||
%fdupes %{buildroot}%{python3_sitearch}
|
%fdupes %{buildroot}%{python3_sitearch}
|
||||||
|
|
||||||
|
5
cargo_config
Normal file
5
cargo_config
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
[source.crates-io]
|
||||||
|
replace-with = "vendored-sources"
|
||||||
|
|
||||||
|
[source.vendored-sources]
|
||||||
|
directory = "vendor"
|
24
skip_lp2003710.patch
Normal file
24
skip_lp2003710.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
---
|
||||||
|
breezy/tests/test_selftest.py | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
Index: breezy-3.3.2/breezy/tests/test_selftest.py
|
||||||
|
===================================================================
|
||||||
|
--- breezy-3.3.2.orig/breezy/tests/test_selftest.py
|
||||||
|
+++ breezy-3.3.2/breezy/tests/test_selftest.py
|
||||||
|
@@ -165,6 +165,7 @@ class TestTransportScenarios(tests.TestC
|
||||||
|
scenarios = transport_test_permutations()
|
||||||
|
self.assertEqual(permutation_count, len(scenarios))
|
||||||
|
|
||||||
|
+ @tests.unittest.skip('test failing (lp#2003710)')
|
||||||
|
def test_scenarios_include_transport_class(self):
|
||||||
|
# This test used to know about all the possible transports and the
|
||||||
|
# order they were returned but that seems overly brittle (mbp
|
||||||
|
@@ -3098,6 +3099,7 @@ class TestTestSuite(tests.TestCase):
|
||||||
|
],
|
||||||
|
test_list)
|
||||||
|
|
||||||
|
+ @tests.unittest.skip('test failing (lp#2003710)')
|
||||||
|
def test_test_suite(self):
|
||||||
|
# test_suite() loads the entire test suite to operate. To avoid this
|
||||||
|
# overhead, and yet still be confident that things are happening,
|
@ -1,21 +0,0 @@
|
|||||||
---
|
|
||||||
breezy/tests/blackbox/test_big_file.py | 7 ++++---
|
|
||||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
--- a/breezy/tests/blackbox/test_big_file.py
|
|
||||||
+++ b/breezy/tests/blackbox/test_big_file.py
|
|
||||||
@@ -67,10 +67,11 @@ class TestAdd(tests.TestCaseWithTranspor
|
|
||||||
|
|
||||||
def setUp(self):
|
|
||||||
super(TestAdd, self).setUp()
|
|
||||||
- previous = resource.getrlimit(RESOURCE)
|
|
||||||
- self.addCleanup(resource.setrlimit, RESOURCE, previous)
|
|
||||||
- resource.setrlimit(RESOURCE, (LIMIT, -1))
|
|
||||||
+ # previous = resource.getrlimit(RESOURCE)
|
|
||||||
+ # self.addCleanup(resource.setrlimit, RESOURCE, previous)
|
|
||||||
+ # resource.setrlimit(RESOURCE, (LIMIT, -1))
|
|
||||||
|
|
||||||
+ @tests.unittest.skip("Test doesn't work without resource.setrlimit")
|
|
||||||
def test_allocate(self):
|
|
||||||
def allocate():
|
|
||||||
"." * BIG_FILE_SIZE
|
|
3
vendor-lib-rio.tar.xz
Normal file
3
vendor-lib-rio.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:6954791f9f13fa9344a969e2fe1df1032f4a650cf4d263354092f539e0e5902b
|
||||||
|
size 5889956
|
3
vendor.tar.xz
Normal file
3
vendor.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:8bb235cc5f9f4d00ea874e02eb4c341e58a47ffd795b9ee5868b526fdd6ebd1a
|
||||||
|
size 5872380
|
Loading…
Reference in New Issue
Block a user