From 29edaaed0e6e8960e8e5b3a57e3362c7bd028766 Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 15 Mar 2024 22:02:53 -0400 Subject: [PATCH] Get ready for release 3.9.1 --- .circleci/config.yml | 4 +- .github/workflows/osx.yml | 4 +- .github/workflows/ubuntu.yml | 3 +- .github/workflows/windows.yml | 4 +- NEWS.md | 20 ++ PKG-INFO | 359 ++++++++++++++++++++++++++++++- __pkginfo__.py | 2 + admin-tools/make-dist-2.4-2.7.sh | 10 +- admin-tools/make-dist-3.0-3.2.sh | 49 +++++ admin-tools/make-dist-3.3-3.5.sh | 15 +- admin-tools/make-dist-newest.sh | 10 +- pyproject.toml | 64 ++++++ setup.cfg | 3 +- setup.py | 61 +----- uncompyle6/version.py | 2 +- 15 files changed, 529 insertions(+), 81 deletions(-) create mode 100644 admin-tools/make-dist-3.0-3.2.sh create mode 100644 pyproject.toml diff --git a/.circleci/config.yml b/.circleci/config.yml index f05ee99b..84edb951 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,9 +43,9 @@ jobs: - run: command: | # Use pip to install dependengcies sudo pip install --user --upgrade setuptools - # Until the next release - sudo pip install git+https://github.com/rocky/python-xdis#egg=xdis pip install --user -e . + # Not sure why "pip install -e" doesn't work above + # pip install click spark-parser xdis pip install --user -r requirements-dev.txt # Save dependency cache diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 38eac9b0..ad8ba5da 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -22,9 +22,9 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - # Until the next xdis release - pip install git+https://github.com/rocky/python-xdis#egg=xdis pip install -e . + # Not sure why "pip install -e" doesn't work above + # pip install click spark-parser xdis pip install -r requirements-dev.txt - name: Test uncompyle6 run: | diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index bfabdfee..8415d348 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -21,9 +21,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - # Until the next xdis release - pip install git+https://github.com/rocky/python-xdis#egg=xdis pip install -e . + # pip install click spark-parser xdis pip install -r requirements-dev.txt - name: Test uncompyle6 run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 34d1ea55..176e4ca0 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -22,9 +22,9 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - # Until the next xdis release - pip install git+https://github.com/rocky/python-xdis#egg=xdis pip install -e . + # Not sure why "pip install -e" doesn't work above + # pip install click spark-parser xdis pip install -r requirements-dev.txt - name: Test uncompyle6 run: | diff --git a/NEWS.md b/NEWS.md index 887a597c..853dd00c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,23 @@ +3.9.1: 2024-05-15 +================= + +Lots of changes major changes. track xdis API has changes. + +Separate Phases more clearly: +* disassembly +* tokenization +* parsing +* abstracting to AST (more is done in newer projects) +* printing + +Although we do not decompile bytecode greater than 3.8, code supports running from up to 3.12. + +Many bugs fixed. + +A lot of Linting and coding style modernization. + +Work done in preparation for Blackhat Asia 2024 + 3.9.0: 2022-12-22 ================= diff --git a/PKG-INFO b/PKG-INFO index e2448e0a..bd7c79ce 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,10 +1,355 @@ -Metadata-Version: 2.0 +Metadata-Version: 1.1 Name: uncompyle6 -Version: 2.0.1 -Summary: Python byte-code to source-code converter -Home-page: http://github.com/rocky/python-uncompyle6 -Author: Rocky +Version: 3.9.1 +Summary: Python cross-version byte-code decompiler +Home-page: https://github.com/rocky/python-uncompyle6/ +Author: Rocky Bernstein, Hartmut Goebel, John Aycock, and others Author-email: rb@dustyfeet.com -License: MIT -Description: UNKNOWN +License: GPL3 +Description: |buildstatus| |Pypi Installs| |Latest Version| |Supported Python Versions| + + |packagestatus| + + .. contents:: + + uncompyle6 + ========== + + A native Python cross-version decompiler and fragment decompiler. + The successor to decompyle, uncompyle, and uncompyle2. + + + Introduction + ------------ + + *uncompyle6* translates Python bytecode back into equivalent Python + source code. It accepts bytecodes from Python version 1.0 to version + 3.8, spanning over 24 years of Python releases. We include Dropbox's + Python 2.5 bytecode and some PyPy bytecodes. + + Why this? + --------- + + Ok, I'll say it: this software is amazing. It is more than your + normal hacky decompiler. Using compiler_ technology, the program + creates a parse tree of the program from the instructions; nodes at + the upper levels that look a little like what might come from a Python + AST. So we can really classify and understand what's going on in + sections of Python bytecode. + + Building on this, another thing that makes this different from other + CPython bytecode decompilers is the ability to deparse just + *fragments* of source code and give source-code information around a + given bytecode offset. + + I use the tree fragments to deparse fragments of code *at run time* + inside my trepan_ debuggers_. For that, bytecode offsets are recorded + and associated with fragments of the source code. This purpose, + although compatible with the original intention, is yet a little bit + different. See this_ for more information. + + Python fragment deparsing given an instruction offset is useful in + showing stack traces and can be incorporated into any program that + wants to show a location in more detail than just a line number at + runtime. This code can be also used when source-code information does + not exist and there is just bytecode. Again, my debuggers make use of + this. + + There were (and still are) a number of decompyle, uncompyle, + uncompyle2, uncompyle3 forks around. Many of them come basically from + the same code base, and (almost?) all of them are no longer actively + maintained. One was really good at decompiling Python 1.5-2.3, another + really good at Python 2.7, but that only. Another handles Python 3.2 + only; another patched that and handled only 3.3. You get the + idea. This code pulls all of these forks together and *moves + forward*. There is some serious refactoring and cleanup in this code + base over those old forks. Even more experimental refactoring is going + on in decompyle3_. + + This demonstrably does the best in decompiling Python across all + Python versions. And even when there is another project that only + provides decompilation for subset of Python versions, we generally do + demonstrably better for those as well. + + How can we tell? By taking Python bytecode that comes distributed with + that version of Python and decompiling these. Among those that + successfully decompile, we can then make sure the resulting programs + are syntactically correct by running the Python interpreter for that + bytecode version. Finally, in cases where the program has a test for + itself, we can run the check on the decompiled code. + + We use an automated processes to find bugs. In the issue trackers for + other decompilers, you will find a number of bugs we've found along + the way. Very few to none of them are fixed in the other decompilers. + + Requirements + ------------ + + The code in the git repository can be run from Python 2.4 to the + latest Python version, with the exception of Python 3.0 through + 3.2. Volunteers are welcome to address these deficiencies if there a + desire to do so. + + The way it does this though is by segregating consecutive Python versions into + git branches: + + master + Python 3.6 and up (uses type annotations) + python-3.3-to-3.5 + Python 3.3 through 3.5 (Generic Python 3) + python-2.4 + Python 2.4 through 2.7 (Generic Python 2) + + PyPy 3-2.4 and later works as well. + + The bytecode files it can read have been tested on Python + bytecodes from versions 1.4, 2.1-2.7, and 3.0-3.8 and later PyPy + versions. + + Installation + ------------ + + You can install from PyPI using the name ``uncompyle6``:: + + pip install uncompyle6 + + + To install from source code, this project uses setup.py, so it follows the standard Python routine:: + + $ pip install -e . # set up to run from source tree + + or:: + + $ python setup.py install # may need sudo + + A GNU Makefile is also provided so :code:`make install` (possibly as root or + sudo) will do the steps above. + + Running Tests + ------------- + + :: + + make check + + A GNU makefile has been added to smooth over setting running the right + command, and running tests from fastest to slowest. + + If you have remake_ installed, you can see the list of all tasks + including tests via :code:`remake --tasks` + + + Usage + ----- + + Run + + :: + + $ uncompyle6 *compiled-python-file-pyc-or-pyo* + + For usage help: + + :: + + $ uncompyle6 -h + + Verification + ------------ + + In older versions of Python it was possible to verify bytecode by + decompiling bytecode, and then compiling using the Python interpreter + for that bytecode version. Having done this, the bytecode produced + could be compared with the original bytecode. However as Python's code + generation got better, this no longer was feasible. + + If you want Python syntax verification of the correctness of the + decompilation process, add the :code:`--syntax-verify` option. However since + Python syntax changes, you should use this option if the bytecode is + the right bytecode for the Python interpreter that will be checking + the syntax. + + You can also cross compare the results with another version of + `uncompyle6` since there are sometimes regressions in decompiling + specific bytecode as the overall quality improves. + + For Python 3.7 and 3.8, the code in decompyle3_ is generally + better. + + Or try specific another python decompiler like uncompyle2_, unpyc37_, + or pycdc_. Since the later two work differently, bugs here often + aren't in that, and vice versa. + + There is an interesting class of these programs that is readily + available give stronger verification: those programs that when run + test themselves. Our test suite includes these. + + And Python comes with another a set of programs like this: its test + suite for the standard library. We have some code in :code:`test/stdlib` to + facilitate this kind of checking too. + + Known Bugs/Restrictions + ----------------------- + + The biggest known and possibly fixable (but hard) problem has to do + with handling control flow. (Python has probably the most diverse and + screwy set of compound statements I've ever seen; there + are "else" clauses on loops and try blocks that I suspect many + programmers don't know about.) + + All of the Python decompilers that I have looked at have problems + decompiling Python's control flow. In some cases we can detect an + erroneous decompilation and report that. + + Python support is pretty good for Python 2 + + On the lower end of Python versions, decompilation seems pretty good although + we don't have any automated testing in place for Python's distributed tests. + Also, we don't have a Python interpreter for versions 1.6, and 2.0. + + In the Python 3 series, Python support is strongest around 3.4 or + 3.3 and drops off as you move further away from those versions. Python + 3.0 is weird in that it in some ways resembles 2.6 more than it does + 3.1 or 2.7. Python 3.6 changes things drastically by using word codes + rather than byte codes. As a result, the jump offset field in a jump + instruction argument has been reduced. This makes the :code:`EXTENDED_ARG` + instructions are now more prevalent in jump instruction; previously + they had been rare. Perhaps to compensate for the additional + :code:`EXTENDED_ARG` instructions, additional jump optimization has been + added. So in sum handling control flow by ad hoc means as is currently + done is worse. + + Between Python 3.5, 3.6, 3.7 there have been major changes to the + :code:`MAKE_FUNCTION` and :code:`CALL_FUNCTION` instructions. + + Python 3.8 removes :code:`SETUP_LOOP`, :code:`SETUP_EXCEPT`, + :code:`BREAK_LOOP`, and :code:`CONTINUE_LOOP`, instructions which may + make control-flow detection harder, lacking the more sophisticated + control-flow analysis that is planned. We'll see. + + Currently not all Python magic numbers are supported. Specifically in + some versions of Python, notably Python 3.6, the magic number has + changes several times within a version. + + **We support only released versions, not candidate versions.** Note + however that the magic of a released version is usually the same as + the *last* candidate version prior to release. + + There are also customized Python interpreters, notably Dropbox, + which use their own magic and encrypt bytecode. With the exception of + the Dropbox's old Python 2.5 interpreter this kind of thing is not + handled. + + We also don't handle PJOrion_ or otherwise obfuscated code. For + PJOrion try: PJOrion Deobfuscator_ to unscramble the bytecode to get + valid bytecode before trying this tool; pydecipher_ might help with that. + + This program can't decompile Microsoft Windows EXE files created by + Py2EXE_, although we can probably decompile the code after you extract + the bytecode properly. `Pydeinstaller `_ may help with unpacking Pyinstaller bundlers. + + Handling pathologically long lists of expressions or statements is + slow. We don't handle Cython_ or MicroPython which don't use bytecode. + + There are numerous bugs in decompilation. And that's true for every + other CPython decompiler I have encountered, even the ones that + claimed to be "perfect" on some particular version like 2.4. + + As Python progresses decompilation also gets harder because the + compilation is more sophisticated and the language itself is more + sophisticated. I suspect that attempts there will be fewer ad-hoc + attempts like unpyc37_ (which is based on a 3.3 decompiler) simply + because it is harder to do so. The good news, at least from my + standpoint, is that I think I understand what's needed to address the + problems in a more robust way. But right now until such time as + project is better funded, I do not intend to make any serious effort + to support Python versions 3.8 or 3.9, including bugs that might come + in. I imagine at some point I may be interested in it. + + You can easily find bugs by running the tests against the standard + test suite that Python uses to check itself. At any given time, there are + dozens of known problems that are pretty well isolated and that could + be solved if one were to put in the time to do so. The problem is that + there aren't that many people who have been working on bug fixing. + + Some of the bugs in 3.7 and 3.8 are simply a matter of back-porting + the fixes in decompyle3. Volunteers are welcome to do so. + + You may run across a bug, that you want to report. Please do so after + reading `How to report a bug + `_ and + follow the `instructions when opening an issue `_. + + Be aware that it might not get my attention for a while. If you + sponsor or support the project in some way, I'll prioritize your + issues above the queue of other things I might be doing instead. + + See Also + -------- + + * https://github.com/rocky/python-decompile3 : Much smaller and more modern code, focusing on 3.7 and 3.8. Changes in that will get migrated back here. + * https://code.google.com/archive/p/unpyc3/ : supports Python 3.2 only. The above projects use a different decompiling technique than what is used here. Currently unmaintained. + * https://github.com/figment/unpyc3/ : fork of above, but supports Python 3.3 only. Includes some fixes like supporting function annotations. Currently unmaintained. + * https://github.com/wibiti/uncompyle2 : supports Python 2.7 only, but does that fairly well. There are situations where :code:`uncompyle6` results are incorrect while :code:`uncompyle2` results are not, but more often uncompyle6 is correct when uncompyle2 is not. Because :code:`uncompyle6` adheres to accuracy over idiomatic Python, :code:`uncompyle2` can produce more natural-looking code when it is correct. Currently :code:`uncompyle2` is lightly maintained. See its issue `tracker `_ for more details. + * `How to report a bug `_ + * The HISTORY_ file. + * https://github.com/rocky/python-xdis : Cross Python version disassembler + * https://github.com/rocky/python-xasm : Cross Python version assembler + * https://github.com/rocky/python-uncompyle6/wiki : Wiki Documents which describe the code and aspects of it in more detail + * https://github.com/zrax/pycdc : The README for this C++ code says it aims to support all versions of Python. You can aim your slign shot for the moon too, but I doubt you are going to hit it. This code is best for Python versions around 2.7 and 3.3 when the code was initially developed. Accuracy for current versions of Python3 and early versions of Python is lacking. Without major effort, it is unlikely it can be made to support current Python 3. See its `issue tracker `_ for details. Currently lightly maintained. + + + .. _Cython: https://en.wikipedia.org/wiki/Cython + .. _trepan: https://pypi.python.org/pypi/trepan3k + .. _compiler: https://github.com/rocky/python-uncompyle6/wiki/How-does-this-code-work%3F + .. _HISTORY: https://github.com/rocky/python-uncompyle6/blob/master/HISTORY.md + .. _report_bug: https://github.com/rocky/python-uncompyle6/blob/master/HOW-TO-REPORT-A-BUG.md + .. _debuggers: https://pypi.python.org/pypi/trepan3k + .. _remake: https://bashdb.sf.net/remake + .. _pycdc: https://github.com/zrax/pycdc + .. _decompyle3: https://github.com/rocky/python-decompile3 + .. _uncompyle2: https://github.com/wibiti/uncompyle2 + .. _unpyc37: https://github.com/andrew-tavera/unpyc37 + .. _this: https://github.com/rocky/python-uncompyle6/wiki/Deparsing-technology-and-its-use-in-exact-location-reporting + .. |buildstatus| image:: https://travis-ci.org/rocky/python-uncompyle6.svg + :target: https://travis-ci.org/rocky/python-uncompyle6 + .. |packagestatus| image:: https://repology.org/badge/vertical-allrepos/python:uncompyle6.svg + :target: https://repology.org/project/python:uncompyle6/versions + .. _PJOrion: http://www.koreanrandom.com/forum/topic/15280-pjorion-%D1%80%D0%B5%D0%B4%D0%B0%D0%BA%D1%82%D0%B8%D1%80%D0%BE%D0%B2%D0%B0%D0%BD%D0%B8%D0%B5-%D0%BA%D0%BE%D0%BC%D0%BF%D0%B8%D0%BB%D1%8F%D1%86%D0%B8%D1%8F-%D0%B4%D0%B5%D0%BA%D0%BE%D0%BC%D0%BF%D0%B8%D0%BB%D1%8F%D1%86%D0%B8%D1%8F-%D0%BE%D0%B1%D1%84 + .. _pydecipher: https://github.com/mitre/pydecipher + .. _Deobfuscator: https://github.com/extremecoders-re/PjOrion-Deobfuscator + .. _Py2EXE: https://en.wikipedia.org/wiki/Py2exe + .. |Supported Python Versions| image:: https://img.shields.io/pypi/pyversions/uncompyle6.svg + .. |Latest Version| image:: https://badge.fury.io/py/uncompyle6.svg + :target: https://badge.fury.io/py/uncompyle6 + .. |Pypi Installs| image:: https://pepy.tech/badge/uncompyle6/month + + Platform: UNKNOWN +Classifier: Development Status :: 5 - Production/Stable +Classifier: Intended Audience :: Developers +Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3) +Classifier: Operating System :: OS Independent +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: 2 +Classifier: Programming Language :: Python :: 2.4 +Classifier: Programming Language :: Python :: 2.5 +Classifier: Programming Language :: Python :: 2.6 +Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.0 +Classifier: Programming Language :: Python :: 3.1 +Classifier: Programming Language :: Python :: 3.2 +Classifier: Programming Language :: Python :: 3.3 +Classifier: Programming Language :: Python :: 3.4 +Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 +Classifier: Programming Language :: Python :: 3.9 +Classifier: Programming Language :: Python :: 3.10 +Classifier: Programming Language :: Python :: 3.11 +Classifier: Programming Language :: Python :: 3.12 +Classifier: Programming Language :: Python :: Implementation :: PyPy +Classifier: Topic :: Software Development :: Debuggers +Classifier: Topic :: Software Development :: Libraries :: Python Modules diff --git a/__pkginfo__.py b/__pkginfo__.py index 98fa63d5..2f220105 100644 --- a/__pkginfo__.py +++ b/__pkginfo__.py @@ -62,6 +62,8 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Software Development :: Debuggers", "Topic :: Software Development :: Libraries :: Python Modules", diff --git a/admin-tools/make-dist-2.4-2.7.sh b/admin-tools/make-dist-2.4-2.7.sh index 0b1f520a..a0ac73b8 100755 --- a/admin-tools/make-dist-2.4-2.7.sh +++ b/admin-tools/make-dist-2.4-2.7.sh @@ -3,9 +3,9 @@ PACKAGE=uncompyle6 # FIXME put some of the below in a common routine function finish { - cd $owd + cd $make_dist_uncompyle6_owd } -owd=$(pwd) +make_dist_uncompyle6_owd=$(pwd) trap finish EXIT cd $(dirname ${BASH_SOURCE[0]}) @@ -21,6 +21,11 @@ source $PACKAGE/version.py echo $__version__ for pyversion in $PYVERSIONS; do + echo --- $pyversion --- + if [[ ${pyversion:0:4} == "pypy" ]] ; then + echo "$pyversion - PyPy does not get special packaging" + continue + fi if ! pyenv local $pyversion ; then exit $? fi @@ -41,3 +46,4 @@ tarball=dist/${PACKAGE}-${__version_}_-tar.gz if [[ -f $tarball ]]; then rm -v dist/${PACKAGE}-${__version__}-tar.gz fi +finish diff --git a/admin-tools/make-dist-3.0-3.2.sh b/admin-tools/make-dist-3.0-3.2.sh new file mode 100644 index 00000000..e5149c41 --- /dev/null +++ b/admin-tools/make-dist-3.0-3.2.sh @@ -0,0 +1,49 @@ +#!/bin/bash +PACKAGE=uncompyle6 + +# FIXME put some of the below in a common routine +function finish { + cd $uncompyle6_30_make_dist_owd +} + +cd $(dirname ${BASH_SOURCE[0]}) +uncompyle6_30_make_dist_owd=$(pwd) +trap finish EXIT + +if ! source ./pyenv-3.0-3.2-versions ; then + exit $? +fi +if ! source ./setup-python-3.0.sh ; then + exit $? +fi + +cd .. +source $PACKAGE/version.py +echo $__version__ + +for pyversion in $PYVERSIONS; do + echo --- $pyversion --- + if [[ ${pyversion:0:4} == "pypy" ]] ; then + echo "$pyversion - PyPy does not get special packaging" + continue + fi + if ! pyenv local $pyversion ; then + exit $? + fi + # pip bdist_egg create too-general wheels. So + # we narrow that by moving the generated wheel. + + # Pick out first two number of version, e.g. 3.5.1 -> 35 + first_two=$(echo $pyversion | cut -d'.' -f 1-2 | sed -e 's/\.//') + rm -fr build + python setup.py bdist_egg bdist_wheel + mv -v dist/${PACKAGE}-$__version__-{py2.py3,py$first_two}-none-any.whl + echo === $pyversion === +done + +python ./setup.py sdist +tarball=dist/${PACKAGE}-${__version__}.tar.gz +if [[ -f $tarball ]]; then + mv -v $tarball dist/${PACKAGE}_31-${__version__}.tar.gz +fi +finish diff --git a/admin-tools/make-dist-3.3-3.5.sh b/admin-tools/make-dist-3.3-3.5.sh index 95426ffb..1c1f214b 100755 --- a/admin-tools/make-dist-3.3-3.5.sh +++ b/admin-tools/make-dist-3.3-3.5.sh @@ -3,11 +3,11 @@ PACKAGE=uncompyle6 # FIXME put some of the below in a common routine function finish { - cd $owd + cd $uncompyle6_33_make_owd } cd $(dirname ${BASH_SOURCE[0]}) -owd=$(pwd) +uncompyle6_33_make_owd=$(pwd) trap finish EXIT if ! source ./pyenv-3.3-3.5-versions ; then @@ -22,6 +22,11 @@ source $PACKAGE/version.py echo $__version__ for pyversion in $PYVERSIONS; do + echo --- $pyversion --- + if [[ ${pyversion:0:4} == "pypy" ]] ; then + echo "$pyversion - PyPy does not get special packaging" + continue + fi if ! pyenv local $pyversion ; then exit $? fi @@ -33,6 +38,12 @@ for pyversion in $PYVERSIONS; do rm -fr build python setup.py bdist_egg bdist_wheel mv -v dist/${PACKAGE}-$__version__-{py2.py3,py$first_two}-none-any.whl + echo === $pyversion === done python ./setup.py sdist +tarball=dist/${PACKAGE}-${__version__}.tar.gz +if [[ -f $tarball ]]; then + mv -v $tarball dist/${PACKAGE}_31-${__version__}.tar.gz +fi +finish diff --git a/admin-tools/make-dist-newest.sh b/admin-tools/make-dist-newest.sh index af04b060..f5b967af 100755 --- a/admin-tools/make-dist-newest.sh +++ b/admin-tools/make-dist-newest.sh @@ -3,11 +3,11 @@ PACKAGE=uncompyle6 # FIXME put some of the below in a common routine function finish { - cd $owd + cd $make_uncompyle6_newest_owd } cd $(dirname ${BASH_SOURCE[0]}) -owd=$(pwd) +make_uncompyle6_newest_owd=$(pwd) trap finish EXIT if ! source ./pyenv-newest-versions ; then @@ -22,6 +22,11 @@ source $PACKAGE/version.py echo $__version__ for pyversion in $PYVERSIONS; do + echo --- $pyversion --- + if [[ ${pyversion:0:4} == "pypy" ]] ; then + echo "$pyversion - PyPy does not get special packaging" + continue + fi if ! pyenv local $pyversion ; then exit $? fi @@ -36,3 +41,4 @@ for pyversion in $PYVERSIONS; do done python ./setup.py sdist +finish diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..d78c173e --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,64 @@ +[build-system] +requires = [ + "setuptools>=61.2", +] + +build-backend = "setuptools.build_meta" + +[project] +authors = [ + {name = "Rocky Bernstein", email = "rb@dustyfeet.com"}, +] + +name = "uncompyle6" +description = "Python cross-version byte-code library and disassembler" +dependencies = [ + "click", + "spark-parser >= 1.8.9, < 1.9.0", + "xdis >= 6.0.8, < 6.2.0", +] +readme = "README.rst" +license = {text = "GPL"} +keywords = ["Python bytecode", "bytecode", "disassembler"] +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Programming Language :: Python", + "Topic :: Software Development :: Libraries :: Python Modules", + "Programming Language :: Python :: 2.4", + "Programming Language :: Python :: 2.5", + "Programming Language :: Python :: 2.6", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3.0", + "Programming Language :: Python :: 3.1", + "Programming Language :: Python :: 3.2", + "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", +] +dynamic = ["version"] + +[project.urls] +Homepage = "https://github.com/rocky/python-uncompyle6" +Downloads = "https://github.com/rocky/python-uncompyle6/releases" + +[project.optional-dependencies] +dev = [ + "pre-commit", + "pytest", +] + +[project.scripts] +uncompyle6 = "uncompyle6.bin.uncompile:main_bin" +uncompyle6-tokenize = "uncompyle6.bin.pydisassemble:main" + +[tool.setuptools.dynamic] +version = {attr = "uncompyle6.version.__version__"} diff --git a/setup.cfg b/setup.cfg index 7231ec47..bfef9f4a 100755 --- a/setup.cfg +++ b/setup.cfg @@ -12,10 +12,11 @@ doc_files = README.rst # examples/ [bdist_wheel] -universal=1 +universal = no [metadata] description_file = README.rst +licences_files = COPYING [flake8] # max-line-length setting: NO we do not want everyone writing 120-character lines! diff --git a/setup.py b/setup.py index 515ee367..2ff64d0f 100755 --- a/setup.py +++ b/setup.py @@ -1,61 +1,6 @@ #!/usr/bin/env python -import setuptools -import sys +"""Setup script for the 'xdis' distribution.""" -"""Setup script for the 'uncompyle6' distribution.""" +from setuptools import setup -SYS_VERSION = sys.version_info[0:2] -if not ((2, 4) <= SYS_VERSION < (3, 13)): - mess = "Python Release 2.6 .. 3.12 are supported in this code branch." - if (2, 4) <= SYS_VERSION <= (2, 7): - mess += ( - "\nFor your Python, version %s, use the python-2.4 code/branch." - % sys.version[0:3] - ) - if (3, 3) <= SYS_VERSION < (3, 6): - mess += ( - "\nFor your Python, version %s, use the python-3.3-to-3.5 code/branch." - % sys.version[0:3] - ) - elif SYS_VERSION < (2, 4): - mess += ( - "\nThis package is not supported for Python version %s." % sys.version[0:3] - ) - print(mess) - raise Exception(mess) - -from __pkginfo__ import ( - author, - author_email, - install_requires, - license, - long_description, - classifiers, - entry_points, - modname, - py_modules, - short_desc, - __version__, - web, - zip_safe, -) - -setuptools.setup( - author=author, - author_email=author_email, - classifiers=classifiers, - description=short_desc, - entry_points=entry_points, - install_requires=install_requires, - license=license, - long_description=long_description, - long_description_content_type="text/x-rst", - name=modname, - packages=setuptools.find_packages(), - py_modules=py_modules, - test_suite="nose.collector", - url=web, - tests_require=["nose>=1.0"], - version=__version__, - zip_safe=zip_safe, -) +setup(packages=["uncompyle6"]) diff --git a/uncompyle6/version.py b/uncompyle6/version.py index 03e22cc7..669350ed 100644 --- a/uncompyle6/version.py +++ b/uncompyle6/version.py @@ -14,4 +14,4 @@ # This file is suitable for sourcing inside POSIX shell as # well as importing into Python # fmt: off -__version__="3.9.1.dev0" # noqa +__version__="3.9.1" # noqa