diff --git a/dev-requirements.txt b/dev-requirements.txt deleted file mode 100644 index 9163cf81..00000000 --- a/dev-requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -zest.releaser -tox -pytest -flake8 -Flask-Testing -black ; python_version >= '3.6' diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 45bfbf28..00000000 --- a/requirements.txt +++ /dev/null @@ -1,30 +0,0 @@ -alembic==1.4.2 -aniso8601==8.0.0 -Babel==2.8.0 -blinker==1.4 -click==7.1.1 -debts==0.5 -dnspython==1.16.0 -email-validator==1.0.5 -Flask==1.1.2 -Flask-Babel==1.0.0 -Flask-Cors==3.0.8 -Flask-Mail==0.9.1 -Flask-Migrate==2.5.3 -Flask-RESTful==0.3.8 -Flask-Script==2.0.6 -Flask-SQLAlchemy==2.4.1 -Flask-WTF==0.14.3 -idna==2.9 -itsdangerous==1.1.0 -Jinja2==2.11.2 -Mako==1.1.2 -MarkupSafe==1.1.1 -python-dateutil==2.8.1 -pytz==2019.3 -six==1.14.0 -SQLAlchemy==1.3.16 -SQLAlchemy-Continuum==1.3.9 -SQLAlchemy-Utils==0.36.3 -Werkzeug==1.0.1 -WTForms==2.2.1 diff --git a/setup.cfg b/setup.cfg index 8d334e80..10fef113 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,6 +14,7 @@ classifiers = Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 Topic :: Internet :: WWW/HTTP Topic :: Internet :: WWW/HTTP :: WSGI :: Application @@ -22,29 +23,30 @@ packages = find: include_package_data = True zip_safe = False install_requires = - flask - flask-wtf - flask-sqlalchemy<3.0 - SQLAlchemy-Continuum - flask-mail - Flask-Migrate - Flask-script - flask-babel - flask-restful - jinja2 - blinker - flask-cors - itsdangerous - email_validator - debts + blinker==1.4 + debts==0.5 + email_validator==1.0.5 + Flask-Babel==1.0.0 + Flask-Cors==3.0.8 + Flask-Mail==0.9.1 + Flask-Migrate==2.5.3 + Flask-RESTful==0.3.8 + Flask-Script==2.0.6 + Flask-SQLAlchemy==2.4.1 + Flask-WTF==0.14.3 + Flask==1.1.2 + itsdangerous==1.1.0 + Jinja2==2.11.2 + SQLAlchemy-Continuum==1.3.9 [options.extras_require] dev = - zest.releaser - tox - pytest - flake8 - Flask-Testing + black==19.10b0 + flake8==3.7.9 + Flask-Testing==0.8.0 + pytest==5.4.1 + tox==3.14.6 + zest.releaser==6.20.1 [options.entry_points] console_scripts = diff --git a/tox.ini b/tox.ini index 5e6d5e42..b5ff7055 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py37,py36,py35,docs,flake8,black +envlist = py38,py37,py36,py35,docs,flake8,black skip_missing_interpreters = True [testenv] @@ -9,8 +9,7 @@ commands = py.test --pyargs ihatemoney.tests.tests deps = - -rdev-requirements.txt - -rrequirements.txt + -e.[dev] # To be sure we are importing ihatemoney pkg from pip-installed version changedir = /tmp @@ -23,14 +22,10 @@ changedir = {toxinidir} [testenv:black] commands = black --check --target-version=py34 . -deps = - -rdev-requirements.txt changedir = {toxinidir} [testenv:flake8] commands = flake8 ihatemoney -deps = - -rdev-requirements.txt changedir = {toxinidir} [flake8] @@ -43,5 +38,6 @@ extend-ignore = [travis] python = 3.5: py35 - 3.6: py36, docs, black, flake8 + 3.6: py36 3.7: py37 + 3.8: py38, docs, black, flake8