Skip to content

Commit fd64c6d

Browse files
author
rocky
committed
Get ready for release 6.1.0
1 parent 2217985 commit fd64c6d

File tree

8 files changed

+91
-20
lines changed

8 files changed

+91
-20
lines changed

NEWS.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
6.1.0 2024-03-15
2+
=================
3+
4+
Lots of changes major changes. API has changed.
5+
6+
We now support many disassembly options:
7+
* classic: disasm-like output
8+
* bytes: disasm-like output with bytecode
9+
* extended: simple interpretation of previous sequence of instructions
10+
* extended-bytes: same as above, but with "bytes" bytecode ouptut
11+
* header: show header/metadata information only
12+
13+
This is reflected in the `--format` (`-F`) options on `pydisasm`.
14+
Option `--show-source` (`-S`) gives add the source text line (or part of it) before assembly instructions that implement the line.
15+
16+
Released Python magic numbers have been updated as of this release (up to Python 3.12.2, including PyPy magic numbers.
17+
18+
Some support for the [GraalVM](https://www.graalvm.org/python/)
19+
implementation of Python started.
20+
21+
Many bugs fixed.
22+
23+
A lot of Linting and coding style modernization.
24+
25+
typing.NameTuple used for Python versions that support this.
26+
Additional fields "start_offset" and "tos_str" added to instruction.
27+
28+
Elliot Tarbet (2elli) largely provided support for Python 3.11 and 3.12 bytecode
29+
30+
131
6.0.5 2022-12-22
232
=================
333

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,14 @@ fi
1919

2020
cd ..
2121
source $PACKAGE/version.py
22-
echo $VERSION
22+
echo $__version__
2323

2424
for pyversion in $PYVERSIONS; do
2525
echo --- $pyversion ---
26+
if [[ ${pyversion:0:4} == "pypy" ]] ; then
27+
echo "$pyversion - PyPy does not get special packaging"
28+
continue
29+
fi
2630
if ! pyenv local $pyversion ; then
2731
exit $?
2832
fi

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

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,40 @@ fi
1919

2020
cd ..
2121
source $PACKAGE/version.py
22-
echo $VERSION
22+
echo $__version__
2323

2424
for pyversion in $PYVERSIONS; do
2525
echo --- $pyversion ---
26+
if [[ ${pyversion:0:4} == "pypy" ]] ; then
27+
echo "$pyversion - PyPy does not get special packaging"
28+
continue
29+
fi
2630
if ! pyenv local $pyversion ; then
27-
exit $?
31+
exit $?
2832
fi
2933
# pip bdist_egg create too-general wheels. So
3034
# we narrow that by moving the generated wheel.
3135

32-
# Pick out first two number of version, e.g. 3.5.1 -> 35
36+
# Pick out first two numbers of version, e.g. 3.5.1 -> 35
3337
first_two=$(echo $pyversion | cut -d'.' -f 1-2 | sed -e 's/\.//')
3438
rm -fr build
3539
python setup.py bdist_egg bdist_wheel
36-
mv -v dist/${PACKAGE}-$VERSION-{py3,py$first_two}-none-any.whl
40+
if [[ $first_two =~ py* ]]; then
41+
if [[ $first_two =~ pypy* ]]; then
42+
# For PyPy, remove the what is after the dash, e.g. pypy37-none-any.whl instead of pypy37-7-none-any.whl
43+
first_two=${first_two%-*}
44+
fi
45+
mv -v dist/${PACKAGE}-$__version__-{py3,$first_two}-none-any.whl
46+
else
47+
mv -v dist/${PACKAGE}-$__version__-{py3,py$first_two}-none-any.whl
48+
fi
3749
echo === $pyversion ===
3850
done
3951

4052
python ./setup.py sdist
53+
54+
tarball=dist/${PACKAGE}-${__version__}.tar.gz
55+
if [[ -f $tarball ]]; then
56+
mv -v $tarball dist/${PACKAGE}_33-${__version__}.tar.gz
57+
fi
58+
finish

admin-tools/make-dist-3.6-3.10.sh

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ PACKAGE=xdis
33

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

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

1313
if ! source ./pyenv-3.6-3.10-versions ; then
@@ -19,22 +19,32 @@ fi
1919

2020
cd ..
2121
source $PACKAGE/version.py
22-
echo $VERSION
22+
echo $__version__
2323

2424
for pyversion in $PYVERSIONS; do
2525
echo --- $pyversion ---
26+
if [[ ${pyversion:0:4} == "pypy" ]] ; then
27+
echo "$pyversion - PyPy does not get special packaging"
28+
continue
29+
fi
2630
if ! pyenv local $pyversion ; then
2731
exit $?
2832
fi
2933
# pip bdist_egg create too-general wheels. So
3034
# we narrow that by moving the generated wheel.
3135

32-
# Pick out first two number of version, e.g. 3.5.1 -> 35
36+
# Pick out first two numbers of version, e.g. 3.5.1 -> 35
3337
first_two=$(echo $pyversion | cut -d'.' -f 1-2 | sed -e 's/\.//')
3438
rm -fr build
35-
# python setup.py bdist_egg bdist_wheel
39+
python setup.py bdist_egg bdist_wheel
3640
mv -v dist/${PACKAGE}-$VERSION-{py3,py$first_two}-none-any.whl
3741
echo === $pyversion ===
3842
done
3943

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

admin-tools/make-dist-newest.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ echo $__version__
2323

2424
for pyversion in $PYVERSIONS; do
2525
echo --- $pyversion ---
26+
if [[ ${pyversion:0:4} == "pypy" ]] ; then
27+
echo "$pyversion - PyPy does not get special packaging"
28+
continue
29+
fi
2630
if ! pyenv local $pyversion ; then
2731
exit $?
2832
fi

pyproject.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ classifiers = [
3737
"Programming Language :: Python :: 3.2",
3838
"Programming Language :: Python :: 3.3",
3939
"Programming Language :: Python :: 3.4",
40-
"Programming Language :: Python :: 3.5 ",
41-
"Programming Language :: Python :: 3.6 ",
42-
"Programming Language :: Python :: 3.7 ",
43-
"Programming Language :: Python :: 3.8 ",
44-
"Programming Language :: Python :: 3.9 ",
45-
"Programming Language :: Python :: 3.10 ",
46-
"Programming Language :: Python :: 3.11 ",
47-
"Programming Language :: Python :: 3.12 ",
40+
"Programming Language :: Python :: 3.5",
41+
"Programming Language :: Python :: 3.6",
42+
"Programming Language :: Python :: 3.7",
43+
"Programming Language :: Python :: 3.8",
44+
"Programming Language :: Python :: 3.9",
45+
"Programming Language :: Python :: 3.10",
46+
"Programming Language :: Python :: 3.11",
47+
"Programming Language :: Python :: 3.12",
4848
]
4949
dynamic = ["version"]
5050

xdis/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# well as importing into Python. That's why there is no
55
# space around "=" below.
66
# fmt: off
7-
__version__="6.1.0.dev0" # noqa
7+
__version__="6.1.0" # noqa

0 commit comments

Comments
 (0)