aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy HUBSCHER <remy@chefclub.tv>2019-02-20 10:01:59 +0100
committerRémy HUBSCHER <remy@chefclub.tv>2019-02-20 10:01:59 +0100
commit8ed92c279fcf075d63ca35ffd846614c70f5bc41 (patch)
tree85afe42fa1e99eb0ff151fd1f2072d87f13ea094
parente63734b0b8aebf0afa07049f17454b1d43f49fc7 (diff)
downloadihatemoney-mirror-8ed92c279fcf075d63ca35ffd846614c70f5bc41.zip
ihatemoney-mirror-8ed92c279fcf075d63ca35ffd846614c70f5bc41.tar.gz
ihatemoney-mirror-8ed92c279fcf075d63ca35ffd846614c70f5bc41.tar.bz2
Fix requirements.txt file.
You can't use both build-requirements to keep known version set and load setup.py from the same requirements, it doesn't make any sense.
-rw-r--r--.travis.yml4
-rw-r--r--dev-requirements.txt2
-rw-r--r--requirements.txt42
-rw-r--r--setup.py18
-rw-r--r--tox.ini8
5 files changed, 29 insertions, 45 deletions
diff --git a/.travis.yml b/.travis.yml
index cff15f9..8bf8fd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,3 +7,7 @@ python:
- "3.4"
- "3.5"
- "3.6"
+matrix:
+ include:
+ - python: 3.7
+ dist: xenial
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 28116fa..e198b7b 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,6 +1,6 @@
zest.releaser
tox
pytest
+flake8
Flask-Testing
-Flake8
mock; python_version < '3.3'
diff --git a/requirements.txt b/requirements.txt
index b99191a..d4a0092 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,57 +1,27 @@
-alembic==1.0.5
-aniso8601==4.0.1
-atomicwrites==1.2.1
-attrs==18.2.0
+alembic==1.0.7
+aniso8601==4.1.0
Babel==2.6.0
-bleach==3.0.2
blinker==1.4
-certifi==2018.11.29
-chardet==3.0.4
Click==7.0
-colorama==0.4.1
dnspython==1.16.0
-docutils==0.14
email-validator==1.0.3
-filelock==3.0.10
-flake8==3.6.0
Flask==1.0.2
Flask-Babel==0.12.2
Flask-Cors==3.0.7
Flask-Mail==0.9.1
-Flask-Migrate==2.3.1
+Flask-Migrate==2.4.0
Flask-RESTful==0.3.7
Flask-Script==2.0.6
Flask-SQLAlchemy==2.3.2
-Flask-Testing==0.7.1
Flask-WTF==0.14.2
idna==2.8
itsdangerous==1.1.0
Jinja2==2.10
Mako==1.0.7
MarkupSafe==1.1.0
-mccabe==0.6.1
-more-itertools==4.3.0
-pkginfo==1.4.2
-pluggy==0.8.0
-py==1.7.0
-pycodestyle==2.4.0
-pyflakes==2.0.0
-Pygments==2.3.1
-pytest==4.0.2
-python-dateutil==2.7.5
-pytz==2018.7
-readme-renderer==24.0
-requests==2.21.0
-requests-toolbelt==0.8.0
+python-dateutil==2.8.0
+pytz==2018.9
six==1.12.0
-SQLAlchemy==1.2.15
-toml==0.10.0
-tox==3.6.1
-tqdm==4.28.1
-twine==1.12.1
-urllib3==1.24.1
-virtualenv==16.1.0
-webencodings==0.5.1
+SQLAlchemy==1.2.18
Werkzeug==0.14.1
WTForms==2.2.1
-zest.releaser==6.15.3
diff --git a/setup.py b/setup.py
index ea1c668..c83a8f7 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
import codecs
import os
from setuptools import setup, find_packages
@@ -56,5 +56,19 @@ setup(name='ihatemoney',
packages=find_packages(),
include_package_data=True,
zip_safe=False,
- install_requires=parse_requirements('requirements.txt'),
+ install_requires=[
+ "flask",
+ "flask-wtf",
+ "flask-sqlalchemy<3.0",
+ "flask-mail",
+ "Flask-Migrate",
+ "Flask-script",
+ "flask-babel",
+ "flask-restful",
+ "jinja2",
+ "blinker",
+ "flask-cors",
+ "six",
+ "itsdangerous",
+ "email_validator"],
entry_points=ENTRY_POINTS)
diff --git a/tox.ini b/tox.ini
index 1d4eb97..19d68df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py36,py35,py34,py27,docs,lint
+envlist = py37,py36,py35,py34,py27,docs,lint
skip_missing_interpreters = True
[testenv]
@@ -15,11 +15,6 @@ deps =
# To be sure we are importing ihatemoney pkg from pip-installed version
changedir = /tmp
-
-
-
-
-
[testenv:docs]
commands = sphinx-build -a -n -b html -d docs/_build/doctrees docs docs/_build/html
deps =
@@ -42,3 +37,4 @@ python =
3.4: py34
3.5: py35
3.6: py36, docs, lint
+ 3.7: py37