Skip to content

Commit b428516

Browse files
committed
Revise README.rst to mention Git branches for install.
1 parent 497ab20 commit b428516

1 file changed

Lines changed: 42 additions & 6 deletions

File tree

README.rst

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,20 @@ The way it does this, though, is by segregating consecutive Python versions into
8686
git branches:
8787

8888
master
89+
<<<<<<< Updated upstream
8990
Python 3.11 and up
9091
python-3.6-to-3.10
9192
Python 3.6 to python-3.10 (uses type annotations)
93+
=======
94+
Python 3.11 and up (uses poetry install, and newer Python idioms)
95+
python-3.6-to-3.10
96+
Python 3.6 through 3.10 (uses newer f-strings, and more modern, and more modern Type annotations)
97+
>>>>>>> Stashed changes
98+
python-3.3-to-3.5
99+
Python 3.3 through 3.5 (Generic Python 3)
92100
python-3.3-to-3.5
93101
Python 3.3 through 3.5 (Generic Python 3)
94-
python-2.4
102+
python-2.4-to-2.7
95103
Python 2.4 through 2.7 (Generic Python 2)
96104

97105
PyPy 3-2.4 and later works as well.
@@ -103,18 +111,42 @@ versions.
103111
Installation
104112
------------
105113

106-
You can install from PyPI using the name ``uncompyle6``::
114+
*For recent Python releases (Python 3.11+)*, you can install from PyPI using the name ``uncompyle6``::
107115

108116
pip install uncompyle6
109117

118+
*For Python releases before 3.11*, do not install using PyPI, but instead install using a file in the [GitHub Releases section](https://github.com/rocky/python-uncompyle6/releases). Older Python used to use `easy_install <https://python101.pythonlibrary.org/chapter29_pip.html#using-easy-install>`_. But this is no longer supported in PyPi.
110119

111-
To install from source code, this project uses setup.py, so it follows the standard Python routine::
120+
If the Python version you are running uncompyle6 is between Python 2.4 through 2.7, use a tarball called uncompyle6_24-*x.y.z*.tar.gz.
112121

113-
$ pip install -e . # set up to run from source tree
122+
If the Python version you are running uncompyle6 is between Python 3.0 through 3.2, use a tarball called uncompyle6_30-*x.y.z*.tar.gz.
123+
124+
If the Python version you are running uncompyle6 is between Python 3.3 through 3.5, use a tarball called uncompyle6_33-*x.y.z*.tar.gz.
125+
126+
If the Python version you are running uncompyle6 is between Python 3.6 through 3.11, use a tarball called uncompyle6_36-*x.y.z*.tar.gz.
127+
128+
If the Python version you are running uncompyle6 is 3.11 or later, use a called uncompyle6-*x.y.z*.tar.gz.
129+
130+
You can also try eggs or wheel that have the same version designation, e.g., uncompyle6-*x.y.z*-py39-non-any.whl for a Python 3.9 installation. *However, note that *the version without the designation, means Python 3.11 or greater*.
114131

115-
or::
132+
Similarly a tarball with without `_`*xx* works only from Python 3.11 or greaters
133+
134+
135+
Rationale for using Git Branches
136+
++++++++++++++++++++++++++++++++
137+
138+
It is currently impossible (if not impractical) to have one Python source code of this complexity and with this many features that can run both Python 2.7 and Python 3.13+. The languages have drifted so much, and Packing is vastly different. In fact, the packaging practice for Python 3.11+ is incompatible with Python 2.7 (and before back to Python 2.4), which favored "easy_install".
139+
140+
Installation from source text
141+
++++++++++++++++++++++++++++++
142+
143+
To install from source code make sure you have the right github
144+
branch. See the Requirements section for the Git branch names.
145+
146+
After setting the right branch:
147+
148+
$ pip install -e . # set up to run from source tree
116149

117-
$ python setup.py install # may need sudo
118150

119151
A GNU Makefile is also provided, so :code:`make install` (possibly as root or
120152
sudo) will do the steps above.
@@ -274,7 +306,11 @@ Be aware that it might not get my attention for a while. If you
274306
sponsor or support the project in some way, I'll prioritize your
275307
issues above the queue of other things I might be doing instead. In
276308
rare situations, I can do a hand decompilation of bytecode for a fee.
309+
<<<<<<< Updated upstream
277310
However, this is expensive, usually beyond what most people are willing
311+
=======
312+
However this is expansive, usually beyond what most people are willing
313+
>>>>>>> Stashed changes
278314
to spend.
279315

280316
See Also

0 commit comments

Comments
 (0)