From 75104d9c193275855a0119d4e9d34e81bab53f2e Mon Sep 17 00:00:00 2001 From: 0livd Date: Sun, 20 Aug 2017 12:21:59 +0200 Subject: [PATCH] Add python 3.6 support (#259) Closes #253 --- .gitignore | 6 ++---- .travis.yml | 1 + README.rst | 2 +- docs/installation.rst | 2 +- requirements.txt | 1 + setup.py | 1 + tox.ini | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index cb78e40b..4af5baf9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,4 @@ -budget/budget.db -budget.db -budget/memory -budget/settings.py +ihatemoney.cfg *.pyc *.egg-info dist @@ -9,3 +6,4 @@ dist docs/_build/ .tox dist +.cache/ diff --git a/.travis.yml b/.travis.yml index 2854baa9..f02d7c1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,5 @@ env: - TOXENV=py27 - TOXENV=py34 - TOXENV=py35 + - TOXENV=py36 - TOXENV=docs diff --git a/README.rst b/README.rst index 77337ae8..6ecdf9c8 100644 --- a/README.rst +++ b/README.rst @@ -19,5 +19,5 @@ so. Requirements ============ -* **Python**: 2.7, 3.4, 3.5. +* **Python**: 2.7, 3.4, 3.5, 3.6. * **Backends**: MySQL, PostgreSQL, SQLite, Memory. diff --git a/docs/installation.rst b/docs/installation.rst index d1fd9bcf..ade647f9 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -11,7 +11,7 @@ Requirements «Ihatemoney» depends on: -* **Python**: either 2.7, 3.4, 3.5 will work. +* **Python**: either 2.7, 3.4, 3.5, 3.6 will work. * **A Backend**: to choose among MySQL, PostgreSQL, SQLite or Memory. We recommend to use `pip `_ and diff --git a/requirements.txt b/requirements.txt index 5820a548..be770048 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,7 @@ flask-wtf>=0.14 flask-sqlalchemy>=2.2,<3.0 flask-mail>=0.8 Flask-Migrate>=1.8.0 +Flask-script flask-babel flask-rest jinja2>=2.6 diff --git a/setup.py b/setup.py index f346248e..0ba37848 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,7 @@ REQUIREMENTS = [ 'flask-sqlalchemy', 'flask-mail>=0.8', 'Flask-Migrate>=1.8.0', + 'Flask-script', 'flask-babel', 'flask-rest', 'jinja2>=2.6', diff --git a/tox.ini b/tox.ini index 63af830c..e7af9ccb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py35,py34,py27,docs,lint +envlist = py36,py35,py34,py27,docs,lint skip_missing_interpreters = True [testenv]