Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.python > #10409 > unrolled thread

Questions about salsa and Git

Back to article view | Back to linux.debian.maint.python

Contents

  Questions about salsa and Git Guðjón Guðjónsson <gudjon.i.gudjonsson@gmail.com> - 2018-04-10 09:30 +0200
    Re: Questions about salsa and Git Scott Kitterman <debian@kitterman.com> - 2018-04-10 12:50 +0200
      Re: Questions about salsa and Git Simon McVittie <smcv@debian.org> - 2018-04-10 13:20 +0200
        Re: Questions about salsa and Git Brian May <bam@debian.org> - 2018-04-13 01:40 +0200
      Re: Questions about salsa and Git Sandro Tosi <morph@debian.org> - 2018-04-10 17:00 +0200
    Re: Questions about salsa and Git Scott Kitterman <debian@kitterman.com> - 2018-04-10 12:50 +0200

#10409 — Questions about salsa and Git

[Multipart message — attachments visible in raw view] — view raw

Hi list

I have to admit that I have never become comfortable with the Debian Git
workflow
but I know I have to learn to use it.

Following the advice on
https://wiki.debian.org/Python/GitPackaging

Does the following advice hold true after the move to salsa?

$ git clone git+ssh://git.debian.org/git/python-modules/tools/python-modules.git


I have cloned the eric repository.
git branch -a
* debian/master
  remotes/origin/HEAD -> origin/debian/master
  remotes/origin/debian/master
  remotes/origin/lenny
  remotes/origin/pristine-tar
  remotes/origin/svn
  remotes/origin/upstream


Is debian/master == master?
Shall I checkout and pull the pristine-tar and upstream
git checkout remotes/origin/upstream -b upstream
git pull
git checkout remotes/origin/pristine-tar -b upstream
git pull

To update the package, shall I copy the new upstream over the upstream
branch,
commit and then do
$ pristine-tar commit ../srcpkgname_1.0.orig.tar.gz upstream
?

Regarding the now deprecated get-orig-source target.
Do you have any example on how to put the mechanism into the watch file?

Regards
Gudjon

[toc] | [next] | [standalone]

#10410

On April 10, 2018 7:24:18 AM UTC, "Guðjón Guðjónsson" <gudjon.i.gudjonsson@gmail.com> wrote:
>Hi list
>
>I have to admit that I have never become comfortable with the Debian
>Git
>workflow
>but I know I have to learn to use it.
>
>Following the advice on
>https://wiki.debian.org/Python/GitPackaging

Use this instead:
https://wiki.debian.org/Python/GitPackagingPQ

Note: page not updated for the move to Salsa, but generally accurate.

>Does the following advice hold true after the move to salsa?
>
>$ git clone
>git+ssh://git.debian.org/git/python-modules/tools/python-modules.git

No.  That's on alioth.  You can use the web UI on https://salsa.debian.org/ to find the URL for your package.

>I have cloned the eric repository.
>git branch -a
>* debian/master
>  remotes/origin/HEAD -> origin/debian/master
>  remotes/origin/debian/master
>  remotes/origin/lenny
>  remotes/origin/pristine-tar
>  remotes/origin/svn
>  remotes/origin/upstream
>
>
>Is debian/master == master?
>Shall I checkout and pull the pristine-tar and upstream
>git checkout remotes/origin/upstream -b upstream
>git pull
>git checkout remotes/origin/pristine-tar -b upstream
>git pull
>
>To update the package, shall I copy the new upstream over the upstream
>branch,
>commit and then do
>$ pristine-tar commit ../srcpkgname_1.0.orig.tar.gz upstream
>?

This is all explained on the wiki page referenced above.

>Regarding the now deprecated get-orig-source target.
>Do you have any example on how to put the mechanism into the watch
>file?

The mechanism is in gbp, not the watch file.  Once again, see the wiki page link.

Scott K

[toc] | [prev] | [next] | [standalone]

#10412

On Tue, 10 Apr 2018 at 10:41:41 +0000, Scott Kitterman wrote:
> On April 10, 2018 7:24:18 AM UTC, "Guðjón Guðjónsson" <gudjon.i.gudjonsson@gmail.com> wrote:
> >Following the advice on
> >https://wiki.debian.org/Python/GitPackaging
> 
> Use this instead:
> https://wiki.debian.org/Python/GitPackagingPQ

Is this now official policy for new/updated/converted Python modules
maintained by DPMT?

Is it official policy for new/updated/converted Python applications
maintained by PAPT?

At the moment each of those pages says that the Python teams have chosen
the relevant packaging system and that the other packaging system is
forbidden, which is confusing at best.

If there is consensus that gbp pq + DEP 14 is recommended for Python
packages and the older git-dpm setup is deprecated, then anyone with a
wiki account can fix those pages, but I for one don't want to make those
edits until someone who can speak for the team specifically says it.

(I'd like to convert tap.py to gbp pq as soon as it isn't considered to
be hostile to do so.)

Thanks,
    smcv

[toc] | [prev] | [next] | [standalone]

#10416

Simon McVittie <smcv@debian.org> writes:

> Is this now official policy for new/updated/converted Python modules
> maintained by DPMT?
>
> Is it official policy for new/updated/converted Python applications
> maintained by PAPT?

I am not exactly an authoritive figure, but I believe the answer to both
of these is yes.

It is possible that there are a number of packages that still need to be
converted. I had a script on aloth to do this, it might need updating
for salsa. Especially as it relied on direct access to the git directory
to change the default branch.

> At the moment each of those pages says that the Python teams have chosen
> the relevant packaging system and that the other packaging system is
> forbidden, which is confusing at best.

Both pages do need updating.
-- 
Brian May <bam@debian.org>

[toc] | [prev] | [next] | [standalone]

#10413

>>Does the following advice hold true after the move to salsa?
>>
>>$ git clone
>>git+ssh://git.debian.org/git/python-modules/tools/python-modules.git
>
> No.  That's on alioth.  You can use the web UI on https://salsa.debian.org/ to find the URL for your package.

well, that's on alioth because nobody (that has the grants to create
new projects on salsa.d.o/python-team/tools) has ported it to salsa,
but that repo has been updated to check out DPMT repos from salsa (see
last commits at
https://anonscm.debian.org/cgit/python-modules/tools/python-modules.git)

-- 
Sandro "morph" Tosi
My website: http://sandrotosi.me/
Me at Debian: http://wiki.debian.org/SandroTosi
G+: https://plus.google.com/u/0/+SandroTosi

[toc] | [prev] | [next] | [standalone]

#10411

On April 10, 2018 7:24:18 AM UTC, "Guðjón Guðjónsson" <gudjon.i.gudjonsson@gmail.com> wrote:
>Hi list
>
>I have to admit that I have never become comfortable with the Debian
>Git
>workflow
>but I know I have to learn to use it.
>
>Following the advice on
>https://wiki.debian.org/Python/GitPackaging

Use this instead:
https://wiki.debian.org/Python/GitPackagingPQ

Note: page not updated for the move to Salsa, but generally accurate.

>Does the following advice hold true after the move to salsa?
>
>$ git clone
>git+ssh://git.debian.org/git/python-modules/tools/python-modules.git

No.  That's on alioth.  You can use the web UI on https://salsa.debian.org/ to find the URL for your package.

>I have cloned the eric repository.
>git branch -a
>* debian/master
>  remotes/origin/HEAD -> origin/debian/master
>  remotes/origin/debian/master
>  remotes/origin/lenny
>  remotes/origin/pristine-tar
>  remotes/origin/svn
>  remotes/origin/upstream
>
>
>Is debian/master == master?
>Shall I checkout and pull the pristine-tar and upstream
>git checkout remotes/origin/upstream -b upstream
>git pull
>git checkout remotes/origin/pristine-tar -b upstream
>git pull
>
>To update the package, shall I copy the new upstream over the upstream
>branch,
>commit and then do
>$ pristine-tar commit ../srcpkgname_1.0.orig.tar.gz upstream
>?

This is all explained on the wiki page referenced above.

>Regarding the now deprecated get-orig-source target.
>Do you have any example on how to put the mechanism into the watch
>file?

The mechanism is in gbp, not the watch file.  Once again, see the wiki page link.

Scott K

[toc] | [prev] | [standalone]

Back to top | Article view | linux.debian.maint.python

csiph-web