Merge hell

This commit is contained in:
rocky
2024-10-08 16:49:03 -04:00
5 changed files with 7 additions and 4 deletions

View File

@@ -79,7 +79,7 @@ entry_points = {
] ]
} }
ftp_url = None 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" license = "GPL3"
mailing_list = "python-debugger@googlegroups.com" mailing_list = "python-debugger@googlegroups.com"

View File

@@ -1,2 +1,5 @@
/.python-version /.python-version
<<<<<<< HEAD
/.python-version /.python-version
=======
>>>>>>> master

View File

@@ -14,7 +14,7 @@ fulldir=$(readlink -f $mydir)
cd $mydir cd $mydir
. ./checkout_common.sh . ./checkout_common.sh
(cd $fulldir/.. && \ (cd $fulldir/.. && \
setup_version python-spark master && \ setup_version python-spark python-3.0 && \
setup_version python-xdis python-3.0) setup_version python-xdis python-3.0)
checkout_finish python-3.0-to-3.2 checkout_finish python-3.0-to-3.2

View File

@@ -15,7 +15,7 @@ fulldir=$(readlink -f $mydir)
. ./checkout_common.sh . ./checkout_common.sh
cd $fulldir/.. cd $fulldir/..
(cd $fulldir/.. && \ (cd $fulldir/.. && \
setup_version python-spark master && \ setup_version python-spark python-3.3 && \
setup_version python-xdis python-3.3 ) setup_version python-xdis python-3.3 )
checkout_finish python-3.3-to-3.5 checkout_finish python-3.3-to-3.5

View File

@@ -28,7 +28,7 @@ def usage():
# __doc__ = """ # __doc__ = """
# Usage: # Usage:
# %s [OPTIONS]... [ FILE | DIR]... # %s [OPTIONS]... [ FILE | DIR]...
# %s [--help | -h | --V | --version] # %s [--help | --version]
# Examples: # Examples:
# %s foo.pyc bar.pyc # decompile foo.pyc, bar.pyc to stdout # %s foo.pyc bar.pyc # decompile foo.pyc, bar.pyc to stdout