#3 Update to git-review 2.2.0
Merged 2 years ago by zaitcev. Opened 2 years ago by terjeros.
rpms/ terjeros/git-review rawhide  into  rawhide

file modified
+1
@@ -8,3 +8,4 @@ 

  /git-review-1.25.0.tar.gz

  /git-review-1.26.0.tar.gz

  /git-review-1.28.0.tar.gz

+ /git-review-2.2.0.tar.gz

file modified
+23 -34
@@ -1,58 +1,42 @@ 

- # Enable Python 3 only for Fedora

- %global with_python3 1

- 

  Name:		git-review

- Version:	1.28.0

- Release:	10%{?dist}

+ Version:	2.2.0

+ Release:	2%{?dist}

  Summary:	A Git helper for integration with Gerrit

  

  License:	ASL 2.0

- URL:		https://opendev.org/opendev/%{name}

- Source0:	http://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz

+ URL:		https://opendev.org/opendev/git-review

+ # Created by:

+ #   $ git clone https://opendev.org/opendev/git-review.git

+ #   $ cd git-review

+ #   $ git checkout 2.2.0

+ #   $ python setup.py sdist

+ #   $ cp dist/git-review-2.2.0.tar.gz ..

+ Source0:	git-review-%{version}.tar.gz

  

  BuildArch:	noarch

  

- %if 0%{?with_python3}

  BuildRequires:	python3-devel

  BuildRequires:	python3-pbr

  BuildRequires:	python3-setuptools

- %else

- BuildRequires:	python2-devel

- BuildRequires:	python2-pbr

- BuildRequires:	python2-setuptools

- %endif

  

  Requires:	git

- %if 0%{?with_python3}

  Requires:	python3-requests

  Requires:	python3-setuptools

- %else

- Requires:	python2-requests

- Requires:	python2-setuptools

- %endif

  

  %description

- An extension for source control system Git that creates and manages review

- requests in the patch management system Gerrit. It replaces the rfc.sh script.

+ An extension for source control system Git that creates and manages

+ review requests in the patch management system Gerrit. It replaces the

+ rfc.sh script.

  

  %prep

  %setup -q

  

  %build

- %if 0%{?with_python3}

  %py3_build

- %else

- %py2_build

- %endif

  sed -i 's/\r//' LICENSE

  

  %install

- %if 0%{?with_python3}

  %py3_install

- %else

- %py2_install

- %endif

- 

  mkdir -p %{buildroot}%{_sysconfdir}/%{name}/

  

  # We do not save ".gitreview" as dot.gitreview because the man page has it too.
@@ -66,15 +50,20 @@ 

  %{_bindir}/git-review

  %{_mandir}/man1/git-review.1.gz

  # Our package name is git-review, but setup.py installs with underscore.

- %if 0%{?with_python3}

  %{python3_sitelib}/git_review/

  %{python3_sitelib}/git_review-%{version}-py%{python3_version}*.egg-info/

- %else

- %{python2_sitelib}/git_review/

- %{python2_sitelib}/git_review-%{version}-py%{python2_version}*.egg-info/

- %endif

  

  %changelog

+ * Mon Jan 10 2022 Terje Rosten <terje.rosten@ntnu.no> - 2.2.0-2

+ - Use script to create tarball to avoid PyPi

+ 

+ * Fri Dec 17 2021 Terje Rosten <terje.rosten@ntnu.no> - 2.2.0-1

+ - Update to 2.2.0 (needed by git 2.34.0+)

+ - Only Python 3 is supported

+ - Releases is done on pypi

+ - Avoid macro in url, makes cut and paste hard

+ - Make lines shorter than 80 chars

+ 

  * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.28.0-10

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (git-review-1.28.0.tar.gz) = c29ad530abcfcf136548daf4865e1fe7c5819f6d4b11424c5c1425312c68fdc0e4073e009667b992e3f3db3396c7db618940c7f6e5be8b26e9d0d1b94fd078a4

+ SHA512 (git-review-2.2.0.tar.gz) = 93d8df33a151b0919fd7327b75a0e1bfa773bb9639986de65e65fd9408a2acd1ca4feacff65bdaae648cbd03ca227a95740fc1cd33411b93c222fcbadc577db2

  • Update to 2.2.0 (needed by git 2.34.0+)
  • Only Python 3 is supported
  • Releases is done on pypi
  • Avoid macro in url, makes cut and paste hard
  • Make lines shorter than 80 chars

Thank you, this looks good to me. Also it saves me to propose the same patch. I would merge it.

I am against identifying PyPI as the master source.

See this for my reasoning:
https://zaitcev.livejournal.com/263602.html

I am exploring other possibilities:
http://lists.openstack.org/pipermail/openstack-discuss/2022-January/026519.html

Ok, but releases on https://tarballs.opendev.org/openstack/git-review/ has stopped.

PyPi is sole source for release tarballs.

So instead we need to use script to do git clone and git archive then?

1 new commit added

  • Use script to create tarball to avoid PyPi
2 years ago

FYI: the web gui lacks the tags, but they are present in the repo:

$ git remote -v
origin https://opendev.org/opendev/git-review.git (fetch)
origin https://opendev.org/opendev/git-review.git (push)

$ git tag | tac
upstream/1.15
upstream/1.14
debian/1.14-1
2.2.0
2.1.0
2.0.0.0rc1
2.0.0
1.9
1.8
1.7
1.6
1.5
1.4
1.3
1.28.0.0a1
1.28.0
[snip]

Well, if Jeremy wants to do it, I cannot disagree too much.

Pull-Request has been merged by zaitcev

2 years ago