From jython-checkins at python.org Fri Nov 1 00:57:47 2019 From: jython-checkins at python.org (jeff.allen) Date: Fri, 01 Nov 2019 04:57:47 +0000 Subject: [Jython-checkins] =?utf-8?q?jython=3A_Formatting_only=2E?= Message-ID: <20191101045747.1.921847A3AF9D5357@mg.python.org> https://hg.python.org/jython/rev/87758cfe6f26 changeset: 8307:87758cfe6f26 user: Jeff Allen date: Wed Oct 30 21:44:49 2019 +0000 summary: Formatting only. The main build is indented on 4: follow suit in maven/build.xml. files: maven/build.xml | 384 +++++++++++++++++------------------ 1 files changed, 184 insertions(+), 200 deletions(-) diff --git a/maven/build.xml b/maven/build.xml --- a/maven/build.xml +++ b/maven/build.xml @@ -8,7 +8,7 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, @@ -29,237 +29,221 @@ - - + + - - + + - - + + - - + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - + + - - - + + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + - - - - - - - + + + - - + + + + + + + - - - - - - + + - - - - - - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + - - + + + + + + + - - - - - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - - + + + + + + + -- Repository URL: https://hg.python.org/jython From jython-checkins at python.org Fri Nov 1 00:57:47 2019 From: jython-checkins at python.org (jeff.allen) Date: Fri, 01 Nov 2019 04:57:47 +0000 Subject: [Jython-checkins] =?utf-8?q?jython=3A_Begin_to_identify_as_Jytho?= =?utf-8?q?n_2=2E7=2E2b2=2E?= Message-ID: <20191101045747.1.D99E399FE936640A@mg.python.org> https://hg.python.org/jython/rev/b9b60766cabe changeset: 8308:b9b60766cabe user: Jeff Allen date: Thu Oct 31 16:29:09 2019 +0000 summary: Begin to identify as Jython 2.7.2b2. As well as changing the version numbers in build scripts as we have often before, this clarifies (in comments) a numbering policy change by which developer and snapshot builds identify as the version we are working *towards*, with a -DEV or -SNAPSHOT suffix, not the last one released and a "+" suffix. This appears to be the common practice (in the Maven eco-system). files: NEWS | 4 ++++ build.gradle | 9 ++++----- build.xml | 16 ++++++++-------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/NEWS b/NEWS --- a/NEWS +++ b/NEWS @@ -3,6 +3,10 @@ For more details of issue [ n ], please see https://hg.python.org/jython, or for tags [ GH-n ] see https://github.com/jythontools/jython +Jython 2.7.2b2 + Bugs fixed + - [ 2814 ] maven/build.xml does not PGP-sign the publication + Jython 2.7.2b1 Bugs fixed - [ 2806 ] Installer contains dependencies unshaded (Java 8) diff --git a/build.gradle b/build.gradle --- a/build.gradle +++ b/build.gradle @@ -37,20 +37,19 @@ * here. But of course you have to do it the hard way too (see build.xml) as * long as Ant is also used. * - * The convention here is that you specify the version of the next release. If + * The convention here is that you specify the version of the *next* release. If * there are files not checked in, extra files (not of types hg ignores), or the * changeset is not tagged correspondingly, the build will add "-SNAPSHOT" to * the effective version. */ // Versions are specified in this grammar: -// . ( . )? ( )? ( + | - )? +// . ( . )? ( )? ( - )? -version = '2.7.2b1' +version = '2.7.2b2' // Valid examples (please preserve in comments): -//version = '2.7.2a1+' //version = '2.7.2a2' -//version = '2.7.2b1-SNAPSHOT' +//version = '2.7.2b2-DEV' //version = '2.7.2b1' //version = '2.7.2rc1' //version = '2.7.2' diff --git a/build.xml b/build.xml --- a/build.xml +++ b/build.xml @@ -16,7 +16,7 @@ ant as it is the default target. This build will create directories /build and /dist below ${basedir}. -Jython will identify its version with a trailing "+". +Jython will identify its version with a trailing "-DEV". Case 2: build an installer for the development version ------------------------------------------------------ @@ -98,18 +98,18 @@ reconsider choice of JARs, and feel free to use Java 8 syntax. --> - + - + @@ -317,7 +317,7 @@ --> - + -- Repository URL: https://hg.python.org/jython From jython-checkins at python.org Fri Nov 1 00:57:46 2019 From: jython-checkins at python.org (jeff.allen) Date: Fri, 01 Nov 2019 04:57:46 +0000 Subject: [Jython-checkins] =?utf-8?q?jython=3A_Restore_PGP_signing_and_ex?= =?utf-8?q?tend_to_all_artefacts_in_each_bundle=2E?= Message-ID: <20191101045746.1.279B4F3426F2D911@mg.python.org> https://hg.python.org/jython/rev/7028af43600e changeset: 8306:7028af43600e user: Jeff Allen date: Wed Oct 30 21:32:16 2019 +0000 summary: Restore PGP signing and extend to all artefacts in each bundle. files: build.gradle | 36 ++++++++ maven/build.xml | 118 ++++++++++++++++++++-------- maven/pom-template.xml | 18 ++- 3 files changed, 129 insertions(+), 43 deletions(-) diff --git a/build.gradle b/build.gradle --- a/build.gradle +++ b/build.gradle @@ -729,6 +729,42 @@ artifact sourcesJar // Also provide the docs. (Some javadoc errors currently.) artifact javadocJar + + pom { + // Same description as in ~/maven/pom-template + name = 'Jython' + description = + 'Jython is an implementation of the high-level, dynamic, object-oriented\n' + + 'language Python written in 100% Pure Java, and seamlessly integrated with\n' + + 'the Java platform. It thus allows you to run Python on any Java platform.' + url = 'https://www.jython.org/' + + // We use the PSF 2.0, but only most recently, but actually a bundle. + licenses { + license { + name = 'Jython Software License' + // Not actually the license URL, but linked from here. + url = 'https://www.jython.org/' + distribution = 'repo' + } + } + + // Point to hg repositories hosetd by PSF (up to 2.7.2, anyway). + scm { + connection = 'scm:hg:https://hg.python.org/jython' + developerConnection = 'scm:hg:ssh://hg at hg.python.org/jython' + url = 'https://hg.python.org/jython' + } + + // Could list us all, but why not just the list for now? + developers { + developer { + id = 'jython' + name = 'Jython Developers' + email = 'jython-dev at lists.sourceforge.net' + } + } + } } } diff --git a/maven/build.xml b/maven/build.xml --- a/maven/build.xml +++ b/maven/build.xml @@ -83,12 +83,7 @@ - - - - - - + @@ -138,51 +133,102 @@ - + + + + - - - - - - + + + - - - - - - + + - - - + + + + tofile="@{stageDir}/@{basename}.pom"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -208,11 +254,11 @@ - - + - + diff --git a/maven/pom-template.xml b/maven/pom-template.xml --- a/maven/pom-template.xml +++ b/maven/pom-template.xml @@ -9,29 +9,33 @@ jar Jython @PROJECT-VERSION@ - http://www.jython.org/ + https://www.jython.org/ + Jython is an implementation of the high-level, dynamic, object-oriented language Python written in 100% Pure Java, and seamlessly integrated with the Java platform. It thus allows you to run Python on any Java platform. + Jython Software License - http://www.jython.org/Project/license.html + https://www.jython.org/Project/license.html repo + - scm:hg:http://hg.python.org/jython + scm:hg:https://hg.python.org/jython scm:hg:ssh://hg at hg.python.org/jython - http://hg.python.org/jython + https://hg.python.org/jython - + - fwierzbicki - Frank Wierzbicki + jython + Jython Developers + jython-dev at lists.sourceforge.net -- Repository URL: https://hg.python.org/jython From jython-checkins at python.org Fri Nov 1 12:33:25 2019 From: jython-checkins at python.org (jeff.allen) Date: Fri, 01 Nov 2019 16:33:25 +0000 Subject: [Jython-checkins] =?utf-8?q?jython=3A_Added_tag_v2=2E7=2E2b2_for?= =?utf-8?q?_changeset_b9b60766cabe?= Message-ID: <20191101163325.1.6FA777663662F5BB@mg.python.org> https://hg.python.org/jython/rev/d674e8bb4ff5 changeset: 8309:d674e8bb4ff5 user: Jeff Allen date: Fri Nov 01 07:44:08 2019 +0000 summary: Added tag v2.7.2b2 for changeset b9b60766cabe files: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -111,3 +111,4 @@ dd7e191d4c90d9f5d5fe8f0840f186697ecf272a v2.7.1 dfc49bafbe79566bd54c8d417829e001ff2316ea v2.7.2a1 328e162ec1178fb38b81b342f84c1268bf21d7fb v2.7.2b1 +b9b60766cabebf007b7584ec21a69b3f58587525 v2.7.2b2 -- Repository URL: https://hg.python.org/jython From jython-checkins at python.org Sun Nov 3 09:37:17 2019 From: jython-checkins at python.org (jeff.allen) Date: Sun, 03 Nov 2019 14:37:17 +0000 Subject: [Jython-checkins] =?utf-8?q?jython=3A_Begin_to_identify_as_Jytho?= =?utf-8?q?n_2=2E7=2E2b3=2E?= Message-ID: <20191103143717.1.084D9267894E1711@mg.python.org> https://hg.python.org/jython/rev/e19a4c1ade2e changeset: 8310:e19a4c1ade2e user: Jeff Allen date: Sun Nov 03 08:57:45 2019 +0000 summary: Begin to identify as Jython 2.7.2b3. Implements the idea that we always identify Jython by the *next* (potential) release during developement. We actually hope for 2.7.2rc1 next, but b3 encsures change always moves forwards. files: NEWS | 6 ++++++ build.gradle | 2 +- build.xml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS --- a/NEWS +++ b/NEWS @@ -1,8 +1,14 @@ Jython NEWS +The features new in a given release are generally listed under the section for the "b1" release +of that version. + For more details of issue [ n ], please see https://hg.python.org/jython, or for tags [ GH-n ] see https://github.com/jythontools/jython +Jython 2.7.2b3 + Bugs fixed + Jython 2.7.2b2 Bugs fixed - [ 2814 ] maven/build.xml does not PGP-sign the publication diff --git a/build.gradle b/build.gradle --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ // Versions are specified in this grammar: // . ( . )? ( )? ( - )? -version = '2.7.2b2' +version = '2.7.2b3' // Valid examples (please preserve in comments): //version = '2.7.2a2' diff --git a/build.xml b/build.xml --- a/build.xml +++ b/build.xml @@ -109,7 +109,7 @@ - + -- Repository URL: https://hg.python.org/jython From jython-checkins at python.org Mon Nov 4 13:59:57 2019 From: jython-checkins at python.org (stefan.richthofer) Date: Mon, 04 Nov 2019 18:59:57 +0000 Subject: [Jython-checkins] =?utf-8?q?jython=3A_Restored_the_PyShadowStrin?= =?utf-8?q?g-PyObject-String_constructor_as_deprecated_API=2E?= Message-ID: <20191104185957.1.4AD3F5317BA9ED51@mg.python.org> https://hg.python.org/jython/rev/159c277c4a80 changeset: 8311:159c277c4a80 user: Stefan Richthofer date: Mon Nov 04 19:59:21 2019 +0100 summary: Restored the PyShadowString-PyObject-String constructor as deprecated API. Removal of this constructor broke compatibility with JyNI 2.7-alpha5. files: src/org/python/core/PyShadowString.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/org/python/core/PyShadowString.java b/src/org/python/core/PyShadowString.java --- a/src/org/python/core/PyShadowString.java +++ b/src/org/python/core/PyShadowString.java @@ -59,6 +59,19 @@ this(TYPE, Py.newString(primary), Py.newString(shadow), new PyList()); } + /** + * Construct an instance specifying primary and shadow values + * (bytes object expected for primary). + * This somewhat uncanonical constructor was removed in Jython 2.7.2. + * The deprecated version is kept for compatibility with JyNI 2.7-alpha5. + * + * @deprecated use the constructor with strings instead. + */ + @Deprecated + public PyShadowString(PyObject primary, String shadow) { + this(TYPE, primary, Py.newString(shadow), new PyList()); + } + /** Construct an instance specifying primary and shadow values (bytes objects expected). */ private PyShadowString(PyObject primary, PyObject shadow) { this(TYPE, primary, shadow, new PyList()); -- Repository URL: https://hg.python.org/jython