Skip to content

Commit

Permalink
Bump to 1.1.0b7
Browse files Browse the repository at this point in the history
  • Loading branch information
asvetlov committed Jul 6, 2016
1 parent 31b3b07 commit 03a1362
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 25 deletions.
4 changes: 3 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
1.1.0 (2016-06-04)
1.1.0 (2016-07-06)
------------------

* Don't double-iterate during MultiDict initialization #3

* Fix CIMultiDict.pop: it is case insensitive now #1

* Provide manylinux wheels as well as Windows ones

1.0.3 (2016-03-24)
------------------

Expand Down
8 changes: 5 additions & 3 deletions build-wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ for PYTHON in ${PYTHON_VERSIONS}; do
done

# Bundle external shared libraries into the wheels
# for whl in wheelhouse/*.whl; do
# auditwheel repair $whl -w /io/dist/
# done
for whl in wheelhouse/*.whl; do
if [[ $whl == *"linux_"* ]]; then
auditwheel repair $whl -w /io/dist/
fi
done

# Install packages and test
for PYTHON in ${PYTHON_VERSIONS}; do
Expand Down
2 changes: 1 addition & 1 deletion multidict/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
__all__ = ('MultiDictProxy', 'CIMultiDictProxy',
'MultiDict', 'CIMultiDict', 'upstr', '__version__')

__version__ = '1.1.0b6'
__version__ = '1.1.0b7'


if bool(os.environ.get('MULTIDICT_NO_EXTENSIONS')):
Expand Down
34 changes: 14 additions & 20 deletions run_docker.sh
Original file line number Diff line number Diff line change
@@ -1,31 +1,25 @@
if [ -z $MULTIDICT_NO_EXTENSIONS ]; then
if [ ! -z $TRAVIS_TAG ]; then
echo "x86_64"
docker pull quay.io/pypa/manylinux1_x86_64
docker run --rm -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/build-wheels.sh
echo "Dist folder content is:"
for f in dist/*.whl
do
echo "Upload $f"
python -m twine upload $f --username andrew.svetlov --password $PYPI_PASSWD
done
echo "Cleanup"
docker run --rm -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 rm -rf /io/dist

echo "i686"
docker pull quay.io/pypa/manylinux1_i686
docker run --rm -v `pwd`:/io quay.io/pypa/manylinux1_i686 linux32 /io/build-wheels.sh
echo "Dist folder content is:"
ls dist
fi

if [ ! -z $TRAVIS_TAG ]; then
echo "Upload dists to PyPI"
ls
for f in dist/*.whl
do
if [[ f == *"linux_x86_64"* ]]
then
docker run --rm -v `pwd`:/io auditwheel quay.io/pypa/manylinux1_x86_64 repair $f
fi
if [[ f == *"linux_i686"* ]]
then
docker run --rm -v `pwd`:/io auditwheel quay.io/pypa/manylinux1_i686 linux32 repair $f
fi
echo "Upload $f"
python -m twine upload $f --username andrew.svetlov --password $PYPI_PASSWD
done
fi


if [ -z $MULTIDICT_NO_EXTENSIONS ]; then
docker run --rm -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 rm -rf /io/dist
echo "Cleanup"
docker run --rm -v `pwd`:/io quay.io/pypa/manylinux1_i686 rm -rf /io/dist
fi

0 comments on commit 03a1362

Please sign in to comment.