Skip to content

Commit b46f309

Browse files
Merge branch 'release/1.1'
2 parents 248a61f + 3df6145 commit b46f309

10 files changed

+148
-65
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
language: python
22
python:
3+
- "3.3"
4+
- "3.2"
35
- "2.7"
46
- "2.6"
57
install:

HISTORY.rst

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Changelog
22
---------
33

4+
- **1.1** (2014-02-16)
5+
6+
- Python 3 support.
7+
48
- **1.0** (2013-11-21)
59

610
- Minor improvements to setup script, comments, and docs.

Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,17 @@ publish: infup
2121
python setup.py sdist --formats=gztar,zip upload
2222
python2.6 setup.py bdist_egg upload
2323
python2.7 setup.py bdist_egg upload
24+
python3.2 setup.py bdist_egg upload
25+
python3.3 setup.py bdist_egg upload
2426
python setup.py bdist_wininst -p win32 upload
2527
python setup.py bdist_wininst -p win-amd64 upload
2628

2729
dist: readme
2830
python setup.py sdist --formats=gztar,zip
2931
python2.6 setup.py bdist_egg
3032
python2.7 setup.py bdist_egg
33+
python3.2 setup.py bdist_egg
34+
python3.3 setup.py bdist_egg
3135
python setup.py bdist_wininst -p win32
3236
python setup.py bdist_wininst -p win-amd64
3337

@@ -40,6 +44,7 @@ clean:
4044
-rm *.pyc
4145
-rm test/*.pyc
4246
-rm -rf test/__pycache__
47+
-rm -rf __pycache__
4348
cd docs; make clean
4449

4550
superclean: clean

README.rst

+7-8
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ The main component delivered by expak installation is a pure Python module,
2020
for programmatically working with pak files. The installation also creates a
2121
command-line utility for simple resource-extraction operations.
2222

23-
Currently expak is compatible with Python 2.6 and 2.7. It has no dependencies
24-
outside of the standard Python modules.
23+
Currently expak is compatible with Python 2.6, 2.7, 3.2, and 3.3. It has no
24+
dependencies outside of the standard Python modules.
2525

2626
The quakesounds_ application is an example use of expak.
2727

@@ -36,9 +36,10 @@ Prerequisites
3636
-------------
3737

3838
It's a Python module and utility, so you need Python! If you don't have Python
39-
installed, `go get it`_. Note that while both Python 2 and Python 3 are
40-
available, for expak specifically you will want to get the latest version of
41-
Python 2.
39+
installed, `go get it`_. The latest stable version of either Python 2 or Python 3
40+
will work... if you're new to Python, you should look elsewhere for advice on
41+
whether to use 2 or 3, but the general consideration is that currently more
42+
stuff is compatible with Python 2.
4243

4344
You'll probably also want a Python package manager to help install expak (and
4445
other things). If you're going to be running on Windows, you can skip this
@@ -77,15 +78,13 @@ installed but can't or don't want to use pip:
7778
Finally, if you are on Windows, you could also choose to use an installer
7879
program, although the methods above work fine on Windows. Custom expak
7980
installers are included in the downloads list for expak
80-
`at the Python Package Index`_ (PyPI), and also `at Crate.io`_ or other PyPI
81-
mirrors.
81+
`at the Python Package Index`_ (PyPI).
8282

8383
If PyPI and its mirrors are down, the Windows installers and other forms of
8484
distribution files (including source distribution) are mirrored
8585
`in the releases for the GitHub repo`_.
8686

8787
.. _at the Python Package Index: https://pypi.python.org/pypi/expak
88-
.. _at Crate.io: https://crate.io/packages/expak
8988
.. _in the releases for the GitHub repo: https://github.com/neogeographica/expak/releases
9089

9190
.. _documentation_section:

README.rst.in

+5-6
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ Prerequisites
2121
-------------
2222

2323
It's a Python module and utility, so you need Python! If you don't have Python
24-
installed, `go get it`_. Note that while both Python 2 and Python 3 are
25-
available, for expak specifically you will want to get the latest version of
26-
Python 2.
24+
installed, `go get it`_. The latest stable version of either Python 2 or Python 3
25+
will work... if you're new to Python, you should look elsewhere for advice on
26+
whether to use 2 or 3, but the general consideration is that currently more
27+
stuff is compatible with Python 2.
2728

2829
You'll probably also want a Python package manager to help install expak (and
2930
other things). If you're going to be running on Windows, you can skip this
@@ -62,15 +63,13 @@ installed but can't or don't want to use pip:
6263
Finally, if you are on Windows, you could also choose to use an installer
6364
program, although the methods above work fine on Windows. Custom expak
6465
installers are included in the downloads list for expak
65-
`at the Python Package Index`_ (PyPI), and also `at Crate.io`_ or other PyPI
66-
mirrors.
66+
`at the Python Package Index`_ (PyPI).
6767

6868
If PyPI and its mirrors are down, the Windows installers and other forms of
6969
distribution files (including source distribution) are mirrored
7070
`in the releases for the GitHub repo`_.
7171

7272
.. _at the Python Package Index: https://pypi.python.org/pypi/expak
73-
.. _at Crate.io: https://crate.io/packages/expak
7473
.. _in the releases for the GitHub repo: https://github.com/neogeographica/expak/releases
7574

7675
.. _documentation_section:

docs/blurb.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ The main component delivered by expak installation is a pure Python module,
55
for programmatically working with pak files. The installation also creates a
66
command-line utility for simple resource-extraction operations.
77

8-
Currently expak is compatible with Python 2.6 and 2.7. It has no dependencies
9-
outside of the standard Python modules.
8+
Currently expak is compatible with Python 2.6, 2.7, 3.2, and 3.3. It has no
9+
dependencies outside of the standard Python modules.
1010

1111
The quakesounds_ application is an example use of expak.
1212

0 commit comments

Comments
 (0)