Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Python3.4 And Add Python3.8 #508

Merged
merged 3 commits into from
Nov 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,6 @@ jobs:
key: v1-python2-{{ checksum "dependency.txt" }}
paths:
- .tox
python3.4:
docker:
- image: python:3.4
working_directory: ~/werobot
steps:
- checkout
- run: cat requirements.txt dev-requirements.txt tox-requirements.txt > dependency.txt
- restore_cache:
key: v1-python3.4-{{ checksum "dependency.txt" }}
- run:
command: |
cat dev-requirements.txt | grep tox== | xargs pip install codecov
tox -l | grep py34 | tr '\n' ',' | xargs tox -e && codecov
- save_cache:
key: v1-python3.4-{{ checksum "dependency.txt" }}
paths:
- .tox
python3.5:
docker:
- image: python:3.5
Expand Down Expand Up @@ -85,6 +68,23 @@ jobs:
key: v1-python3.7-{{ checksum "dependency.txt" }}
paths:
- .tox
python3.8:
docker:
- image: python:3.8
working_directory: ~/werobot
steps:
- checkout
- run: cat requirements.txt dev-requirements.txt tox-requirements.txt > dependency.txt
- restore_cache:
key: v1-python3.8-{{ checksum "dependency.txt" }}
- run:
command: |
cat dev-requirements.txt | grep tox== | xargs pip install codecov
tox -l | grep py38 | tr '\n' ',' | xargs tox -e && codecov
- save_cache:
key: v1-python3.8-{{ checksum "dependency.txt" }}
paths:
- .tox
pypy:
docker:
- image: pypy:2
Expand Down Expand Up @@ -134,10 +134,10 @@ workflows:
test:
jobs:
- python2.7
- python3.4
- python3.5
- python3.6
- python3.7
- python3.8
- pypy
- docs
- lint
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ osx_image: xcode8.3
matrix:
include:
- env:
- PYTHON_MAJOR="py34|py35"
- PYTHON_VERSION="3.5.5 3.4.8"
- PYTHON_MAJOR="py35|py38"
- PYTHON_VERSION="3.5.5 3.8.0"
- env:
- PYTHON_MAJOR="py36|py37"
- PYTHON_VERSION="3.6.5 3.7.0"
Expand Down
15 changes: 11 additions & 4 deletions tests/test_contrib.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
# -*- coding: utf-8 -*-

import os
import random
import sys
import time
import random

import pytest
import tornado
import webtest
from tornado.testing import AsyncHTTPSTestCase
from webtest.app import AppError

from werobot.parser import process_message, parse_xml
from werobot.parser import parse_xml, process_message
from werobot.utils import generate_token, get_signature
import webtest
from webtest.app import AppError


@pytest.fixture
Expand Down Expand Up @@ -188,6 +189,12 @@ def test_werobot_wsgi(wsgi_tester, hello_robot):
wsgi_tester(hello_robot.wsgi, token=token, endpoint=endpoint)


# workaround to make Tornado work in Python 3.8
# https://github.com/tornadoweb/tornado/issues/2608
if sys.platform == 'win32' and sys.version_info >= (3, 8):
import asyncio
asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())

if tornado.version_info[0] < 6:

def test_tornado(wsgi_tester, hello_robot):
Expand Down
2 changes: 1 addition & 1 deletion tox-win.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = {py27,py34,py35,py36}--{dj111}, {py34,py35,py36,py37}--{dj20}
envlist = {py27,py35,py36}--{dj111}, {py35,py36,py37,py38}--{dj20}

[testenv]
commands = coverage run --source werobot -m py.test
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = {py27,py34,py35,py36,pypy}--{dj111}, {py34,py35,py36,py37}--{dj20}, docs
envlist = {py27,py35,py36,pypy}--{dj111}, {py35,py36,py37,py38}--{dj20}, docs

[testenv]
commands = coverage run --source werobot -m py.test
Expand Down