From 0a00b6f8725ca27245a0f5afc7a653f709be807d Mon Sep 17 00:00:00 2001 From: Stefan Richthofer Date: Sun, 7 Jun 2020 21:55:56 +0200 Subject: [PATCH 1/7] Updated links in navbar.yml to reflect move to github. --- _data/navbar.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/_data/navbar.yml b/_data/navbar.yml index ff0a5d9..0d43f5c 100644 --- a/_data/navbar.yml +++ b/_data/navbar.yml @@ -24,11 +24,17 @@ navbar: - title: Development subItems: - title: Bug tracker - url: https://bugs.jython.org/ + url: https://github.com/jython/jython/issues/ - title: Github - url: https://github.com/jythontools/jython - - title: Mercurial - url: https://hg.python.org/jython/ + url: https://github.com/jython/jython/ + - title: Legacy + subitems: + - title: Bug tracker + url: https://bugs.jython.org/ + - title: Github (legacy, frozen) + url: https://github.com/jython/frozen-mirror/ + - title: Mercurial (legacy, frozen) + url: https://hg.python.org/jython/ - title: Mailing List url: https://sourceforge.net/p/jython/mailman/ - title: Developer Guide From 3f04d8b66d1b0d404d0a536112a51483602d3fd2 Mon Sep 17 00:00:00 2001 From: Stefan Richthofer Date: Sun, 7 Jun 2020 21:59:03 +0200 Subject: [PATCH 2/7] Updated default.html to reflect move to github. --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index 830a986..20f35b2 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -16,7 +16,7 @@
- View on Github + View on Github From d2a47569b140fbb721073c19a52001a2e1277f29 Mon Sep 17 00:00:00 2001 From: Stefan Richthofer Date: Sun, 7 Jun 2020 22:00:19 +0200 Subject: [PATCH 3/7] Updated index.md to reflect move to github. --- index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.md b/index.md index a8679bb..d9fcccc 100644 --- a/index.md +++ b/index.md @@ -2,7 +2,7 @@ title: Home --- ## What is Jython? -Jython is a [Java](https://go.java/index.html) implementation of [Python](https://www.python.org/) that combines expressive power with clarity. Jython is freely available for both commercial and non-commercial use and is distributed with source code under the [PSF License v2](https://github.com/jythontools/jython/blob/master/LICENSE.txt). Jython is complementary to Java and is especially suited for the following tasks: +Jython is a [Java](https://go.java/index.html) implementation of [Python](https://www.python.org/) that combines expressive power with clarity. Jython is freely available for both commercial and non-commercial use and is distributed with source code under the [PSF License v2](https://github.com/jython/jython/blob/master/LICENSE.txt). Jython is complementary to Java and is especially suited for the following tasks: * Embedded scripting - Java programmers can add the Jython libraries to their system to allow end users to write simple or complicated scripts that add functionality to the application. * Interactive experimentation - Jython provides an interactive interpreter that can be used to interact with Java packages or with running Java applications. This allows programmers to experiment and debug any Java system using Jython. From 491087e486b5601f349e76a77db58080bb8e60fb Mon Sep 17 00:00:00 2001 From: Stefan Richthofer Date: Mon, 8 Jun 2020 16:53:49 +0200 Subject: [PATCH 4/7] Created separate page for the legacy development links: bug tracker, mercurial, github mirror. --- _data/navbar.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/_data/navbar.yml b/_data/navbar.yml index 0d43f5c..b987499 100644 --- a/_data/navbar.yml +++ b/_data/navbar.yml @@ -28,13 +28,7 @@ navbar: - title: Github url: https://github.com/jython/jython/ - title: Legacy - subitems: - - title: Bug tracker - url: https://bugs.jython.org/ - - title: Github (legacy, frozen) - url: https://github.com/jython/frozen-mirror/ - - title: Mercurial (legacy, frozen) - url: https://hg.python.org/jython/ + url: legacy-dev - title: Mailing List url: https://sourceforge.net/p/jython/mailman/ - title: Developer Guide From d9bfee18cc9d85e4ae600d9cf8e8260f6ae97042 Mon Sep 17 00:00:00 2001 From: Stefan Richthofer Date: Mon, 8 Jun 2020 16:55:20 +0200 Subject: [PATCH 5/7] Added missing file for previous commit. --- legacy-dev.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 legacy-dev.md diff --git a/legacy-dev.md b/legacy-dev.md new file mode 100644 index 0000000..569ad33 --- /dev/null +++ b/legacy-dev.md @@ -0,0 +1,11 @@ +--- +title: Legacy +--- +## Development before move to Github + +### [Bug tracker](https://bugs.jython.org/) + +### [Mercurial](https://hg.python.org/jython/) + +### [Github mirror](https://github.com/jython/frozen-mirror/) +This mirror is now frozen. From d9225c8c01a26ee2b3e3f50465cf0f33cee01f42 Mon Sep 17 00:00:00 2001 From: Stefan Richthofer Date: Mon, 8 Apr 2024 00:20:07 +0200 Subject: [PATCH 6/7] Resolved conflicts with master. --- index.md | 10 +++++++++- legacy-dev.md | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/index.md b/index.md index d9fcccc..b908b86 100644 --- a/index.md +++ b/index.md @@ -2,7 +2,15 @@ title: Home --- ## What is Jython? -Jython is a [Java](https://go.java/index.html) implementation of [Python](https://www.python.org/) that combines expressive power with clarity. Jython is freely available for both commercial and non-commercial use and is distributed with source code under the [PSF License v2](https://github.com/jython/jython/blob/master/LICENSE.txt). Jython is complementary to Java and is especially suited for the following tasks: +The Jython project provides implementations of [Python](https://www.python.org/) in [Java](https://go.java/index.html), +providing to Python the benefits of running on the JVM and access to classes written in Java. +The current release (a Jython 2.7.x) only supports Python 2 (sorry). +There is work towards a Python 3 in the project's GitHub repository. + +Jython implementations are freely available for both commercial and non-commercial use. +They are distributed with source code under the [PSF License v2](https://github.com/jython/jython/blob/master/LICENSE.txt). + +Jython is complementary to Java and is especially suited for the following tasks: * Embedded scripting - Java programmers can add the Jython libraries to their system to allow end users to write simple or complicated scripts that add functionality to the application. * Interactive experimentation - Jython provides an interactive interpreter that can be used to interact with Java packages or with running Java applications. This allows programmers to experiment and debug any Java system using Jython. diff --git a/legacy-dev.md b/legacy-dev.md index 569ad33..53090dc 100644 --- a/legacy-dev.md +++ b/legacy-dev.md @@ -4,8 +4,10 @@ title: Legacy ## Development before move to Github ### [Bug tracker](https://bugs.jython.org/) +Good old “bjo” bugs.jython.org. ### [Mercurial](https://hg.python.org/jython/) +Until June 2020, development took place here. ### [Github mirror](https://github.com/jython/frozen-mirror/) This mirror is now frozen. From e31ac92b7e773d871b4796dcd53a141c7ed86394 Mon Sep 17 00:00:00 2001 From: Stefan Richthofer Date: Mon, 8 Apr 2024 00:32:53 +0200 Subject: [PATCH 7/7] Include APIdia links. --- _data/navbar.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_data/navbar.yml b/_data/navbar.yml index a48ad54..2a0a787 100644 --- a/_data/navbar.yml +++ b/_data/navbar.yml @@ -13,6 +13,8 @@ navbar: url: installation - title: JavaDoc url: https://www.javadoc.io/doc/org.python/jython-standalone/2.7.2 + - title: APIdia (alternative to JavaDoc) + url: https://apidia.net/java/Jython - title: Python 2.7 url: https://docs.python.org/2.7/ - title: Jython Book @@ -37,6 +39,8 @@ navbar: url: jython-3-mvp - title: Jython 3 Roadmap url: jython-3-roadmap + - title: Jython 3 (snapshot) on APIdia + url: https://apidia.net/java/Jython/3 - title: Website source url: https://github.com/jython/jython.github.io/ - title: Links