Skip to content

Commit

Permalink
Merge branch '2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
asvetlov committed Nov 1, 2017
2 parents caab965 + e740a1d commit 02d7a77
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
environment:
PYPI_PASSWD:
secure: syNUF3e8AEPY327rWBkKag==
secure: u+K6dKi7+CXXVFEUG4V7zUyV3w7Ntg0Ork/RGVV0eSQ=
matrix:
- PYTHON: "C:\\Python35"
- PYTHON: "C:\\Python35-x64"
- PYTHON: "C:\\Python36"
- PYTHON: "C:\\Python36-x64"

install:
- "tools/build.cmd %PYTHON%\\python.exe -m pip install wheel"
- "tools/build.cmd %PYTHON%\\python.exe -m pip install -U wheel setuptools"
- "tools/build.cmd %PYTHON%\\python.exe -m pip install -r requirements/ci.txt"

build: false
Expand All @@ -25,7 +25,7 @@ artifacts:
deploy_script:
- ps: >-
if($env:appveyor_repo_tag -eq 'True') {
Invoke-Expression "$env:PYTHON\\python.exe -m twine upload dist/* --username fafhrd --password $env:PYPI_PASSWD"
Invoke-Expression "$env:PYTHON\\python.exe -m twine upload dist/* --username andrew.svetlov --password $env:PYPI_PASSWD"
}
#notifications:
Expand Down
15 changes: 15 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@ Changelog

.. towncrier release notes start
2.3.2 (2017-11-01)
==================

- Fix passing client max size on cloning request obj. (#2385)
- Fix ClientConnectorSSLError and ClientProxyConnectionError for proxy
connector. (#2408)
- Drop generated `_http_parser` shared object from tarball distribution. (#2414)
- Fix connector convert OSError to ClientConnectorError. (#2423)
- Fix connection attempts for multiple dns hosts. (#2424)
- Fix ValueError for AF_INET6 sockets if a preexisting INET6 socket to the
`aiohttp.web.run_app` function. (#2431)
- `_SessionRequestContextManager` closes the session properly now. (#2441)
- Rename `from_env` to `trust_env` in client reference. (#2451)


2.3.1 (2017-10-18)
==================

Expand Down
1 change: 0 additions & 1 deletion CHANGES/2385.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/2414.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/2431.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/2441.bugfix

This file was deleted.

2 changes: 1 addition & 1 deletion aiohttp/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '2.3.2b1'
__version__ = '3.0.0a0'

# This relies on each of the submodules having an __all__ variable.

Expand Down
1 change: 1 addition & 0 deletions docs/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ symlinks
syscall
syscalls
Systemd
tarball
TCP
teardown
Teardown
Expand Down
2 changes: 1 addition & 1 deletion tests/test_connector.py
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ def test_release_not_started(loop):
# assert conn._conns == {1: [(proto, 10)]}
rec = conn._conns[1]
assert rec[0][0] == proto
assert rec[0][1] == pytest.approx(loop.time(), abs=0.01)
assert rec[0][1] == pytest.approx(loop.time(), abs=0.05)
assert not proto.close.called
conn.close()

Expand Down
2 changes: 1 addition & 1 deletion tools/build-wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ rm -fv /io/dist/*-linux_*.whl
echo
echo
echo "Cleanup non-$package_name wheels"
find /io/dist -maxdepth 1 -type f ! -name "$package_name"'-*-manylinux1_'"$arch"'.whl' -print0 | xargs -0 rm -rf
find /io/dist -maxdepth 1 -type f ! -name "$package_name"'-*-manylinux1_*.whl' -print0 | xargs -0 rm -rf

echo
echo
Expand Down

0 comments on commit 02d7a77

Please sign in to comment.