From a878a74a12909437bd992352d0f0e09cfef5dfb1 Mon Sep 17 00:00:00 2001 From: rocky Date: Tue, 27 Aug 2024 11:21:56 -0400 Subject: [PATCH 1/8] Fixes #501 --- uncompyle6/bin/uncompile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uncompyle6/bin/uncompile.py b/uncompyle6/bin/uncompile.py index 5bc6bd40..c9710c39 100755 --- a/uncompyle6/bin/uncompile.py +++ b/uncompyle6/bin/uncompile.py @@ -30,7 +30,7 @@ def usage(): # __doc__ = """ # Usage: # %s [OPTIONS]... [ FILE | DIR]... -# %s [--help | -h | --V | --version] +# %s [--help | --version] # Examples: # %s foo.pyc bar.pyc # decompile foo.pyc, bar.pyc to stdout From e6c63e419e215bc5cc51d0aafef0bd82cd1553e3 Mon Sep 17 00:00:00 2001 From: rocky Date: Sun, 18 Aug 2024 12:49:33 -0400 Subject: [PATCH 2/8] Administrivia --- admin-tools/setup-python-3.3.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/admin-tools/setup-python-3.3.sh b/admin-tools/setup-python-3.3.sh index 4d2c27cb..4c87695d 100755 --- a/admin-tools/setup-python-3.3.sh +++ b/admin-tools/setup-python-3.3.sh @@ -10,6 +10,7 @@ PYTHON_VERSION=3.3.7 uncompyle6_owd=$(pwd) mydir=$(dirname $bs) +cd $mydir fulldir=$(readlink -f $mydir) . ./checkout_common.sh cd $fulldir/.. From c309730748a5d3440d034ceff3255127b70b09a0 Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 20 Sep 2024 16:23:18 -0400 Subject: [PATCH 3/8] Note version of setuptools working on Python 3.6 --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 60afb6ef..ab114de4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,7 @@ [build-system] requires = [ "setuptools>=71.0.3", + # "setuptools>=59.6.0", # for 3.6 ] build-backend = "setuptools.build_meta" From ff192ea6c1f8b4df9a1178400a59da8962667599 Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 21 Sep 2024 07:25:44 -0400 Subject: [PATCH 4/8] Administrivia --- admin-tools/setup-python-3.3.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin-tools/setup-python-3.3.sh b/admin-tools/setup-python-3.3.sh index 4c87695d..49081a09 100755 --- a/admin-tools/setup-python-3.3.sh +++ b/admin-tools/setup-python-3.3.sh @@ -18,4 +18,4 @@ cd $fulldir/.. setup_version python-spark master && \ setup_version python-xdis python-3.3 ) -checkout_finish python-3.3-to-3.5 +checkout_finish uncompyle6 python-3.3-to-3.5 From 710167b8069c5ce2bc82d921d64acb0cd3bcfab5 Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 21 Sep 2024 07:29:12 -0400 Subject: [PATCH 5/8] Adminsitrivia --- admin-tools/.gitignore | 1 + admin-tools/setup-python-3.3.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 admin-tools/.gitignore diff --git a/admin-tools/.gitignore b/admin-tools/.gitignore new file mode 100644 index 00000000..183700bc --- /dev/null +++ b/admin-tools/.gitignore @@ -0,0 +1 @@ +/.python-version diff --git a/admin-tools/setup-python-3.3.sh b/admin-tools/setup-python-3.3.sh index 49081a09..4c87695d 100755 --- a/admin-tools/setup-python-3.3.sh +++ b/admin-tools/setup-python-3.3.sh @@ -18,4 +18,4 @@ cd $fulldir/.. setup_version python-spark master && \ setup_version python-xdis python-3.3 ) -checkout_finish uncompyle6 python-3.3-to-3.5 +checkout_finish python-3.3-to-3.5 From 80d58f882a1c1cfd342dc154d38b9aad20276136 Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 4 Oct 2024 04:46:26 -0400 Subject: [PATCH 6/8] Track branch changes in python-spark --- admin-tools/setup-python-3.0.sh | 2 +- admin-tools/setup-python-3.3.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin-tools/setup-python-3.0.sh b/admin-tools/setup-python-3.0.sh index f5027db8..495ca571 100644 --- a/admin-tools/setup-python-3.0.sh +++ b/admin-tools/setup-python-3.0.sh @@ -14,7 +14,7 @@ fulldir=$(readlink -f $mydir) cd $mydir . ./checkout_common.sh (cd $fulldir/.. && \ - setup_version python-spark master && \ + setup_version python-spark python-3.0 && \ setup_version python-xdis python-3.0) checkout_finish python-3.0-to-3.2 diff --git a/admin-tools/setup-python-3.3.sh b/admin-tools/setup-python-3.3.sh index 4c87695d..417f54f6 100755 --- a/admin-tools/setup-python-3.3.sh +++ b/admin-tools/setup-python-3.3.sh @@ -15,7 +15,7 @@ fulldir=$(readlink -f $mydir) . ./checkout_common.sh cd $fulldir/.. (cd $fulldir/.. && \ - setup_version python-spark master && \ + setup_version python-spark python-3.3 && \ setup_version python-xdis python-3.3 ) checkout_finish python-3.3-to-3.5 From f603a44cf77680d87728cdeecef571d7cf4dcbf9 Mon Sep 17 00:00:00 2001 From: rocky Date: Mon, 7 Oct 2024 11:09:46 -0400 Subject: [PATCH 7/8] Allow newer spark-parser --- __pkginfo__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__pkginfo__.py b/__pkginfo__.py index 1c9f5c84..0e9eaee4 100644 --- a/__pkginfo__.py +++ b/__pkginfo__.py @@ -79,7 +79,7 @@ entry_points = { ] } ftp_url = None -install_requires = ["click", "spark-parser >= 1.8.9, < 1.9.0", "xdis >= 6.1.1, < 6.2.0"] +install_requires = ["click", "spark-parser >= 1.8.9, < 1.9.1", "xdis >= 6.1.1, < 6.2.0"] license = "GPL3" mailing_list = "python-debugger@googlegroups.com" From eb088a84c867b283ad9b1b589752d90c2d35052b Mon Sep 17 00:00:00 2001 From: rocky Date: Tue, 8 Oct 2024 16:46:42 -0400 Subject: [PATCH 8/8] Accept newer python-spark --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ab114de4..799e73b4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ name = "uncompyle6" description = "Python cross-version byte-code library and disassembler" dependencies = [ "click", - "spark-parser >= 1.8.9, < 1.9.0", + "spark-parser >= 1.8.9, < 1.9.1", "xdis >= 6.1.0, < 6.2.0", ] readme = "README.rst"