Re: Git, gbp blues
Hi Guðjón! On Sun, Aug 25, 2019 at 10:01:02PM +0200, Guðjón Guðjónsson wrote: > I did follow the procedure but I don't know what to do if a patch > doesn't apply cleanly. > I did try > gbp pq import > gbp:info: Trying to apply patches at > 'c72f39a3a32b5e5c1eb7f9aaf7176e942e85d804' > gbp:warning: Patch 0004-remove-logo-privacy-issue.diff.patch failed to > apply, retrying with whitespace fixup The correct procedure is running “gbp pq import” *before* importing a new tarball. Then after importing you do “gbp pq rebase”. Sometimes I myself forget to run “gbp pq import”. In this case I do the following: - Remember the current commit SHA1; - git reset --hard origin/debian/master; # or to previous tag - gbp pq import; # this is the needed step - git checkout debian/master; # back to debian/master branch - git merge COMMIT_ID; # that you remembered before > But fixing the patches with quilt before importing them the second > time seems to fix all my problems. If it does not break the patches metadata then it also works. -- Dmitry Shachnev signature.asc Description: PGP signature
Re: Git, gbp blues
On Sun, Aug 25, 2019 at 10:01:02PM +0200, Guðjón Guðjónsson wrote: > > > Isn't this an error. Shouldn't it be git checkout? > > > $ gbp checkout debian/master > > Yes. > You mean it should be git checkout? Yes. > > If you ran gbp pq import after importing the new tarball and it didn't say > > "Patch queue branch 'patch-queue/master'. already exists. Try 'rebase' or > > 'switch' instead." this means you didn't follow the procedure you copied > > above, which includes running gbp pq import before gbp import-orig. > > I did follow the procedure but I don't know what to do if a patch > doesn't apply cleanly. You seem to be misunderstanding what I wrote. > I did try > gbp pq import > gbp:info: Trying to apply patches at > 'c72f39a3a32b5e5c1eb7f9aaf7176e942e85d804' > gbp:warning: Patch 0004-remove-logo-privacy-issue.diff.patch failed to > apply, retrying with whitespace fixup This cannot happen when you run gbp pq import before running gbp import-orig, as the wiki page tells you to do. And this cannot happen when you run it after gbp import-orig, if you also ran it before running gbp import-orig, as the wiki page tells you to do. So this can only happen if you didn't follow the procedure. -- WBR, wRAR signature.asc Description: PGP signature
Re: Git, gbp blues
Hi Andrey Thanks for the answer. On Sun, Aug 25, 2019 at 9:50 PM Andrey Rahmatullin wrote: > > Isn't this an error. Shouldn't it be git checkout? > > $ gbp checkout debian/master > Yes. You mean it should be git checkout? > > If you ran gbp pq import after importing the new tarball and it didn't say > "Patch queue branch 'patch-queue/master'. already exists. Try 'rebase' or > 'switch' instead." this means you didn't follow the procedure you copied > above, which includes running gbp pq import before gbp import-orig. I did follow the procedure but I don't know what to do if a patch doesn't apply cleanly. I did try gbp pq import gbp:info: Trying to apply patches at 'c72f39a3a32b5e5c1eb7f9aaf7176e942e85d804' gbp:warning: Patch 0004-remove-logo-privacy-issue.diff.patch failed to apply, retrying with whitespace fixup gbp:error: Failed to apply '/home/gudjon/debian/python-modules/qscintilla2/debian/patches/0004-remove-logo-privacy-issue.diff.patch': Error running git apply: error: patch failed: doc/Scintilla/index.html:64 error: doc/Scintilla/index.html: patch does not apply gbp:error: Couldn't apply patches But fixing the patches with quilt before importing them the second time seems to fix all my problems. I can push my changes if you want to take a look? Regards Gudjon
Re: Git, gbp blues
On Sun, Aug 25, 2019 at 09:40:16PM +0200, Guðjón Guðjónsson wrote: > Isn't this an error. Shouldn't it be git checkout? > $ gbp checkout debian/master Yes. > But I still find working with patch queues difficult especially with > new upstream where the old patches don't apply correctly. > I tried to do > $ gbp pq import > but it fails because one of the patches doesn't apply. > So I fixed the patches in the old way using > quilt push -f > quilt edit > quilt refresh > And after having fixed all the patches I could do > $gbp pq import > $gbp pq export > and the diff seems ok. > Is this the correct procedure? The correct procedure is documented on that page. """ Rebase the patches: $ gbp pq rebase $ gbp pq export """ If you ran gbp pq import after importing the new tarball and it didn't say "Patch queue branch 'patch-queue/master'. already exists. Try 'rebase' or 'switch' instead." this means you didn't follow the procedure you copied above, which includes running gbp pq import before gbp import-orig. -- WBR, wRAR signature.asc Description: PGP signature
Re: py2-rm: a few leaf packages to work on
On Sunday, August 25, 2019 10:55:55 AM EDT Matthias Klose wrote: > On 24.08.19 07:03, Scott Kitterman wrote: > > On Thursday, August 15, 2019 8:08:41 AM EDT Thomas Goirand wrote: > >> Hi there! > >> > >> According to the daily graph I built here: > >> http://py2graph.infomaniak.ch/py2.7.deps.svg > >> > >> we can work on Python 2 removal for the below packages. Note that I have > >> *not* checked for reverse dependencies, please do so before working on a > >> package. The list isn't exhaustive at all, and didn't check if a package > >> is just a remaining curft, though it's hopefully still helpful as a TODO > >> list. > > > > The arch all decruft is caught up now, so it ought to be easier now to > > tell > > what still has rdepends left. > > is this now done automatically, or just a manual effort? The DAK change to make it automatic hasn't been merged yet, so it's not fully automatic. What we do get now is an automatically generated list of what needs removing so it's about 98% easier to do than it was before. Scott K
Git, gbp blues
Hi list I'm sorry to say but I am no friend of git for Debian packaging but I am a big wannabe. This page has been very helpful: https://wiki.debian.org/Python/GitPackaging It says $ gbp pq import which has more or less solved my problems when trying to upgrade a package. Isn't this an error. Shouldn't it be git checkout? $ gbp checkout debian/master $ gbp import-orig --pristine-tar --uscan rebase and export. But I still find working with patch queues difficult especially with new upstream where the old patches don't apply correctly. I tried to do $ gbp pq import but it fails because one of the patches doesn't apply. So I fixed the patches in the old way using quilt push -f quilt edit quilt refresh And after having fixed all the patches I could do $gbp pq import $gbp pq export and the diff seems ok. Is this the correct procedure? Regards Gudjon
Re: py2-rm: a few leaf packages to work on
On 24.08.19 07:03, Scott Kitterman wrote: > On Thursday, August 15, 2019 8:08:41 AM EDT Thomas Goirand wrote: >> Hi there! >> >> According to the daily graph I built here: >> http://py2graph.infomaniak.ch/py2.7.deps.svg >> >> we can work on Python 2 removal for the below packages. Note that I have >> *not* checked for reverse dependencies, please do so before working on a >> package. The list isn't exhaustive at all, and didn't check if a package >> is just a remaining curft, though it's hopefully still helpful as a TODO >> list. > > The arch all decruft is caught up now, so it ought to be easier now to tell > what still has rdepends left. is this now done automatically, or just a manual effort? Matthias
Re: py2-rm: a few leaf packages to work on
On 25.08.19 00:08, Thomas Goirand wrote: > On 8/24/19 10:38 AM, Neil Williams wrote: >> How is that graph turned into a list of packages? It's too large to >> scan manually. > > Well, I did it manually... and this is only a short list, as a > suggestion for a todo list, so nothing exhaustive... I very much would > welcome something automated. > > BTW, working on this (as I've assigned myself to do a Python 2 support > removal for at least one package a day), I've seen that lots of the > packages are just bit-rotting stuff that has sometimes been uploaded > only once, and that nobody cares about anymore. We should have spotted > these earlier, IMO, and probably ping the maintainers. > > I'm still waiting on Piotr (or someone else) to do the mail to -devel > and the mass-bug-filling ... Any news on this? I'm on the mass bug filing, but I need the tracker updated again. And I need to go through the suggestions here on the list how to work on things to make the py2-rm issues more readable. I didn't hear back from Piotr after DebConf, but I think what we need is dh-python generating python2/python2.7 dependencies instead of python dependencies, and maybe make shebang rewriting to python2/python2.7 the default. Matthias
Bug#935700: RM: sphinx-issuetracker -- ROM; Python 2 only; dead upstream; no reverse dependencies
Package: ftp.debian.org Severity: normal User: debian-python@lists.debian.org Usertag: py2removal Last upstream commit was in 2014, and upstream does not respond to pull requests like [1]. Reverse dependencies checked with with dak rm -Rn sphinx-issuetracker. [1]: https://github.com/ignatenkobrain/sphinxcontrib-issuetracker/pull/13 -- Dmitry Shachnev signature.asc Description: PGP signature
Re: Removing py2 support from python-xattr
On Sat, Aug 24, 2019 at 08:03:55PM -0400, Scott Kitterman wrote: > On Saturday, August 24, 2019 6:28:10 PM EDT Thomas Goirand wrote: > > Please, let's generalize and see the whole picture. There will be A LOT > > more cases like this one, and I don't think that waiting forever will > > solve the situation. It is my opinion that we should set a kind of > > policy (ie: wait for how long?) and then act... > > If it were me, I'd go ahead and file a serious bug indicating a dependency of > the package is about to be removed. And then, once it is autorm from testing without the maintainer saying anything, open an RM bug for the rdep. -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. more about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `- signature.asc Description: PGP signature
Re: Python2/Qt4 removal
Hi Scott Great, thanks. I will make one upgrade with python2/Qt4 and then start preparing for its removal. Regards Gudjon
Re: Watch file for riverbankcomputing (QScintilla)
Hi Dmitry Thanks a lot, this works perfectly > version=3 > opts=dversionmangle=s/\+dfsg// \ > https://www.riverbankcomputing.com/software/qscintilla/download \ > /static/Downloads/QScintilla/[\d.]+/QScintilla_gpl-([\d.]+)\.tar\.gz I first made the mistake of removing the space after "download" wihch doesn't work but with the space it works perfectly. Regards Gudjon
Bug#935685: RM: python-opster -- RoM; no Python 3 support and no reverse deps; low popcon
Package: ftp.debian.org Severity: normal User: debian-python@lists.debian.org Usertag: py2removal https://github.com/piranha/opster/ supports Python 3. Popcon is 14. Reverse deps checked with dak rm -Rnb python-opster -- WBR, wRAR signature.asc Description: PGP signature
Bug#935689: RM: python-unipath -- RoM; ancient; no Python 3 support and no reverse deps; low popcon
Package: ftp.debian.org Severity: normal User: debian-python@lists.debian.org Usertag: py2removal No upstream releases since 2008. Popcon is 17. Reverse deps checked with dak rm -Rnb python-unipath -- WBR, wRAR signature.asc Description: PGP signature
Bug#935687: RM: python-txosc -- RoM; ancient; no Python 3 support and no reverse deps; low popcon
Package: ftp.debian.org Severity: normal User: debian-python@lists.debian.org Usertag: py2removal There is no upstream development at https://bitbucket.org/arjan/txosc since 2011. Popcon is 6. Reverse deps checked with dak rm -Rnb python-txosc -- WBR, wRAR signature.asc Description: PGP signature
Bug#935688: RM: unittest-xml-reporting -- RoM; no Python 3 support and no reverse deps; low popcon
Package: ftp.debian.org Severity: normal User: debian-python@lists.debian.org Usertag: py2removal Latest upstream code supports Python 3. There is a Python 3 request bug, #737790, 5.5 years old. Popcon is 34. Reverse deps checked with dak rm -Rnb python-xmlrunner -- WBR, wRAR signature.asc Description: PGP signature
