From jython-checkins at python.org  Fri Oct  4 04:07:11 2019
From: jython-checkins at python.org (jeff.allen)
Date: Fri, 04 Oct 2019 08:07:11 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Update_jarjar_JAR_to_1=2E7?=
 =?utf-8?b?LjIgKGZpeGVzICMyODA2KS4=?=
Message-ID: <20191004080711.1.1F012899D8399737@mg.python.org>

https://hg.python.org/jython/rev/1a493dfcd2f1
changeset:   8302:1a493dfcd2f1
user:        Jeff Allen <ja.py at farowl.co.uk>
date:        Fri Oct 04 07:53:37 2019 +0100
summary:
  Update jarjar JAR to 1.7.2 (fixes #2806).

We now source jarjar from pantsbuild.org, as tonicsystems.com does not
seem to maintain it, and jarjar-1.4 does not work with Java 8. ASM is
now found on the class path, hence the Ant build change.

files:
  NEWS                     |    1 +
  build.xml                |    9 ++++++---
  extlibs/jarjar-1.4.jar   |  Bin 
  extlibs/jarjar-1.7.2.jar |  Bin 
  4 files changed, 7 insertions(+), 3 deletions(-)


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@
 
 Development tip
   Bugs fixed
+    - [ 2806 ] Installer contains dependencies unshaded (Java 8)
     - [ 2666 ] Oracle JDK 7 out of support so no longer available on Travis
     - [ 2294 ] Importation of modules from directories with non-ASCII characters fails
     - [ 2055 ] isinstance() and issubclass() fail with abc.ABCMeta
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -817,9 +817,12 @@
     </target>
 
     <target name="jar-complete" depends="jar, pycompile">
-        <taskdef name="jarjar"
-                 classname="com.tonicsystems.jarjar.JarJarTask"
-                 classpath="extlibs/jarjar-1.4.jar"/>
+        <taskdef name="jarjar" classname="org.pantsbuild.jarjar.JarJarTask">
+            <classpath>
+                <pathelement path="extlibs/jarjar-1.7.2.jar" />
+                <path refid="main.classpath" />
+            </classpath>
+        </taskdef>
         <jarjar destfile="${dist.dir}/${jython.deploy.jar}"  update="${jar.update}">
             <zipfileset src="${dist.dir}/${jython.dev.jar}"/>
             <!-- pin to Antlr 3 until we upgrade parsing -->
diff --git a/extlibs/jarjar-1.4.jar b/extlibs/jarjar-1.4.jar
deleted file mode 100644
index 68b9db9aa5049a8519af8ea6fdaafe0399e4da59..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jarjar-1.7.2.jar b/extlibs/jarjar-1.7.2.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..305260ea8d3f96d4240021a8334fc13e7a69188d
GIT binary patch
[stripped]

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

From jython-checkins at python.org  Sat Oct  5 06:59:07 2019
From: jython-checkins at python.org (jeff.allen)
Date: Sat, 05 Oct 2019 10:59:07 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Skip_two_failing_tests_=28?=
 =?utf-8?b?c2VlICMyODEyKS4=?=
Message-ID: <20191005105907.1.D46A51847305A6D7@mg.python.org>

https://hg.python.org/jython/rev/1b1ad43fa50b
changeset:   8303:1b1ad43fa50b
user:        Jeff Allen <ja.py at farowl.co.uk>
date:        Sat Oct 05 10:34:07 2019 +0100
summary:
  Skip two failing tests (see #2812).

test_dict.DictTest.test_container_iterator requires specific garbage
collection behaviour we do not reproduce. The second problem with sort
(test_sort.TestBase.testStressfully) stems from stricter checking on
the externally-supplied comparison function.

files:
  Lib/test/test_dict.py |   1 +
  Lib/test/test_sort.py |  65 ++++++++++++++++++++++++++----
  2 files changed, 57 insertions(+), 9 deletions(-)


diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py
--- a/Lib/test/test_dict.py
+++ b/Lib/test/test_dict.py
@@ -592,6 +592,7 @@
                         'f': None, 'g': None, 'h': None})
         d = {}
 
+    @unittest.skipIf(test_support.is_jython, "CPython specific (garbage collection).")
     def test_container_iterator(self):
         # Bug #3680: tp_traverse was not implemented for dictiter objects
         Dict = self.type2test
diff --git a/Lib/test/test_sort.py b/Lib/test/test_sort.py
--- a/Lib/test/test_sort.py
+++ b/Lib/test/test_sort.py
@@ -43,6 +43,60 @@
             return
 
 class TestBase(unittest.TestCase):
+
+    def testGently(self):
+        #
+        # This is a copy of testStressfully omitting the pathological comparator. See bjo #2812.
+        #
+        # Try a variety of sizes at and around powers of 2, and at powers of 10.
+        sizes = [0]
+        for power in range(1, 10):
+            n = 2 ** power
+            sizes.extend(range(n-1, n+2))
+        sizes.extend([10, 100, 1000])
+
+        class Stable(object):
+            def __init__(self, key, i):
+                self.key = key
+                self.index = i
+
+            def __cmp__(self, other):
+                return cmp(self.key, other.key)
+            __hash__ = None # Silence Py3k warning
+
+            def __repr__(self):
+                return "Stable(%d, %d)" % (self.key, self.index)
+
+        for n in sizes:
+            x = range(n)
+            if verbose:
+                print "Testing size", n
+
+            s = x[:]
+            check("identity", x, s)
+
+            s = x[:]
+            s.reverse()
+            check("reversed", x, s)
+
+            s = x[:]
+            random.shuffle(s)
+            check("random permutation", x, s)
+
+            y = x[:]
+            y.reverse()
+            s = x[:]
+            check("reversed via function", y, s, lambda a, b: cmp(b, a))
+
+            s = [Stable(random.randrange(10), i) for i in xrange(n)]
+            augmented = [(e, e.index) for e in s]
+            augmented.sort()    # forced stable because ties broken by index
+            x = [e for e, i in augmented] # a stable sort of s
+            check("stability", x, s)
+
+
+    @unittest.skipIf(test_support.is_jython,
+                     "Pathological comparators not handled. See bjo #2812.")
     def testStressfully(self):
         # Try a variety of sizes at and around powers of 2, and at powers of 10.
         sizes = [0]
@@ -104,15 +158,8 @@
                 print "    Checking against an insane comparison function."
                 print "        If the implementation isn't careful, this may segfault."
             s = x[:]
-
-            if test_support.is_jython:
-                try:
-                    s.sort(lambda a, b:  int(random.random() * 3) - 1)
-                except java.lang.IllegalArgumentException:
-                    pass
-            else:
-                s.sort(lambda a, b:  int(random.random() * 3) - 1)
-                check("an insane function left some permutation", x, s)
+            s.sort(lambda a, b:  int(random.random() * 3) - 1)
+            check("an insane function left some permutation", x, s)
 
             x = [Complains(i) for i in x]
             s = x[:]

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

From jython-checkins at python.org  Tue Oct  8 15:58:12 2019
From: jython-checkins at python.org (jeff.allen)
Date: Tue, 08 Oct 2019 19:58:12 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Added_tag_v2=2E7=2E2b1_for?=
 =?utf-8?q?_changeset_328e162ec117?=
Message-ID: <20191008195812.1.A5218D03E7DA6849@mg.python.org>

https://hg.python.org/jython/rev/921e93f16e7a
changeset:   8305:921e93f16e7a
user:        Jeff Allen <ja.py at farowl.co.uk>
date:        Sun Oct 06 06:43:55 2019 +0100
summary:
  Added tag v2.7.2b1 for changeset 328e162ec117

files:
  .hgtags |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -110,3 +110,4 @@
 b6e989b788d563b8ecb0c0458ab486fca8d128d6 v2.7.1rc3
 dd7e191d4c90d9f5d5fe8f0840f186697ecf272a v2.7.1
 dfc49bafbe79566bd54c8d417829e001ff2316ea v2.7.2a1
+328e162ec1178fb38b81b342f84c1268bf21d7fb v2.7.2b1

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

From jython-checkins at python.org  Tue Oct  8 15:58:11 2019
From: jython-checkins at python.org (jeff.allen)
Date: Tue, 08 Oct 2019 19:58:11 +0000
Subject: [Jython-checkins] =?utf-8?q?jython=3A_Prepare_for_2=2E7=2E2b1_re?=
 =?utf-8?q?lease=2E?=
Message-ID: <20191008195811.1.AB0E6AFF37E12998@mg.python.org>

https://hg.python.org/jython/rev/328e162ec117
changeset:   8304:328e162ec117
tag:         v2.7.2b1
user:        Jeff Allen <ja.py at farowl.co.uk>
date:        Sat Oct 05 23:15:30 2019 +0100
summary:
  Prepare for 2.7.2b1 release.

files:
  NEWS                         |  2 +-
  build.gradle                 |  2 +-
  build.xml                    |  2 +-
  src/org/python/core/imp.java |  2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@
 For more details of issue [ n ], please see https://hg.python.org/jython, or for tags [ GH-n ] see
 https://github.com/jythontools/jython
 
-Development tip
+Jython 2.7.2b1
   Bugs fixed
     - [ 2806 ] Installer contains dependencies unshaded (Java 8)
     - [ 2666 ] Oracle JDK 7 out of support so no longer available on Travis
diff --git a/build.gradle b/build.gradle
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,7 @@
 // Versions are specified in this grammar:
 // <major> . <minor> ( . <micro> )? ( <release> <serial> )? ( + | - <word> )?
 
-version = '2.7.2a1+'
+version = '2.7.2b1'
 
 // Valid examples (please preserve in comments):
 //version = '2.7.2a1+'
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -106,7 +106,7 @@
         <property name="jython.major_version" value="2"/>
         <property name="jython.minor_version" value="7"/>
         <property name="jython.micro_version" value="2"/>
-        <property name="jython.release_level" value="${PY_RELEASE_LEVEL_ALPHA}"/>
+        <property name="jython.release_level" value="${PY_RELEASE_LEVEL_BETA}"/>
 
         <!-- Zero at full release: one-up number for alpha, beta and candidate versions. -->
         <property name="jython.release_serial" value="1"/>
diff --git a/src/org/python/core/imp.java b/src/org/python/core/imp.java
--- a/src/org/python/core/imp.java
+++ b/src/org/python/core/imp.java
@@ -30,7 +30,7 @@
 
     private static final String UNKNOWN_SOURCEFILE = "<unknown>";
 
-    private static final int APIVersion = 37;
+    private static final int APIVersion = 38;
 
     public static final int NO_MTIME = -1;
 

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