Skip to content

Commit

Permalink
Remove Python 3.4 (spec-first#990)
Browse files Browse the repository at this point in the history
* EOL Python 3.4

* fixup! EOL Python 3.4

* fixup! EOL Python 3.4

* fixup! EOL Python 3.4
  • Loading branch information
Tomasz Trębski authored and hjacobs committed Jul 9, 2019
1 parent f99e39b commit 123c5c9
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 24 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ language: python
python:
- "pypy2.7-5.10.0"
- "2.7"
- "3.4"
- "3.5"
- "3.6"
- "3.7"
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ How to Use
Prerequisites
-------------

Python 2.7 or Python 3.4+
Python 2.7 or Python 3.5+

Installing It
-------------
Expand Down
7 changes: 1 addition & 6 deletions connexion/apis/aiohttp_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import re
import traceback
from contextlib import suppress
from http import HTTPStatus
from urllib.parse import parse_qs

import aiohttp_jinja2
Expand All @@ -18,12 +19,6 @@
from connexion.utils import Jsonifier, is_json_mimetype, yamldumper
from werkzeug.exceptions import HTTPException as werkzeug_HTTPException

try:
from http import HTTPStatus
except ImportError: # pragma: no cover
# httpstatus35 backport for python 3.4
from httpstatus import HTTPStatus

try:
import ujson as json
from functools import partial
Expand Down
2 changes: 1 addition & 1 deletion docs/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Quickstart
Prerequisites
-------------

Python 2.7 or Python 3.4+
Python 2.7 or Python 3.5+

Installing It
-------------
Expand Down
3 changes: 0 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ def read_version(package):
]

if sys.version_info[0] >= 3:
if sys.version_info[1] <= 4:
aiohttp_require.append('httpstatus35')
tests_require.extend(aiohttp_require)
tests_require.append(ujson_require)
tests_require.append('pytest-aiohttp')
Expand Down Expand Up @@ -120,7 +118,6 @@ def readme():
classifiers=[
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
Expand Down
8 changes: 0 additions & 8 deletions tests/aiohttp/test_aiohttp_errors.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# coding: utf-8

import asyncio
import sys

import pytest

Expand All @@ -24,11 +21,6 @@ def aiohttp_app(problem_api_spec_dir):
return app


@pytest.mark.skipif(sys.version_info < (3, 5), reason="In python3.4, aiohttp.ClientResponse.json() requires "
"an exact content_type match in the content_types header, "
"but, application/problem+json is not in there. "
"Newer versions use a re.match to see if the content_type is "
"json or not.")
@asyncio.coroutine
def test_aiohttp_problems(aiohttp_app, aiohttp_client):
# TODO: This is a based on test_errors.test_errors(). That should be refactored
Expand Down
5 changes: 1 addition & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ exclude=connexion/__init__.py
envlist =
{pypy}-{min,pypi,dev}
{py27}-{min,pypi,dev}
{py34}-{min,pypi,dev}
{py35}-{min,pypi,dev}
{py36}-{min,pypi,dev}
{py37}-{min,pypi,dev}
Expand All @@ -18,7 +17,6 @@ envlist =
[tox:travis]
pypy=pypy-min,pypy-pypi
2.7=py27-min,py27-pypi
3.4=py34-min,py34-pypi
3.5=py35-min,py35-pypi
3.6=py36-min,py36-pypi
3.7=py37-min,py37-pypi,isort-check,isort-check-examples,isort-check-tests,flake8
Expand All @@ -29,13 +27,12 @@ deps=pytest
commands=
pip install Requirements-Builder
min: requirements-builder --level=min -o {toxworkdir}/requirements-min.txt setup.py
py34-min: pip install httpstatus35
min: pip install -r {toxworkdir}/requirements-min.txt
pypi: requirements-builder --level=pypi -o {toxworkdir}/requirements-pypi.txt setup.py
pypi: pip install -r {toxworkdir}/requirements-pypi.txt
dev: requirements-builder --level=dev --req=requirements-devel.txt -o {toxworkdir}/requirements-dev.txt setup.py
dev: pip install -r {toxworkdir}/requirements-dev.txt
py3{4,5,6,7}: pip install -r requirements-aiohttp.txt
py3{5,6,7}: pip install -r requirements-aiohttp.txt
python setup.py test

[testenv:flake8]
Expand Down

0 comments on commit 123c5c9

Please sign in to comment.