* [gentoo-commits] proj/javatoolkit:master commit in: src/py/javatoolkit/xml/, src/javatoolkit/, src/man/, /, ...
@ 2025-02-15 10:06 Arthur Zamarin
0 siblings, 0 replies; only message in thread
From: Arthur Zamarin @ 2025-02-15 10:06 UTC (permalink / raw
To: gentoo-commits
commit: f9ecd2144c211d37d3bd63f5a731f5bde5911f6b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 14 18:56:02 2025 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 14 18:58:47 2025 +0000
URL: https://gitweb.gentoo.org/proj/javatoolkit.git/commit/?id=f9ecd214
migrate build-system to flit (PEP517)
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.gitignore | 1 +
NEWS | 3 ++
{src/man => data/share/man/man1}/findclass.1 | 0
pyproject.toml | 39 ++++++++++++++++++++++
setup.py | 31 -----------------
src/{py => }/javatoolkit/__init__.py | 0
src/{py => }/javatoolkit/classpath.py | 0
src/{py => }/javatoolkit/cvv.py | 2 +-
src/{py => }/javatoolkit/java/__init__.py | 0
src/{py => }/javatoolkit/java/properties.py | 0
src/{py => }/javatoolkit/maven/MavenPom.py | 0
src/{py => }/javatoolkit/maven/__init__.py | 0
src/{py => }/javatoolkit/output.py | 0
src/{py => }/javatoolkit/parser/__init__.py | 0
src/{py => }/javatoolkit/parser/buildproperties.py | 0
src/{py => }/javatoolkit/parser/helpers.py | 0
src/{py => }/javatoolkit/parser/manifest.py | 0
src/{py => }/javatoolkit/parser/parser.py | 0
src/{py => }/javatoolkit/parser/tree.py | 0
src/javatoolkit/scripts/__init__.py | 0
.../scripts/build_xml_rewrite.py} | 0
.../scripts/buildparser.py} | 10 +++---
.../scripts/class_version_verify.py} | 2 +-
.../scripts/eclipse_build.py} | 9 +++--
.../findclass => javatoolkit/scripts/findclass.py} | 0
.../scripts/jarjarclean.py} | 0
.../scripts/maven_helper.py} | 2 +-
.../scripts/xml_rewrite.py} | 0
.../scripts/xml_rewrite_2.py} | 4 +--
.../scripts/xml_rewrite_3.py} | 4 +--
src/{py => }/javatoolkit/xml/DomRewriter.py | 0
src/{py => }/javatoolkit/xml/SaxRewriter.py | 4 +--
src/{py => }/javatoolkit/xml/__init__.py | 0
src/{py => }/javatoolkit/xml/sax.py | 0
34 files changed, 62 insertions(+), 49 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bee8a64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+__pycache__
diff --git a/NEWS b/NEWS
index 8e37a2f..a1ff448 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+0.6.8 (???)
+- Migrate build-system to flit with pyproject.toml
+
0.6.7 (19 Jun 2021)
- Correctly handling Java versions in class-version-verify.py.
diff --git a/src/man/findclass.1 b/data/share/man/man1/findclass.1
similarity index 100%
rename from src/man/findclass.1
rename to data/share/man/man1/findclass.1
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..bc4612f
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,39 @@
+[build-system]
+requires = ["flit_core >=3.8,<4"]
+build-backend = "flit_core.buildapi"
+
+[project]
+name = "javatoolkit"
+version = "0.6.8"
+description = "Collection of Gentoo-specific tools for Java"
+readme = "README"
+license = {file = "COPYING"}
+requires-python = "~=3.10"
+authors = [{name = "Gentoo Java Team", email = "java@gentoo.org"}]
+maintainers = [{name = "Gentoo Java Team", email = "java@gentoo.org"}]
+classifiers = [
+ "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
+ "Programming Language :: Python :: 3.10",
+ "Programming Language :: Python :: 3.11",
+ "Programming Language :: Python :: 3.12",
+ "Programming Language :: Python :: 3.13",
+]
+
+[project.urls]
+Homepage = "https://wiki.gentoo.org/wiki/Project:Java"
+Source = "https://gitweb.gentoo.org/proj/javatoolkit.git/"
+
+[project.scripts]
+"maven-helper.py" = "javatoolkit.scripts.maven_helper:main"
+"xml-rewrite-3.py" = "javatoolkit.scripts.xml_rewrite_3:main"
+findclass = "javatoolkit.scripts.findclass:main"
+"xml-rewrite.py" = "javatoolkit.scripts.xml_rewrite:main"
+"xml-rewrite-2.py" = "javatoolkit.scripts.xml_rewrite_2:main"
+buildparser = "javatoolkit.scripts.buildparser:main"
+"class-version-verify.py" = "javatoolkit.scripts.class_version_verify:main"
+build-xml-rewrite = "javatoolkit.scripts.build_xml_rewrite:main"
+jarjarclean = "javatoolkit.scripts.jarjarclean:main"
+"eclipse-build.py" = "javatoolkit.scripts.eclipse_build:main"
+
+[tool.flit.external-data]
+directory = "data"
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 28f6475..0000000
--- a/setup.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env python
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-from distutils.core import setup
-
-setup (
- name = 'javatoolkit',
- version = '0.5.0',
- description = 'Collection of Gentoo-specific tools for Java.',
- maintainer = 'Gentoo Java Team',
- maintainer_email = 'java@gentoo.org',
- url = 'https://www.gentoo.org',
- packages = ["javatoolkit", "javatoolkit.maven", "javatoolkit.xml", "javatoolkit.parser", "javatoolkit.java"],
- package_dir = { 'javatoolkit' : 'src/py/javatoolkit' },
- scripts = [
- "src/py/maven-helper.py",
- "src/py/xml-rewrite-3.py",
- "src/py/findclass",
- "src/py/xml-rewrite.py",
- "src/py/xml-rewrite-2.py",
- "src/py/buildparser",
- "src/py/class-version-verify.py",
- "src/py/build-xml-rewrite",
- "src/py/jarjarclean",
- "src/py/eclipse-build.py"
- ],
- data_files = [ ( '/usr/share/man/man1', ['src/man/findclass.1'] ) ]
-)
-
-#set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap
diff --git a/src/py/javatoolkit/__init__.py b/src/javatoolkit/__init__.py
similarity index 100%
rename from src/py/javatoolkit/__init__.py
rename to src/javatoolkit/__init__.py
diff --git a/src/py/javatoolkit/classpath.py b/src/javatoolkit/classpath.py
similarity index 100%
rename from src/py/javatoolkit/classpath.py
rename to src/javatoolkit/classpath.py
diff --git a/src/py/javatoolkit/cvv.py b/src/javatoolkit/cvv.py
similarity index 97%
rename from src/py/javatoolkit/cvv.py
rename to src/javatoolkit/cvv.py
index b0fdc84..2b4eec6 100644
--- a/src/py/javatoolkit/cvv.py
+++ b/src/javatoolkit/cvv.py
@@ -34,7 +34,7 @@ class CVVMagic:
self.bad.append((version, jar, file))
def do_class(self,filename):
- classFile = file(filename,"rb")
+ classFile = open(filename,"rb")
classFile.seek(4)
temp = classFile.read(4)
(version,) = unpack('>xxh',temp)
diff --git a/src/py/javatoolkit/java/__init__.py b/src/javatoolkit/java/__init__.py
similarity index 100%
rename from src/py/javatoolkit/java/__init__.py
rename to src/javatoolkit/java/__init__.py
diff --git a/src/py/javatoolkit/java/properties.py b/src/javatoolkit/java/properties.py
similarity index 100%
rename from src/py/javatoolkit/java/properties.py
rename to src/javatoolkit/java/properties.py
diff --git a/src/py/javatoolkit/maven/MavenPom.py b/src/javatoolkit/maven/MavenPom.py
similarity index 100%
rename from src/py/javatoolkit/maven/MavenPom.py
rename to src/javatoolkit/maven/MavenPom.py
diff --git a/src/py/javatoolkit/maven/__init__.py b/src/javatoolkit/maven/__init__.py
similarity index 100%
rename from src/py/javatoolkit/maven/__init__.py
rename to src/javatoolkit/maven/__init__.py
diff --git a/src/py/javatoolkit/output.py b/src/javatoolkit/output.py
similarity index 100%
rename from src/py/javatoolkit/output.py
rename to src/javatoolkit/output.py
diff --git a/src/py/javatoolkit/parser/__init__.py b/src/javatoolkit/parser/__init__.py
similarity index 100%
rename from src/py/javatoolkit/parser/__init__.py
rename to src/javatoolkit/parser/__init__.py
diff --git a/src/py/javatoolkit/parser/buildproperties.py b/src/javatoolkit/parser/buildproperties.py
similarity index 100%
rename from src/py/javatoolkit/parser/buildproperties.py
rename to src/javatoolkit/parser/buildproperties.py
diff --git a/src/py/javatoolkit/parser/helpers.py b/src/javatoolkit/parser/helpers.py
similarity index 100%
rename from src/py/javatoolkit/parser/helpers.py
rename to src/javatoolkit/parser/helpers.py
diff --git a/src/py/javatoolkit/parser/manifest.py b/src/javatoolkit/parser/manifest.py
similarity index 100%
rename from src/py/javatoolkit/parser/manifest.py
rename to src/javatoolkit/parser/manifest.py
diff --git a/src/py/javatoolkit/parser/parser.py b/src/javatoolkit/parser/parser.py
similarity index 100%
rename from src/py/javatoolkit/parser/parser.py
rename to src/javatoolkit/parser/parser.py
diff --git a/src/py/javatoolkit/parser/tree.py b/src/javatoolkit/parser/tree.py
similarity index 100%
rename from src/py/javatoolkit/parser/tree.py
rename to src/javatoolkit/parser/tree.py
diff --git a/src/javatoolkit/scripts/__init__.py b/src/javatoolkit/scripts/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/py/build-xml-rewrite b/src/javatoolkit/scripts/build_xml_rewrite.py
similarity index 100%
rename from src/py/build-xml-rewrite
rename to src/javatoolkit/scripts/build_xml_rewrite.py
diff --git a/src/py/buildparser b/src/javatoolkit/scripts/buildparser.py
similarity index 92%
rename from src/py/buildparser
rename to src/javatoolkit/scripts/buildparser.py
index 3007d9b..6e3097c 100755
--- a/src/py/buildparser
+++ b/src/javatoolkit/scripts/buildparser.py
@@ -9,12 +9,10 @@ import os
import sys
from optparse import OptionParser
-sys.path.insert(0, "/usr/share/javatoolkit/pym")
-
-from javatoolkit.parser.parser import Parser
-from javatoolkit.parser.buildproperties import BuildPropertiesParser
-from javatoolkit.parser.manifest import ManifestParser
-from javatoolkit.parser.tree import Node, ParseError
+from ..parser.parser import Parser
+from ..parser.buildproperties import BuildPropertiesParser
+from ..parser.manifest import ManifestParser
+from ..parser.tree import Node, ParseError
__author__ = ["James Le Cuirot <chewi@aura-online.co.uk>",
"Karl Trygve Kalleberg <karltk@gentoo.org>"]
diff --git a/src/py/class-version-verify.py b/src/javatoolkit/scripts/class_version_verify.py
similarity index 98%
rename from src/py/class-version-verify.py
rename to src/javatoolkit/scripts/class_version_verify.py
index dc44d90..1394146 100755
--- a/src/py/class-version-verify.py
+++ b/src/javatoolkit/scripts/class_version_verify.py
@@ -6,7 +6,7 @@
import os
import sys
from optparse import OptionParser, make_option
-from javatoolkit.cvv import CVVMagic
+from ..cvv import CVVMagic
def main():
diff --git a/src/py/eclipse-build.py b/src/javatoolkit/scripts/eclipse_build.py
similarity index 98%
rename from src/py/eclipse-build.py
rename to src/javatoolkit/scripts/eclipse_build.py
index 7da09da..f3ee2fa 100755
--- a/src/py/eclipse-build.py
+++ b/src/javatoolkit/scripts/eclipse_build.py
@@ -12,10 +12,9 @@ import os
import sys
from optparse import OptionParser, make_option
from xml.dom.minidom import parse
-from javatoolkit.java.properties import PropertiesParser
+from ..java.properties import PropertiesParser
-
-if __name__ == '__main__':
+def main():
usage = "Eclipse Ant Build File writer"
usage += "Copyright 2008 Gentoo Foundation\n"
usage += "Distributed under the terms of the GNU General Public Licence\n"
@@ -134,4 +133,8 @@ if __name__ == '__main__':
# output.write('')
# output.write('')
+
+if __name__ == '__main__':
+ main()
+
# vim:set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap :
diff --git a/src/py/findclass b/src/javatoolkit/scripts/findclass.py
similarity index 100%
rename from src/py/findclass
rename to src/javatoolkit/scripts/findclass.py
diff --git a/src/py/jarjarclean b/src/javatoolkit/scripts/jarjarclean.py
similarity index 100%
rename from src/py/jarjarclean
rename to src/javatoolkit/scripts/jarjarclean.py
diff --git a/src/py/maven-helper.py b/src/javatoolkit/scripts/maven_helper.py
similarity index 99%
rename from src/py/maven-helper.py
rename to src/javatoolkit/scripts/maven_helper.py
index 01c9557..d486bc7 100755
--- a/src/py/maven-helper.py
+++ b/src/javatoolkit/scripts/maven_helper.py
@@ -21,7 +21,7 @@
import sys
import io
from optparse import OptionParser, make_option
-from javatoolkit.maven.MavenPom import MavenPom
+from ..maven.MavenPom import MavenPom
def main():
diff --git a/src/py/xml-rewrite.py b/src/javatoolkit/scripts/xml_rewrite.py
similarity index 100%
rename from src/py/xml-rewrite.py
rename to src/javatoolkit/scripts/xml_rewrite.py
diff --git a/src/py/xml-rewrite-2.py b/src/javatoolkit/scripts/xml_rewrite_2.py
similarity index 98%
rename from src/py/xml-rewrite-2.py
rename to src/javatoolkit/scripts/xml_rewrite_2.py
index ad0f12e..b953675 100755
--- a/src/py/xml-rewrite-2.py
+++ b/src/javatoolkit/scripts/xml_rewrite_2.py
@@ -11,7 +11,7 @@ from optparse import OptionParser, make_option
import xml.sax.handler
from xml.sax.saxutils import XMLGenerator, escape, quoteattr
-import javatoolkit.xml.sax
+from ..xml import sax
def add_gentoo_classpath(document):
@@ -194,7 +194,7 @@ class SaxRewriter(XMLGenerator, StreamRewriterBase):
XMLGenerator.__init__(self, self.buffer, 'UTF-8')
def process(self, in_stream):
- javatoolkit.xml.sax.parse(in_stream, content_handler=self, features={xml.sax.handler.feature_external_ges: 1})
+ sax.parse(in_stream, content_handler=self, features={xml.sax.handler.feature_external_ges: 1})
self.p('\n')
def startElement(self, name, attrs):
diff --git a/src/py/xml-rewrite-3.py b/src/javatoolkit/scripts/xml_rewrite_3.py
similarity index 99%
rename from src/py/xml-rewrite-3.py
rename to src/javatoolkit/scripts/xml_rewrite_3.py
index 04131e4..61a06fd 100755
--- a/src/py/xml-rewrite-3.py
+++ b/src/javatoolkit/scripts/xml_rewrite_3.py
@@ -7,8 +7,8 @@ import os
import sys
import io
from optparse import OptionParser, make_option
-from javatoolkit.xml.DomRewriter import DomRewriter
-from javatoolkit.xml.SaxRewriter import SaxRewriter
+from ..xml.DomRewriter import DomRewriter
+from ..xml.SaxRewriter import SaxRewriter
def main():
diff --git a/src/py/javatoolkit/xml/DomRewriter.py b/src/javatoolkit/xml/DomRewriter.py
similarity index 100%
rename from src/py/javatoolkit/xml/DomRewriter.py
rename to src/javatoolkit/xml/DomRewriter.py
diff --git a/src/py/javatoolkit/xml/SaxRewriter.py b/src/javatoolkit/xml/SaxRewriter.py
similarity index 96%
rename from src/py/javatoolkit/xml/SaxRewriter.py
rename to src/javatoolkit/xml/SaxRewriter.py
index 8d76de2..96d8345 100644
--- a/src/py/javatoolkit/xml/SaxRewriter.py
+++ b/src/javatoolkit/xml/SaxRewriter.py
@@ -10,7 +10,7 @@ import xml.sax.handler
from xml.sax.saxutils import XMLGenerator
from xml.sax.saxutils import quoteattr
-import javatoolkit.xml.sax
+from . import sax
class SaxRewriter(XMLGenerator):
"""
@@ -127,7 +127,7 @@ class SaxRewriter(XMLGenerator):
def process(self, in_stream, callback):
self.startElement = callback
- javatoolkit.xml.sax.parse_string(in_stream.encode('UTF8'), content_handler=self, features={xml.sax.handler.feature_external_ges: 1})
+ sax.parse_string(in_stream.encode('UTF8'), content_handler=self, features={xml.sax.handler.feature_external_ges: 1})
self.p('\n')
# vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap:
diff --git a/src/py/javatoolkit/xml/__init__.py b/src/javatoolkit/xml/__init__.py
similarity index 100%
rename from src/py/javatoolkit/xml/__init__.py
rename to src/javatoolkit/xml/__init__.py
diff --git a/src/py/javatoolkit/xml/sax.py b/src/javatoolkit/xml/sax.py
similarity index 100%
rename from src/py/javatoolkit/xml/sax.py
rename to src/javatoolkit/xml/sax.py
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2025-02-15 10:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-15 10:06 [gentoo-commits] proj/javatoolkit:master commit in: src/py/javatoolkit/xml/, src/javatoolkit/, src/man/, /, Arthur Zamarin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox