After this commit, when both modules are imported:

- if pyproject is imported before, the warning is 'pypi-uri' is
deprecated, use '(@ (guix build-system pyproject) pypi-uri)' instead

- if python is imported before, the warning is `pypi-uri' imported from
both (guix build-system python) and (guix build-system pyproject)

This seems convenient enough to warn for deprecation in the short term,
while avoiding any breaking changes.

* guix/build-system/pyproject.scm (pypi-uri): Move the procedure from
(guix build-system python) here.

* guix/build-system/python (pypi-uri): Drop definition, import it
from (guix build-system pyproject) and deprecate it.

* gnu/packages/openldap.scm: Reorder modules to get the right warning.

* gnu/packages/pypy.scm: Likewise.

* gnu/packages/*.scm : Drop module (guix build-system python).

* tests/import/pypi.scm: Likewise.

Merges: https://codeberg.org/guix/guix/pulls/7448
Change-Id: Ib42f53bc545052eb7918a25afe9db6d5fc2cb834
Reviewed-by: Nguyễn Gia Phong <cnx@loang.net>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>

This commit was made by running this command:

  sed -e's/modify-inputs (package-\([a-z-]*\)inputs [a-zA-Z0-9-]\+)/modify-inputs \1inputs/g' -i gnu/packages/*.scm

… and then reverting individual hunks where the change would trigger unbound
variable warnings or other issues (such as ‘native-inputs’ is bound in the
body of the ‘inputs’ field, but it refers to the ‘native-inputs’ thunk defined
just above).

Change-Id: I6d94819f2809313fa1fbefc61897502ee7d66fab

This commit was made by running this command:

  sed -e's/substitute-keyword-arguments (package-arguments [a-zA-Z0-9-]\+)/substitute-keyword-arguments arguments/g' -i gnu/packages/*.scm

… and then:

  1. reverting changes from ‘gnu/packages/rust.scm’ and
     ‘gnu/packages/java.scm’ since they would incur derivation changes and/or
     breakage;
  2. reverting the change for ‘gcc-final’ in ‘gnu/packages/commencement.scm’;
  3. reverting the change for ‘onnx-optimizer’, ‘openquest’, and ‘certbot’,
     which use ‘substitute-keyword-arguments’ for arguments that are not
     inherited (and thus ‘arguments’ would be unbound);
  4. reverting the change for ‘insight-toolkit-legacy’ and ‘wine64-staging’
     which make bogus assumptions about inherited arguments.

Change-Id: I122a7cf517b6b63cae38944b5d33ade4b1f5a89c

* gnu/packages/python-xyz.scm (python-dbus-python): Rename to…
(python-dbus): … this. Change name field accordingly.
(python-dbusmock, python-screenkey): Adapt references.
* gnu/packages/admin.scm (solaar): Likewise.
* gnu/packages/gpodder.scm (gpodder): Likewise.
* gnu/packages/music.scm (jack-select): Likewise.
* gnu/packages/password-utils.scm (himitsu-secret-service): Likewise.
* gnu/packages/printers.scm (printrun): Likewise.
* gnu/packages/wm.scm (quicktile): Likewise.

Change-Id: Iaeb2f37c534a699f259d14fc770db86f79c1d7e8
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>

* gnu/packages/gpodder.scm (gpodder): Update to 3.11.5.
[phases]{check, install}: Use default phases.
{make-po-files-writable}: Remove phase.
[inputs]: Remove python-dbus; add eyed3, python-dbus-python,
python-ffmpeg-python, python-filelock, python-pillow, and
python-urllib3.
[native-inputs]: Remove python-pytest-cov and which.

Fixes: guix/guix#5401
Reported-by: Andreas Enge <andreas@enge.fr>
Change-Id: Idb83b53a860de867c3227ae61c48fcb8a00c6656

* gnu/packages/gpodder.scm (python-podcastparser): Update to 0.6.11.
[build-system]: Switch to pyproject-build-system.
[arguments]: Drop them.
[native-inputs]: Add python-pytest, python-setuptools.
[description]: Improve style.

Change-Id: Iac64df0ad178fd3c840f0c6698b1a32565809574
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>

* gnu/packages/gpodder.scm (gpodder):
[build-system]: Switch to pyproject-build-system.
[native-inputs]: Add python-setuptools.

Change-Id: I985ebde78c59f6ecb960a47efaac4240d7b48def
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>

* gnu/packages/gpodder.scm (python-mygpoclient): Update to 1.10.
[source]: Switch to git-fetch.
[build-system]: Switch to pyproject-build-system.
[arguments]<#:phases>: Refresh them.
[native-inputs]: Add python-setuptools.  Remove python-coverage,
python-nose.
[description]: Improve style.

Change-Id: Icc6a00c7ad9977bf42043ac387e81861e2f2c413
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>

* gnu/packages/gpodder.scm (libmygpo-qt)[inputs]: Replace qtbase-5 with qtbase.
[arguments]<configure-flags>: New argument.
(libmygpo-qt5): Inherit from libmygpo-qt.
* gnu/packages/music.scm (clementine)[inputs]: Replace libmygpo-qt with
libmygpo-qt5.

* gnu/packages/gpodder.scm (libmygpo-qt): Update to 1.2.0.
[source]<uri>: Use HTTPS.
<patches>: Remove field.
[arguments]: Switch to gexp.
<#:configure-flags>: Remove argument.
<#:phases>: Replace 'check phase.
* gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch: Delete file.
* gnu/packages/patches/libmygpo-qt-missing-qt5-modules.patch: Delete file.
* gnu/local.mk: Deregister the deleted patches.