Skip to content

Commit b7eae4f

Browse files
rockyrocky
committed
Get ready for release 3.9.1
1 parent bec88e4 commit b7eae4f

File tree

13 files changed

+175
-73
lines changed

13 files changed

+175
-73
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ jobs:
4343
- run:
4444
command: | # Use pip to install dependengcies
4545
sudo pip install --user --upgrade setuptools
46-
# Until the next release
47-
sudo pip install git+https://github.com/rocky/python-xdis#egg=xdis
4846
pip install --user -e .
47+
# Not sure why "pip install -e" doesn't work above
48+
# pip install click spark-parser xdis
4949
pip install --user -r requirements-dev.txt
5050
5151
# Save dependency cache

‎.github/workflows/osx.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
- name: Install dependencies
2323
run: |
2424
python -m pip install --upgrade pip
25-
# Until the next xdis release
26-
pip install git+https://github.com/rocky/python-xdis#egg=xdis
2725
pip install -e .
26+
# Not sure why "pip install -e" doesn't work above
27+
# pip install click spark-parser xdis
2828
pip install -r requirements-dev.txt
2929
- name: Test uncompyle6
3030
run: |

‎.github/workflows/ubuntu.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ jobs:
2121
- name: Install dependencies
2222
run: |
2323
python -m pip install --upgrade pip
24-
# Until the next xdis release
25-
pip install git+https://github.com/rocky/python-xdis#egg=xdis
2624
pip install -e .
25+
# pip install click spark-parser xdis
2726
pip install -r requirements-dev.txt
2827
- name: Test uncompyle6
2928
run: |

‎.github/workflows/windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
- name: Install dependencies
2323
run: |
2424
python -m pip install --upgrade pip
25-
# Until the next xdis release
26-
pip install git+https://github.com/rocky/python-xdis#egg=xdis
2725
pip install -e .
26+
# Not sure why "pip install -e" doesn't work above
27+
# pip install click spark-parser xdis
2828
pip install -r requirements-dev.txt
2929
- name: Test uncompyle6
3030
run: |

‎NEWS.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
3.9.1: 2024-05-15
2+
=================
3+
4+
Lots of changes major changes. track xdis API has changes.
5+
6+
Separate Phases more clearly:
7+
* disassembly
8+
* tokenization
9+
* parsing
10+
* abstracting to AST (more is done in newer projects)
11+
* printing
12+
13+
Although we do not decompile bytecode greater than 3.8, code supports running from up to 3.12.
14+
15+
Many bugs fixed.
16+
17+
A lot of Linting and coding style modernization.
18+
19+
Work done in preparation for Blackhat Asia 2024
20+
121
3.9.0: 2022-12-22
222
=================
323

‎__pkginfo__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@
6262
"Programming Language :: Python :: 3.8",
6363
"Programming Language :: Python :: 3.9",
6464
"Programming Language :: Python :: 3.10",
65+
"Programming Language :: Python :: 3.11",
66+
"Programming Language :: Python :: 3.12",
6567
"Programming Language :: Python :: Implementation :: PyPy",
6668
"Topic :: Software Development :: Debuggers",
6769
"Topic :: Software Development :: Libraries :: Python Modules",

‎admin-tools/make-dist-2.4-2.7.sh‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ PACKAGE=uncompyle6
33

44
# FIXME put some of the below in a common routine
55
function finish {
6-
cd $owd
6+
cd $make_dist_uncompyle6_owd
77
}
8-
owd=$(pwd)
8+
make_dist_uncompyle6_owd=$(pwd)
99
trap finish EXIT
1010

1111
cd $(dirname ${BASH_SOURCE[0]})
@@ -21,6 +21,11 @@ source $PACKAGE/version.py
2121
echo $__version__
2222

2323
for pyversion in $PYVERSIONS; do
24+
echo --- $pyversion ---
25+
if [[ ${pyversion:0:4} == "pypy" ]] ; then
26+
echo "$pyversion - PyPy does not get special packaging"
27+
continue
28+
fi
2429
if ! pyenv local $pyversion ; then
2530
exit $?
2631
fi
@@ -41,3 +46,4 @@ tarball=dist/${PACKAGE}-${__version_}_-tar.gz
4146
if [[ -f $tarball ]]; then
4247
rm -v dist/${PACKAGE}-${__version__}-tar.gz
4348
fi
49+
finish

‎admin-tools/make-dist-3.0-3.2.sh‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#!/bin/bash
2+
PACKAGE=uncompyle6
3+
4+
# FIXME put some of the below in a common routine
5+
function finish {
6+
cd $uncompyle6_30_make_dist_owd
7+
}
8+
9+
cd $(dirname ${BASH_SOURCE[0]})
10+
uncompyle6_30_make_dist_owd=$(pwd)
11+
trap finish EXIT
12+
13+
if ! source ./pyenv-3.0-3.2-versions ; then
14+
exit $?
15+
fi
16+
if ! source ./setup-python-3.0.sh ; then
17+
exit $?
18+
fi
19+
20+
cd ..
21+
source $PACKAGE/version.py
22+
echo $__version__
23+
24+
for pyversion in $PYVERSIONS; do
25+
echo --- $pyversion ---
26+
if [[ ${pyversion:0:4} == "pypy" ]] ; then
27+
echo "$pyversion - PyPy does not get special packaging"
28+
continue
29+
fi
30+
if ! pyenv local $pyversion ; then
31+
exit $?
32+
fi
33+
# pip bdist_egg create too-general wheels. So
34+
# we narrow that by moving the generated wheel.
35+
36+
# Pick out first two number of version, e.g. 3.5.1 -> 35
37+
first_two=$(echo $pyversion | cut -d'.' -f 1-2 | sed -e 's/\.//')
38+
rm -fr build
39+
python setup.py bdist_egg bdist_wheel
40+
mv -v dist/${PACKAGE}-$__version__-{py2.py3,py$first_two}-none-any.whl
41+
echo === $pyversion ===
42+
done
43+
44+
python ./setup.py sdist
45+
tarball=dist/${PACKAGE}-${__version__}.tar.gz
46+
if [[ -f $tarball ]]; then
47+
mv -v $tarball dist/${PACKAGE}_31-${__version__}.tar.gz
48+
fi
49+
finish

‎admin-tools/make-dist-3.3-3.5.sh‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ PACKAGE=uncompyle6
33

44
# FIXME put some of the below in a common routine
55
function finish {
6-
cd $owd
6+
cd $uncompyle6_33_make_owd
77
}
88

99
cd $(dirname ${BASH_SOURCE[0]})
10-
owd=$(pwd)
10+
uncompyle6_33_make_owd=$(pwd)
1111
trap finish EXIT
1212

1313
if ! source ./pyenv-3.3-3.5-versions ; then
@@ -22,6 +22,11 @@ source $PACKAGE/version.py
2222
echo $__version__
2323

2424
for pyversion in $PYVERSIONS; do
25+
echo --- $pyversion ---
26+
if [[ ${pyversion:0:4} == "pypy" ]] ; then
27+
echo "$pyversion - PyPy does not get special packaging"
28+
continue
29+
fi
2530
if ! pyenv local $pyversion ; then
2631
exit $?
2732
fi
@@ -33,6 +38,12 @@ for pyversion in $PYVERSIONS; do
3338
rm -fr build
3439
python setup.py bdist_egg bdist_wheel
3540
mv -v dist/${PACKAGE}-$__version__-{py2.py3,py$first_two}-none-any.whl
41+
echo === $pyversion ===
3642
done
3743

3844
python ./setup.py sdist
45+
tarball=dist/${PACKAGE}-${__version__}.tar.gz
46+
if [[ -f $tarball ]]; then
47+
mv -v $tarball dist/${PACKAGE}_31-${__version__}.tar.gz
48+
fi
49+
finish

‎admin-tools/make-dist-newest.sh‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ PACKAGE=uncompyle6
33

44
# FIXME put some of the below in a common routine
55
function finish {
6-
cd $owd
6+
cd $make_uncompyle6_newest_owd
77
}
88

99
cd $(dirname ${BASH_SOURCE[0]})
10-
owd=$(pwd)
10+
make_uncompyle6_newest_owd=$(pwd)
1111
trap finish EXIT
1212

1313
if ! source ./pyenv-newest-versions ; then
@@ -22,6 +22,11 @@ source $PACKAGE/version.py
2222
echo $__version__
2323

2424
for pyversion in $PYVERSIONS; do
25+
echo --- $pyversion ---
26+
if [[ ${pyversion:0:4} == "pypy" ]] ; then
27+
echo "$pyversion - PyPy does not get special packaging"
28+
continue
29+
fi
2530
if ! pyenv local $pyversion ; then
2631
exit $?
2732
fi
@@ -36,3 +41,4 @@ for pyversion in $PYVERSIONS; do
3641
done
3742

3843
python ./setup.py sdist
44+
finish

0 commit comments

Comments
 (0)