diff options
| -rw-r--r-- | interpreter-maintenance.rst | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/interpreter-maintenance.rst b/interpreter-maintenance.rst index 6e15c07..a0688da 100644 --- a/interpreter-maintenance.rst +++ b/interpreter-maintenance.rst @@ -33,18 +33,11 @@ release tag:: git rebase v3.7.6 You may also add additional changes via ``git cherry-pick``. Once -the new patches are ready, create the tarball and upload it, then -create the tag and push it:: +the new patches are ready, use the ``python-patchset`` script from +``app-portage/mgorny-dev-scripts`` to create the patchset and upload +it:: - mkdir python-gentoo-patches-3.7.6 - cd python-gentoo-patches-3.7.6 - git format-patch v3.7.6 - cd .. - tar -cf python-gentoo-patches-3.7.6.tar python-gentoo-patches-3.7.6 - xz -9 python-gentoo-patches-3.7.6.tar - scp python-gentoo-patches-3.7.6.tar.xz ... - git tag gentoo-3.7.6 - git push --tags gentoo + python-patchset 3.7.6 PyPy @@ -66,19 +59,24 @@ Technically, ``pypy`` can be bumped after ``pypy3-exe`` and used to test it but it should not be pushed before ``pypy3-exe-bin`` is ready, as it would force all users to switch to source form implicitly. +Patchsets are managed in a similar way as CPython, using the `Gentoo +fork of PyPy repository`_. They need to be rebased against upstream +``release-pypyX.Y-vM.N.O`` tags, and created using ``pypy-patchset`` +script, e.g.:: + + pypy-patchset 3.11 7.3.23 + The binary packages are built using Docker_ nowadays, using binpkg-docker_ scripts. To produce them, create a ``local.diff`` containing changes related to PyPy bump and run ``${arch}-pypy${ver}``. For example:: - git clone https://github.com/mgorny/binpkg-docker + git clone https://anongit.gentoo.org/git/proj/binpkg-docker.git cd binpkg-docker - (cd ~/git/gentoo && git diff origin) > local.diff - make {amd64,arm64,ppc64le,x86}{,-musl}-pypy{,3_10,3_11} - -The resulting binary packages will be placed in your home directory, -in ``~/binpkg/${arch}/pypy``. Upload them and use them to bump -``pypy*-exe-bin``. + ( cd ~/git/gentoo && git diff origin ) > local.diff + make {amd64,arm64,ppc64le,x86}{,-musl}-pypy{,3_11} + make rsync + make kup Adding a new Python implementation @@ -319,8 +317,10 @@ dependencies will be added or vendored into flit_core. .. _Gentoo fork of CPython repository: https://gitweb.gentoo.org/fork/cpython.git/ +.. _Gentoo fork of PyPy repository: + https://gitweb.gentoo.org/fork/pypy.git/ .. _Docker: https://www.docker.com/ -.. _binpkg-docker: https://github.com/mgorny/binpkg-docker +.. _binpkg-docker: https://gitweb.gentoo.org/proj/binpkg-docker.git .. _implementation tables: https://wiki.gentoo.org/wiki/Project:Python/Implementations .. _QA reports: https://qa-reports.gentoo.org/ |