From db56bdb965c95322e20801ffca3d2637ce2d9349799573b8d842453e0727c551 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 30 Oct 2020 15:40:59 +0000 Subject: [PATCH 1/2] Accepting request 844902 from home:bfrogers:branches:devel:tools:scm - Fix setup.py to correctly identify the project packages git_deps and git_deps/listener. These were not being packaged and as a result the git-deps command was simply failing - Fix issue with unbuffered text I/O under python3, as identified in https://github.com/aspiers/git-deps/pull/93/commits/6beebe034b5c6fd19d73edd774dbf424ea183fee I couldn't make sense of the "test" which accompanies the source code. i think it's out of date, so I didn't add any tests OBS-URL: https://build.opensuse.org/request/show/844902 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/git-deps?expand=0&rev=4 --- ...th-unbuffered-text-I-O-under-python3.patch | 29 +++++++++++++++++++ dont-use-st-markdown.patch | 2 +- git-deps.changes | 9 ++++++ git-deps.spec | 13 +++++---- 4 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 Fix-issue-with-unbuffered-text-I-O-under-python3.patch diff --git a/Fix-issue-with-unbuffered-text-I-O-under-python3.patch b/Fix-issue-with-unbuffered-text-I-O-under-python3.patch new file mode 100644 index 0000000..a7eb376 --- /dev/null +++ b/Fix-issue-with-unbuffered-text-I-O-under-python3.patch @@ -0,0 +1,29 @@ +From 8d9a7d6dacad4a033f2a4c800ff32137e6e894da Mon Sep 17 00:00:00 2001 +From: Bruce Rogers +Date: Wed, 28 Oct 2020 18:09:24 -0600 +Subject: [PATCH] Fix issue with unbuffered text I/O under python3 + +This fix is in an upstream pull request, as shown here: +https://github.com/aspiers/git-deps/pull/93/commits/6beebe034b5c6fd19d73edd774dbf424ea183fee + +Signed-off-by: Bruce Rogers +--- + git_deps/cli.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/git_deps/cli.py b/git_deps/cli.py +index 9e8b0ab..7882088 100755 +--- a/git_deps/cli.py ++++ b/git_deps/cli.py +@@ -135,7 +135,7 @@ def main(args): + if options.serve: + serve(options) + else: +- sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0) ++ sys.stdout = os.fdopen(sys.stdout.fileno(), 'w') + try: + cli(options, args) + except InvalidCommitish as e: +-- +2.29.0 + diff --git a/dont-use-st-markdown.patch b/dont-use-st-markdown.patch index 265b55c..42c83e3 100644 --- a/dont-use-st-markdown.patch +++ b/dont-use-st-markdown.patch @@ -37,7 +37,7 @@ + "Topic :: Utilities" + ], + scripts = ["bin/git-fixup"], -+ # packages = "git_deps", ++ packages = ["git_deps", "git_deps/listener"], + # data_files = "share/git_deps = share/gitfile-handler.desktop", setup_requires=[ 'six', diff --git a/git-deps.changes b/git-deps.changes index fe6b585..422e743 100644 --- a/git-deps.changes +++ b/git-deps.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Oct 29 15:48:48 UTC 2020 - Bruce Rogers + +- Fix setup.py to correctly identify the project packages git_deps + and git_deps/listener. These were not being packaged and as a + result the git-deps command was simply failing +- Fix issue with unbuffered text I/O under python3, as identified in +https://github.com/aspiers/git-deps/pull/93/commits/6beebe034b5c6fd19d73edd774dbf424ea183fee + ------------------------------------------------------------------- Mon Jun 1 17:25:50 UTC 2020 - Matej Cepl diff --git a/git-deps.spec b/git-deps.spec index 7af63f3..a55ed0a 100644 --- a/git-deps.spec +++ b/git-deps.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: git-deps @@ -26,13 +27,14 @@ Group: Development/Tools/Version Control URL: https://github.com/aspiers/git-deps Source: %{name}-%{version}.tar.xz Patch0: dont-use-st-markdown.patch -BuildRequires: python-rpm-macros -BuildRequires: fdupes -BuildRequires: %{python_module setuptools} +Patch1: Fix-issue-with-unbuffered-text-I-O-under-python3.patch BuildRequires: %{python_module pip} -BuildRequires: %{python_module wheel} -BuildRequires: %{python_module six} BuildRequires: %{python_module pygit2} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module six} +BuildRequires: %{python_module wheel} +BuildRequires: fdupes +BuildRequires: python-rpm-macros Requires: python-pygit2 # for html subpackage Requires: python-Flask @@ -48,6 +50,7 @@ file bugs at https://github.com/aspiers/git-deps/issues %package html Summary: Tool to analyze git deps - HTML parts +Group: Development/Tools/Version Control %description html Documentation for git-deps. From 721eee61ada134e387f936aef2baed12b20a53d6908fc62270f95936afc577de Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 30 Oct 2020 16:02:54 +0000 Subject: [PATCH 2/2] Accepting request 845066 from home:mcepl:branches:devel:tools:scm - Add Fix-issue-with-unbuffered-text-I-O-under-python3.patch, which fixes the issue with unbuffered text I/O under python3, (gh#aspiers/git-deps#93). OBS-URL: https://build.opensuse.org/request/show/845066 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/git-deps?expand=0&rev=5 --- git-deps.changes | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git-deps.changes b/git-deps.changes index 422e743..c13b58c 100644 --- a/git-deps.changes +++ b/git-deps.changes @@ -4,8 +4,9 @@ Thu Oct 29 15:48:48 UTC 2020 - Bruce Rogers - Fix setup.py to correctly identify the project packages git_deps and git_deps/listener. These were not being packaged and as a result the git-deps command was simply failing -- Fix issue with unbuffered text I/O under python3, as identified in -https://github.com/aspiers/git-deps/pull/93/commits/6beebe034b5c6fd19d73edd774dbf424ea183fee +- Add Fix-issue-with-unbuffered-text-I-O-under-python3.patch, + which fixes the issue with unbuffered text I/O under python3, + (gh#aspiers/git-deps#93). ------------------------------------------------------------------- Mon Jun 1 17:25:50 UTC 2020 - Matej Cepl