mirror of
https://github.com/rocky/python-uncompyle6.git
synced 2024-11-26 22:50:40 +00:00
Merge hell
This commit is contained in:
commit
9ade8e9806
@ -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"
|
||||
|
3
admin-tools/.gitignore
vendored
3
admin-tools/.gitignore
vendored
@ -1,2 +1,5 @@
|
||||
/.python-version
|
||||
<<<<<<< HEAD
|
||||
/.python-version
|
||||
=======
|
||||
>>>>>>> master
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -28,7 +28,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
|
||||
|
Loading…
Reference in New Issue
Block a user