Attachment 924495 Details for Bug 1127279 – patch for deterministic egg-info

[patch] patch for deterministic egg-info

setuptools-2.0-deterministic-egg-info.patch (text/plain), 3.03 KB, created by Benedikt Morbach on 2014-08-06 14:12:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benedikt Morbach

Created: 2014-08-06 14:12:12 UTC

Size: 3.03 KB

patch

obsolete

>From bd57576b300a21a06cf67c998b0c034a70a7842a Mon Sep 17 00:00:00 2001
>From: "Jason R. Coombs" <jaraco@jaraco.com>
>Date: Sat, 17 May 2014 18:58:29 -0400
>Subject: [PATCH 1/2] Extract variable
>
>---
> setuptools/command/egg_info.py | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
>index 646f946..169fcd3 100755
>--- a/setuptools/command/egg_info.py
>+++ b/setuptools/command/egg_info.py
>@@ -358,7 +358,8 @@ def warn_depends_obsolete(cmd, basename, filename):
> def write_requirements(cmd, basename, filename):
>     dist = cmd.distribution
>     data = ['\n'.join(yield_lines(dist.install_requires or ()))]
>-    for extra,reqs in (dist.extras_require or {}).items():
>+    extras_require = dist.extras_require or {}
>+    for extra,reqs in extras_require.items():
>         data.append('\n\n[%s]\n%s' % (extra, '\n'.join(yield_lines(reqs))))
>     cmd.write_or_delete_file("requirements", filename, ''.join(data))
> 
>-- 
>1.9.3
>
>From 7981a6d86958f48a5842198c0b81a1219b251985 Mon Sep 17 00:00:00 2001
>From: "Jason R. Coombs" <jaraco@jaraco.com>
>Date: Sat, 17 May 2014 19:02:55 -0400
>Subject: [PATCH 2/2] Write requirements in a deterministic order.
>
>---
> setuptools/command/egg_info.py | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
>index 169fcd3..38a01fb 100755
>--- a/setuptools/command/egg_info.py
>+++ b/setuptools/command/egg_info.py
>@@ -359,7 +359,8 @@ def write_requirements(cmd, basename, filename):
>     dist = cmd.distribution
>     data = ['\n'.join(yield_lines(dist.install_requires or ()))]
>     extras_require = dist.extras_require or {}
>-    for extra,reqs in extras_require.items():
>+    for extra in sorted(extras_require):
>+        reqs = extras_require[extra]
>         data.append('\n\n[%s]\n%s' % (extra, '\n'.join(yield_lines(reqs))))
>     cmd.write_or_delete_file("requirements", filename, ''.join(data))
> 
>-- 
>1.9.3
>
>From deeb6c7ef02b162b2a60978463dd0456d1142b91 Mon Sep 17 00:00:00 2001
>From: "Jason R. Coombs" <jaraco@jaraco.com>
>Date: Sun, 16 Mar 2014 06:23:24 -0400
>Subject: [PATCH] Sort entry points when writing so they render consistently
>
>---
> setuptools/command/egg_info.py       |   4 +-
> 2 files changed, 64 insertions(+), 64 deletions(-)
>
>diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
>index 5953aad..4f5c969 100755
>--- a/setuptools/command/egg_info.py
>+++ b/setuptools/command/egg_info.py
>@@ -369,10 +369,10 @@ def write_entries(cmd, basename, filename):
>         data = ep
>     elif ep is not None:
>         data = []
>-        for section, contents in ep.items():
>+        for section, contents in sorted(ep.items()):
>             if not isinstance(contents,basestring):
>                 contents = EntryPoint.parse_group(section, contents)
>-                contents = '\n'.join(map(str,contents.values()))
>+                contents = '\n'.join(sorted(map(str,contents.values())))
>             data.append('[%s]\n%s\n\n' % (section,contents))
>         data = ''.join(data)
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1127279: 924495