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.
This commit is contained in:
Rémy HUBSCHER 2019-02-20 10:01:59 +01:00
parent e63734b0b8
commit 8ed92c279f
No known key found for this signature in database
GPG key ID: 82B47F36036A312A
5 changed files with 29 additions and 45 deletions

View file

@ -7,3 +7,7 @@ python:
- "3.4" - "3.4"
- "3.5" - "3.5"
- "3.6" - "3.6"
matrix:
include:
- python: 3.7
dist: xenial

View file

@ -1,6 +1,6 @@
zest.releaser zest.releaser
tox tox
pytest pytest
flake8
Flask-Testing Flask-Testing
Flake8
mock; python_version < '3.3' mock; python_version < '3.3'

View file

@ -1,57 +1,27 @@
alembic==1.0.5 alembic==1.0.7
aniso8601==4.0.1 aniso8601==4.1.0
atomicwrites==1.2.1
attrs==18.2.0
Babel==2.6.0 Babel==2.6.0
bleach==3.0.2
blinker==1.4 blinker==1.4
certifi==2018.11.29
chardet==3.0.4
Click==7.0 Click==7.0
colorama==0.4.1
dnspython==1.16.0 dnspython==1.16.0
docutils==0.14
email-validator==1.0.3 email-validator==1.0.3
filelock==3.0.10
flake8==3.6.0
Flask==1.0.2 Flask==1.0.2
Flask-Babel==0.12.2 Flask-Babel==0.12.2
Flask-Cors==3.0.7 Flask-Cors==3.0.7
Flask-Mail==0.9.1 Flask-Mail==0.9.1
Flask-Migrate==2.3.1 Flask-Migrate==2.4.0
Flask-RESTful==0.3.7 Flask-RESTful==0.3.7
Flask-Script==2.0.6 Flask-Script==2.0.6
Flask-SQLAlchemy==2.3.2 Flask-SQLAlchemy==2.3.2
Flask-Testing==0.7.1
Flask-WTF==0.14.2 Flask-WTF==0.14.2
idna==2.8 idna==2.8
itsdangerous==1.1.0 itsdangerous==1.1.0
Jinja2==2.10 Jinja2==2.10
Mako==1.0.7 Mako==1.0.7
MarkupSafe==1.1.0 MarkupSafe==1.1.0
mccabe==0.6.1 python-dateutil==2.8.0
more-itertools==4.3.0 pytz==2018.9
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
six==1.12.0 six==1.12.0
SQLAlchemy==1.2.15 SQLAlchemy==1.2.18
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
Werkzeug==0.14.1 Werkzeug==0.14.1
WTForms==2.2.1 WTForms==2.2.1
zest.releaser==6.15.3

View file

@ -1,4 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import codecs import codecs
import os import os
from setuptools import setup, find_packages from setuptools import setup, find_packages
@ -56,5 +56,19 @@ setup(name='ihatemoney',
packages=find_packages(), packages=find_packages(),
include_package_data=True, include_package_data=True,
zip_safe=False, 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) entry_points=ENTRY_POINTS)

View file

@ -1,5 +1,5 @@
[tox] [tox]
envlist = py36,py35,py34,py27,docs,lint envlist = py37,py36,py35,py34,py27,docs,lint
skip_missing_interpreters = True skip_missing_interpreters = True
[testenv] [testenv]
@ -15,11 +15,6 @@ deps =
# To be sure we are importing ihatemoney pkg from pip-installed version # To be sure we are importing ihatemoney pkg from pip-installed version
changedir = /tmp changedir = /tmp
[testenv:docs] [testenv:docs]
commands = sphinx-build -a -n -b html -d docs/_build/doctrees docs docs/_build/html commands = sphinx-build -a -n -b html -d docs/_build/doctrees docs docs/_build/html
deps = deps =
@ -42,3 +37,4 @@ python =
3.4: py34 3.4: py34
3.5: py35 3.5: py35
3.6: py36, docs, lint 3.6: py36, docs, lint
3.7: py37