diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index 56a6051..d8263ee 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -1 \ No newline at end of file +2 \ No newline at end of file diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..9da5fb0 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,3 @@ +This package is built from a fork that includes the tests: + +https://github.com/antlr/antlr4/pull/2971 diff --git a/debian/changelog b/debian/changelog index 2e43bc9..3f4c04a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,5 @@ -pid (3.0.4-101pika1) pika; urgency=medium +python3-antlr4 (4.13.2-101pika1) pika; urgency=low - * Port to PikaOS 4 + * Initial release. (Closes: #897129) - -- Ward Nakchbandi Fri, 09 Oct 2022 21:38:00 +0300 - -pid (3.0.4-100pika1) pikauwu; urgency=medium - - * Initial Creation - - -- Ward Nakchbandi Fri, 09 Oct 2022 21:38:00 +0300 + -- Michael R. Crusoe Thu, 26 Nov 2020 13:59:10 +0100 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b4de394..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git a/debian/control b/debian/control index 1ef9aea..510fbd7 100644 --- a/debian/control +++ b/debian/control @@ -1,30 +1,29 @@ -Source: pid +Source: python3-antlr4 Section: python Priority: optional -Maintainer: Ian Santopietro -Build-Depends: debhelper (>= 11), - dh-python, +Maintainer: Debian Python Team +Uploaders: Michael R. Crusoe +Build-Depends: debhelper-compat (= 13), dh-python, python3-all, - python3-dbus, - python3-debian, - python3-distro, - python3-gnupg, - python3-lazr.restfulclient, - python3-launchpadlib, python3-setuptools, - python3-pytest, - python3-installer, - python3-wheel, - python3-build, -Standards-Version: 4.1.3 -Homepage: https://github.com/trbs/pid -XS-Python3-Version: >= 3.7 -Vcs-Browser: https://github.com/trbs/pid -Vcs-Git: https://github.com/trbs/pid.git +Standards-Version: 4.5.1 +Homepage: https://www.antlr.org +Vcs-Browser: https://salsa.debian.org/python-team/packages/python3-antlr4 +Vcs-Git: https://salsa.debian.org/python-team/packages/python3-antlr4.git +Rules-Requires-Root: no -Package: python3-pid +Package: python3-antlr4 Architecture: all -Depends: ${python3:Depends}, - ${misc:Depends}, -Description: Pidfile featuring stale detection and file-locking - +Depends: + ${misc:Depends}, + ${python3:Depends}, +Recommends: + ${python3:Recommends} +Suggests: + ${python3:Suggests} +Provides: + antlr4-python3-runtime (= ${binary:Version}) +Description: ANTLR 4.9 runtime for Python 3 + Provides the Python3 runtime for parsers/lexers generated by ANTLR 4. + . + Also known as "antlr4-python3-runtime". diff --git a/debian/copyright b/debian/copyright index 11f5afc..fb8d048 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,201 +1,38 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: antlr4-python3-runtime +Upstream-Contact: Eric Vergnaud, Terence Parr, Sam Harwell +Source: http://www.antlr.org - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +Files: * +Copyright: 2020 Eric Vergnaud, Terence Parr, Sam Harwell + 2012-2017, The ANTLR Project +License: BSD-3-clause - 1. Definitions. +Files: debian/* +Copyright: 2020 © Michael R. Crusoe +License: BSD-3-clause - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2014 Trbs - - Licensed 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, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holder nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/debian/python3-antlr4.docs b/debian/python3-antlr4.docs new file mode 100644 index 0000000..71dfd5b --- /dev/null +++ b/debian/python3-antlr4.docs @@ -0,0 +1 @@ +README.txt diff --git a/debian/rules b/debian/rules index 11be673..9f1ee3d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,10 @@ -#!/usr/bin/make -f +#! /usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -export DH_VERBOSE = 1 -# -export PYBUILD_NAME=pid -# - -## Uncomment to disable testing during package builds -## NOTE for QA or Engineering Review: This should not be uncommented in a -## PR. If it is, DO NOT APPROVE THE PR!!! -override_dh_auto_test: - true +export PYBUILD_NAME=antlr4-python3-runtime +export PYBUILD_TEST_ARGS=--pattern "*.py" --start-directory test %: dh $@ --with python3 --buildsystem=pybuild + +override_dh_installchangelogs: + dh_installchangelogs -k RELEASE-4.5.txt diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..33c3a64 --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..c4cfedd --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,2 @@ +# There are separate python2 and python3 sources +python3-antlr4 source: source-package-encodes-python-version diff --git a/debian/source/options b/debian/source/options index cb61fa5..d81db3f 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1 +1 @@ -extend-diff-ignore = "^[^/]*[.]egg-info/" +extend-diff-ignore="^[^/]+.egg-info/" diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..d2aa55a --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,3 @@ +Tests: run-unit-test +Depends: @ +Restrictions: allow-stderr diff --git a/debian/tests/run-unit-test b/debian/tests/run-unit-test new file mode 100644 index 0000000..a0b2604 --- /dev/null +++ b/debian/tests/run-unit-test @@ -0,0 +1,4 @@ +#!/bin/bash +set -e + +python3 -m unittest discover --start-directory /usr/lib/python3/dist-packages/antlr4/test/ --pattern "*.py" diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..33df2c6 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 +opts=uversionmangle=s/(rc|a|b|c)/~$1/ \ +https://pypi.debian.net/antlr4-python3-runtime/antlr4-python3-runtime-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/main.sh b/main.sh index 66980d8..2095a5b 100755 --- a/main.sh +++ b/main.sh @@ -2,22 +2,22 @@ set -e -VERSION="3.0.4" +VERSION="4.13.2" source ./pika-build-config.sh echo "$PIKA_BUILD_ARCH" > pika-build-arch # Clone Upstream -git clone https://github.com/trbs/pid -b "$VERSION" -cp -rvf ./debian ./pid/ -cd ./pid +git clone ./python3-antlr4 https://github.com/antlr/antlr4 -b "$VERSION" +cp -rvf ./debian ./python3-antlr4/ +cd ./python3-antlr4 # Get build deps apt-get build-dep ./ -y # Build package -LOGNAME=root dh_make --createorig -y -l -p pid_"$VERSION" || echo "dh-make: Ignoring Last Error" +LOGNAME=root dh_make --createorig -y -l -p python3-antlr4_"$VERSION" || echo "dh-make: Ignoring Last Error" dpkg-buildpackage --no-sign # Move the debs to output