Skip to content

Commit

Permalink
Cut off to python 3.5.0+ (#2355)
Browse files Browse the repository at this point in the history
  • Loading branch information
asvetlov authored Oct 19, 2017
1 parent 0bf4ebf commit 1a606bc
Show file tree
Hide file tree
Showing 23 changed files with 59 additions and 485 deletions.
3 changes: 0 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ environment:
PYPI_PASSWD:
secure: syNUF3e8AEPY327rWBkKag==
matrix:
- PYTHON: "C:\\Python34"
- PYTHON: "C:\\Python34-x64"
DISTUTILS_USE_SDK: "1"
- PYTHON: "C:\\Python35"
- PYTHON: "C:\\Python35-x64"
- PYTHON: "C:\\Python36"
Expand Down
39 changes: 0 additions & 39 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ sudo: false
language: python

python:
# python3.4.2 has bug in http.cookies module, aiohttp provides fix for it
- 3.4.2
- 3.4.3
- 3.5.2
- 3.5
- &mainstream_python 3.6
Expand Down Expand Up @@ -164,18 +161,6 @@ jobs:
script:
- python setup.py check --metadata --restructuredtext --strict --verbose

- <<: *osx_python_base
python: 3.4.2
env:
- &env_py34 PYTHON_VERSION=3.4.2
- *env_pyenv
- *env_path
- <<: *osx_python_base
python: 3.4.3
env:
- &env_py34 PYTHON_VERSION=3.4.3
- *env_pyenv
- *env_path
- <<: *osx_python_base
python: 3.5.3
env:
Expand Down Expand Up @@ -234,14 +219,6 @@ jobs:
all_branches: true

# Build and deploy MacOS binary wheels for each OSX+Python combo possible
# OS X 10.10, Python 3.4
- <<: *osx_pypi_deploy_base_1010
python: 3.4
env:
- *env_os1010_msg
- *env_py34
- *env_pyenv
- *env_path
# OS X 10.10, Python 3.5
- <<: *osx_pypi_deploy_base_1010
python: 3.5
Expand All @@ -257,14 +234,6 @@ jobs:
- *env_py36
- *env_pyenv
- *env_path
# OS X 10.11, Python 3.4
- <<: *osx_pypi_deploy_base_1011
python: 3.4
env:
- *env_os1011_msg
- *env_py34
- *env_pyenv
- *env_path
# OS X 10.11, Python 3.5
- <<: *osx_pypi_deploy_base_1011
python: 3.5
Expand All @@ -280,14 +249,6 @@ jobs:
- *env_py36
- *env_pyenv
- *env_path
# OS X 10.12, Python 3.4
- <<: *osx_pypi_deploy_base_1012
python: 3.4
env:
- *env_os1012_msg
- *env_py34
- *env_pyenv
- *env_path
# OS X 10.12, Python 3.5
- <<: *osx_pypi_deploy_base_1012
python: 3.5
Expand Down
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ flake: .flake
$(shell find examples -type f) \
$(shell find demos -type f)
@flake8 aiohttp --exclude=aiohttp/backport_cookies.py
@if python -c "import sys; sys.exit(sys.version_info < (3,5))"; then \
flake8 examples tests demos && \
python setup.py check -rms; \
fi
@flake8 examples tests demos
python setup.py check -rms
@if ! isort -c -rc aiohttp tests examples; then \
echo "Import sort errors, run 'make isort' to fix them!!!"; \
isort --diff -rc aiohttp tests examples; \
Expand Down
2 changes: 1 addition & 1 deletion aiohttp/_http_parser.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Based on https://github.com/MagicStack/httptools
#
from __future__ import print_function
from __future__ import absolute_import, print_function
from cpython.mem cimport PyMem_Malloc, PyMem_Free
from cpython cimport PyObject_GetBuffer, PyBuffer_Release, PyBUF_SIMPLE, \
Py_buffer, PyBytes_AsString
Expand Down
Loading

0 comments on commit 1a606bc

Please sign in to comment.