Skip to content
This repository has been archived by the owner on Dec 25, 2019. It is now read-only.

Commit

Permalink
Add python 2.7, 3.3, 3.4 to the test matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
NyanKiyoshi committed Sep 16, 2018
1 parent 8fee091 commit 646a4e0
Show file tree
Hide file tree
Showing 9 changed files with 53 additions and 18 deletions.
21 changes: 7 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@ cache:
- node_modules
sudo: false
python:
- "2.6"
- "2.7"
- "3.3"
- "3.4"
- "3.5"
- "3.6"
- "pypy3"
services:
- postgresql
env:
global:
- DATABASE_URL=postgres://postgres@localhost:5432/showcased
install:
- pip install codecov pytest-cov pipenv
- pip install codecov pytest-cov
- nvm install 8
- npm i
- npm run build-assets --production
Expand All @@ -27,17 +26,11 @@ matrix:
sudo: required
dist: xenial
allow_failures:
- python: "pypy3"
- python: "nightly"
fast_finish: true
before_script: # code coverage tool
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
script:
- pipenv install
- pip install -r requirements.txt
- pip install -r requirements-dev.txt
- pytest --cov --cov-report=
after_script:
- if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_PYTHON_VERSION" == "3.7" ]]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
after_success:
- codecov
17 changes: 17 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
################################################################################
# This requirements file has been automatically generated from `Pipfile` with
# `pipenv-to-requirements`
#
#
# This has been done to maintain backward compatibility with tools and services
# that do not support `Pipfile` yet.
#
# Do NOT edit it directly, use `pipenv install [-d]` to modify `Pipfile` and
# `Pipfile.lock` and then regenerate `requirements*.txt`.
################################################################################

blinker
coverage
flask-debugtoolbar
pipenv-to-requirements
pytest
17 changes: 17 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
################################################################################
# This requirements file has been automatically generated from `Pipfile` with
# `pipenv-to-requirements`
#
#
# This has been done to maintain backward compatibility with tools and services
# that do not support `Pipfile` yet.
#
# Do NOT edit it directly, use `pipenv install [-d]` to modify `Pipfile` and
# `Pipfile.lock` and then regenerate `requirements*.txt`.
################################################################################

flask
flask-babel
flask-bootstrap-4-alpha
flask-wtf
keyboard
7 changes: 6 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,15 @@
'Operating System :: POSIX :: BSD :: NetBSD',
'Operating System :: POSIX :: BSD :: OpenBSD',
'Operating System :: POSIX :: Other',
'Programming Language :: Python :: 3 :: Only',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.3',
'Framework :: Flask',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
Expand Down
3 changes: 2 additions & 1 deletion tests/test_sendkeys.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import pytest
from unittest import mock

import pytest
from flask import url_for

from .settings import NEXT_SLIDE_KEY, PREV_SLIDE_KEY
Expand Down
1 change: 0 additions & 1 deletion texrrow/application.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import os.path

import jinja2

from flask_babel import pgettext
from flask_wtf.csrf import generate_csrf

Expand Down
1 change: 1 addition & 0 deletions texrrow/core/views.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from flask import render_template

from .extensions import app


Expand Down
3 changes: 2 additions & 1 deletion texrrow/sendkeys/views.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from flask import Blueprint, Response, current_app

import keyboard
from flask import Blueprint, current_app, Response

sendkeys_bp = Blueprint(
url_prefix='/sendkeys', name='sendkeys', import_name=__name__)
Expand Down
1 change: 1 addition & 0 deletions texrrow/settings.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os.path

from texrrow.core.utils.environ import getenv, getenv_bool

APP_DIR = os.path.abspath(os.path.dirname(__file__))
Expand Down

0 comments on commit 646a4e0

Please sign in to comment.