| |
@@ -1,7 +1,7 @@
|
| |
From 22af1c13f637587c0182b3363e98d15f7e150eb7 Mon Sep 17 00:00:00 2001
|
| |
From: Lumir Balhar <lbalhar@redhat.com>
|
| |
Date: Thu, 30 Jun 2022 14:05:02 +0200
|
| |
- Subject: [PATCH 1/4] Fix test compatibility with setuptools_scm 7
|
| |
+ Subject: [PATCH 1/6] Fix test compatibility with setuptools_scm 7
|
| |
|
| |
---
|
| |
hatch.toml | 1 +
|
| |
@@ -52,7 +52,7 @@
|
| |
From 234285322bc655885da1cebed510bba6c7960232 Mon Sep 17 00:00:00 2001
|
| |
From: Lumir Balhar <lbalhar@redhat.com>
|
| |
Date: Thu, 30 Jun 2022 22:35:53 +0200
|
| |
- Subject: [PATCH 2/4] Revert "Fix test compatibility with setuptools_scm 7"
|
| |
+ Subject: [PATCH 2/6] Revert "Fix test compatibility with setuptools_scm 7"
|
| |
|
| |
This reverts commit 22af1c13f637587c0182b3363e98d15f7e150eb7.
|
| |
---
|
| |
@@ -104,7 +104,7 @@
|
| |
From 46b2c3e21ad229887ad4bf20c24b5ff5ad3e3c0e Mon Sep 17 00:00:00 2001
|
| |
From: Lumir Balhar <lbalhar@redhat.com>
|
| |
Date: Thu, 30 Jun 2022 22:39:39 +0200
|
| |
- Subject: [PATCH 3/4] Fix test compatibility with setuptools_scm 7
|
| |
+ Subject: [PATCH 3/6] Fix test compatibility with setuptools_scm 7
|
| |
|
| |
---
|
| |
tests/test_build.py | 3 ++-
|
| |
@@ -129,7 +129,7 @@
|
| |
From: =?UTF-8?q?Lum=C3=ADr=20=27Frenzy=27=20Balhar?=
|
| |
<frenzy.madness@gmail.com>
|
| |
Date: Thu, 30 Jun 2022 22:43:44 +0200
|
| |
- Subject: [PATCH 4/4] Update tests/test_build.py
|
| |
+ Subject: [PATCH 4/6] Update tests/test_build.py
|
| |
|
| |
Co-authored-by: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
|
| |
---
|
| |
@@ -149,3 +149,49 @@
|
| |
assert lines[3].endswith("version = '1.2.3'")
|
| |
|
| |
|
| |
+
|
| |
+ From 58ac821346b83c2786afef907eb76fed515c37fe Mon Sep 17 00:00:00 2001
|
| |
+ From: Ofek Lev <ofekmeister@gmail.com>
|
| |
+ Date: Thu, 21 Jul 2022 00:13:45 -0400
|
| |
+ Subject: [PATCH 5/6] Apply suggestions from code review
|
| |
+
|
| |
+ ---
|
| |
+ tests/test_build.py | 2 +-
|
| |
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
| |
+
|
| |
+ diff --git a/tests/test_build.py b/tests/test_build.py
|
| |
+ index 303c76d..e00665f 100644
|
| |
+ --- a/tests/test_build.py
|
| |
+ +++ b/tests/test_build.py
|
| |
+ @@ -75,7 +75,7 @@ def test_write(new_project_write):
|
| |
+ assert os.path.isfile(version_file)
|
| |
+
|
| |
+ lines = read_file(version_file).splitlines()
|
| |
+ - assert lines[3].startswith(("version =", "__version__ ="))
|
| |
+ + assert lines[3].startswith(('version =', '__version__ ='))
|
| |
+ assert lines[3].endswith("version = '1.2.3'")
|
| |
+
|
| |
+
|
| |
+
|
| |
+ From c8dd05568daad8d43bc3f5eba59252130e43258e Mon Sep 17 00:00:00 2001
|
| |
+ From: Ofek Lev <ofekmeister@gmail.com>
|
| |
+ Date: Thu, 21 Jul 2022 00:16:39 -0400
|
| |
+ Subject: [PATCH 6/6] Apply suggestions from code review
|
| |
+
|
| |
+ ---
|
| |
+ tests/test_build.py | 2 +-
|
| |
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
| |
+
|
| |
+ diff --git a/tests/test_build.py b/tests/test_build.py
|
| |
+ index e00665f..6b907ef 100644
|
| |
+ --- a/tests/test_build.py
|
| |
+ +++ b/tests/test_build.py
|
| |
+ @@ -75,7 +75,7 @@ def test_write(new_project_write):
|
| |
+ assert os.path.isfile(version_file)
|
| |
+
|
| |
+ lines = read_file(version_file).splitlines()
|
| |
+ - assert lines[3].startswith(('version =', '__version__ ='))
|
| |
+ + assert lines[3].startswith(('version =', '__version__ ='))
|
| |
+ assert lines[3].endswith("version = '1.2.3'")
|
| |
+
|
| |
+
|
| |
music
commented 2 years ago
The patch is based on the version of upstream PR#9 that was actually merged.