Merge pull request #13395 from Carreau/repack-xz

Fix sdist building/uploading

long_description.rst

@@ -0,0 +1,37 b''
+IPython provides a rich toolkit to help you make the most out of using Python
+interactively.  Its main components are:
+
+* A powerful interactive Python shell
+* A `Jupyter <https://jupyter.org/>`_ kernel to work with Python code in Jupyter
+notebooks and other interactive frontends.
+
+The enhanced interactive Python shells have the following main features:
+
+* Comprehensive object introspection.
+
+* Input history, persistent across sessions.
+
+* Caching of output results during a session with automatically generated
+references.
+
+* Extensible tab completion, with support by default for completion of python
+variables and keywords, filenames and function keywords.
+
+* Extensible system of 'magic' commands for controlling the environment and
+performing many tasks related either to IPython or the operating system.
+
+* A rich configuration system with easy switching between different setups
+(simpler than changing $PYTHONSTARTUP environment variables every time).
+
+* Session logging and reloading.
+
+* Extensible syntax processing for special purpose situations.
+
+* Access to the system shell with user-extensible alias system.
+
+* Easily embeddable in other Python programs and GUIs.
+
+* Integrated access to the pdb debugger and the Python profiler.
+
+The latest development version is always available from IPython's `GitHub
+site <http://github.com/ipython>`_.

MANIFEST.in

@@ -2,13 +2,13 b' include README.rst'
 include COPYING.rst
 include LICENSE
 include setupbase.py
-include setupegg.py
 include MANIFEST.in
 include pytest.ini
 include mypy.ini
 include .mailmap
 include .flake8
 include .pre-commit-config.yaml
+include long_description.rst
 
 recursive-exclude tools *
 exclude tools

setup.cfg

@@ -4,44 +4,7 b' version = attr: IPython.core.release.__version__'
 url = https://ipython.org
 description = IPython: Productive Interactive Computing
 long_description_content_type = text/x-rst
-long_description = IPython provides a rich toolkit to help you make the most out of using Python
-    interactively.  Its main components are:
-
-    * A powerful interactive Python shell
-    * A `Jupyter <https://jupyter.org/>`_ kernel to work with Python code in Jupyter
-    notebooks and other interactive frontends.
-
-    The enhanced interactive Python shells have the following main features:
-
-    * Comprehensive object introspection.
-
-    * Input history, persistent across sessions.
-
-    * Caching of output results during a session with automatically generated
-    references.
-
-    * Extensible tab completion, with support by default for completion of python
-    variables and keywords, filenames and function keywords.
-
-    * Extensible system of 'magic' commands for controlling the environment and
-    performing many tasks related either to IPython or the operating system.
-
-    * A rich configuration system with easy switching between different setups
-    (simpler than changing $PYTHONSTARTUP environment variables every time).
-
-    * Session logging and reloading.
-
-    * Extensible syntax processing for special purpose situations.
-
-    * Access to the system shell with user-extensible alias system.
-
-    * Easily embeddable in other Python programs and GUIs.
-
-    * Integrated access to the pdb debugger and the Python profiler.
-
-    The latest development version is always available from IPython's `GitHub
-    site <http://github.com/ipython>`_.
-
+long_description = file: long_description.rst
 license_file = LICENSE
 project_urls =
     Documentation = https://ipython.readthedocs.io/
@@ -58,7 +21,7 b' classifiers ='
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Topic :: System :: Shell
+    Topic :: System :: Shells
 
 
 [options]

tools/build_release

@@ -3,9 +3,8 b''
 """
 import os
 import sys
-from shutil import rmtree
 
-from toollib import sh, pjoin, get_ipdir, cd, sdists, buildwheels
+from toollib import sh, get_ipdir, cd, build_command
 
 def build_release():
 
@@ -14,8 +13,8 b' def build_release():'
     cd(ipdir)
 
     # Build source and binary distros
-    sh(sdists)
-    buildwheels()
+    sh(build_command)
+    # don't try to change, xz, bz2 deprecated.
     sh(' '.join([sys.executable, 'tools/retar.py', 'dist/*.gz']))
 
 if __name__ == '__main__':

tools/release

@@ -11,7 +11,7 b' from subprocess import call'
 import sys
 
 from toollib import (get_ipdir, pjoin, cd, execfile, sh, archive,
-        sdists, archive_user, archive_dir, buildwheels)
+         archive_user, archive_dir)
 from gh_api import post_download
 
 # Get main ipython dir, this will raise if it doesn't pass some checks
@@ -63,7 +63,7 b" if 'upload' in sys.argv:"
     # Make target dir if it doesn't exist
     print('1. Uploading IPython to archive.ipython.org')
     sh('ssh %s "mkdir -p %s/release/%s" ' % (archive_user, archive_dir, version))
-    sh('scp *.tar.gz *.whl %s' % release_site)
+    sh('scp *.tar.gz *.tar.xz *.whl %s' % release_site)
 
     print('2. Uploading backup files...')
     cd(ipbackupdir)
@@ -71,7 +71,7 b" if 'upload' in sys.argv:"
 
     print('3. Uploading to PyPI using twine')
     cd(distdir)
-    call(['twine', 'upload'] + to_upload)
+    call(['twine', 'upload', '--verbose'] + to_upload)
 
 else:
     # Build, but don't upload
@@ -85,7 +85,6 b' else:'
 
     cd(ipdir)
 
-    buildwheels()
     print("`./release upload` to upload source distribution on PyPI and ipython archive")
     sys.exit(0)
 

tools/retar.py

@@ -35,7 +35,13 b' old_buf = io.BytesIO()'
 with open(path, "rb") as f:
     old_buf.write(f.read())
 old_buf.seek(0)
-old = tarfile.open(fileobj=old_buf, mode="r:gz")
+if path.name.endswith("gz"):
+    r_mode = "r:gz"
+if path.name.endswith("bz2"):
+    r_mode = "r:bz2"
+if path.name.endswith("xz"):
+    raise ValueError("XZ is deprecated but it's written nowhere")
+old = tarfile.open(fileobj=old_buf, mode=r_mode)
 
 buf = io.BytesIO()
 new = tarfile.open(fileobj=buf, mode="w", format=tarfile.GNU_FORMAT)
@@ -46,6 +52,7 b' for i, m in enumerate(old):'
         continue
     m2 = tarfile.TarInfo(m.name)
     m2.mtime = min(timestamp, m.mtime)
+    m2.pax_headers["mtime"] = m2.mtime
     m2.size = m.size
     m2.type = m.type
     m2.linkname = m.linkname
@@ -59,9 +66,19 b' new.close()'
 old.close()
 
 buf.seek(0)
-with open(path, "wb") as f:
-    with gzip.GzipFile('', "wb", fileobj=f, mtime=timestamp) as gzf:
-        gzf.write(buf.read())
+
+if r_mode == "r:gz":
+    with open(path, "wb") as f:
+        with gzip.GzipFile("", "wb", fileobj=f, mtime=timestamp) as gzf:
+            gzf.write(buf.read())
+elif r_mode == "r:bz2":
+    import bz2
+
+    with bz2.open(path, "wb") as f:
+        f.write(buf.read())
+
+else:
+    assert False
 
 # checks the archive is valid.
 archive = tarfile.open(path)

tools/toollib.py

@@ -18,10 +18,8 b" archive = '%s:%s' % (archive_user, archive_dir)"
 
 # Build commands
 # Source dists
-sdists = './setup.py sdist --formats=gztar'
-# Binary dists
-def buildwheels():
-    sh('{python} setupegg.py bdist_wheel'.format(python=sys.executable))
+build_command = "{python} -m build".format(python=sys.executable)
+
 
 # Utility functions
 def sh(cmd):