[Python-checkins] release: Fix add-to-pydotorg.py so it handles all the new Windows binaries.

[larry.hastings]

https://hg.python.org/release/rev/436c71fbc19d
changeset:   97:436c71fbc19d
user:        Larry Hastings <larry at hastings.org>
date:        Fri May 29 01:32:45 2015 -0700
summary:
  Fix add-to-pydotorg.py so it handles all the new Windows binaries.
Also, removed an unused function (I think it got inlined).

files:
  add-to-pydotorg.py |  26 ++++++++++++--------------
  release.py         |   9 +++++----
  2 files changed, 17 insertions(+), 18 deletions(-)


diff --git a/add-to-pydotorg.py b/add-to-pydotorg.py
--- a/add-to-pydotorg.py
+++ b/add-to-pydotorg.py
@@ -55,7 +55,19 @@
     (rx(r'\.tar\.xz$'),          ('XZ compressed source tarball', 3, '')),
     (rx(r'\.amd64\.msi$'),       ('Windows x86-64 MSI installer', 1,
                                   'for AMD64/EM64T/x64, not Itanium processors')),
+    (rx(r'-amd64-webinstall\.exe$'), ('Windows x86-64 web-based installer', 1,
+                                  'for AMD64/EM64T/x64, not Itanium processors')),
+    (rx(r'-embed-amd64\.zip$'),       ('Windows x86-64 embeddable zip file', 1,
+                                  'for AMD64/EM64T/x64, not Itanium processors')),
+    (rx(r'-embed-amd64\.exe$'),       ('Windows x86-64 embeddable installer', 1,
+                                  'for AMD64/EM64T/x64, not Itanium processors')),
+    (rx(r'-amd64\.exe$'),       ('Windows x86-64 executable installer', 1,
+                                  'for AMD64/EM64T/x64, not Itanium processors')),
     (rx(r'\.msi$'),              ('Windows x86 MSI installer', 1, '')),
+    (rx(r'-embed-win32\.zip$'),         ('Windows x86 embeddable zip file', 1, '')),
+    (rx(r'-embed-win32\.exe$'),         ('Windows x86 embeddable installer', 1, '')),
+    (rx(r'-webinstall\.exe$'),   ('Windows x86 web-based installer', 1, '')),
+    (rx(r'\.exe$'),              ('Windows x86 executable installer', 1, '')),
     (rx(r'\.chm$'),              ('Windows help file', 1, '')),
     (rx(r'amd64-pdb\.zip$'),     ('Windows debug information files for 64-bit binaries', 1, '')),
     (rx(r'-pdb\.zip$'),          ('Windows debug information files', 1, '')),
@@ -90,20 +102,6 @@
     m = tag_cre.match(release)
     return ".".join(m.groups()[:3])
 
-def build_release_dict(release, reldate, is_latest, page_pk):
-    """Return a dictionary with all needed fields for a Release object."""
-    return dict(
-        name = 'Python ' + release,
-        slug = slug_for(release),
-        version = int(release[0]),
-        is_published = True,
-        release_date = reldate,  # in "YYYY-MM-ddTHH:MM:SS"
-        pre_release = bool(release[5:]),
-        release_page = '/api/v1/pages/page/%s/' % page_pk, # XXX doesn't work yet
-        release_notes_url = changelog_for(release),
-        show_on_download_page = True,
-    )
-
 def build_file_dict(release, rfile, rel_pk, file_desc, os_pk, add_desc):
     """Return a dictionary with all needed fields for a ReleaseFile object."""
     d = dict(
diff --git a/release.py b/release.py
--- a/release.py
+++ b/release.py
@@ -34,7 +34,7 @@
 
 def run_cmd(args, silent=False):
     cmd = SPACE.join(args)
-    if not silent:
+    if 1: # not silent:
         print('Executing %s' % cmd)
     try:
         if silent:
@@ -250,9 +250,9 @@
                 except OSError:
                     pass
 
-            if tag.is_final:
+            if 1 or tag.is_final:
                 docdist = build_docs()
-        if tag.is_final:
+        if 1 or tag.is_final:
             shutil.copytree(docdist, 'docs')
 
         with changed_dir(os.path.join(archivename, 'Doc')):
@@ -283,7 +283,8 @@
     with tempfile.TemporaryDirectory() as venv:
         run_cmd(['virtualenv', venv])
         pip = os.path.join(venv, 'bin', 'pip')
-        run_cmd([pip, 'install', 'Sphinx'])
+        run_cmd([pip, 'install', 'Sphinx==1.2.3'])
+        # run_cmd([pip, 'install', 'Sphinx'])
         sphinx_build = os.path.join(venv, 'bin', 'sphinx-build')
         with changed_dir('Doc'):
             run_cmd(['make', 'dist', 'SPHINXBUILD=' + sphinx_build])

-- 
Repository URL: https://hg.python.org/release