Update known working set. (#558)

* Update known working set.

* Pin dependencies in setup.cfg.

* Cleanup Makefile.

* Try the python_version trick.

.travis.yml

@@ -4,6 +4,7 @@ python:
   - "3.5"
   - "3.6"
   - "3.7"
+  - "3.8"
 script: tox
 install:
   - pip install tox-travis

CHANGELOG.rst

@@ -9,7 +9,7 @@ This document describes changes between each past release.
 - Add support for espanol latino america (es_419)
 - Use the external debts lib to solve settlements (#476)
 - Remove balance column in statistics view (#323)
-
+- Remove requirements files in favor of setup.cfg pinning (#558)
 
 4.1.3 (2019-09-18)
 ==================

MANIFEST.in

@@ -1,3 +1,3 @@
 include *.rst
 recursive-include ihatemoney *.rst *.py *.yaml *.po *.mo *.html *.css *.js *.eot *.svg *.woff *.txt *.png *.ini *.cfg *.j2
-include LICENSE CONTRIBUTORS CHANGELOG.rst requirements.txt
+include LICENSE CONTRIBUTORS CHANGELOG.rst

Makefile

@@ -11,10 +11,10 @@ ZOPFLIPNG := zopflipng
 .PHONY: all
 all: install ## Alias for install
 .PHONY: install
-install: virtualenv $(INSTALL_STAMP) ## Install dependencies
+install: setup.cfg $(INSTALL_STAMP) ## Install dependencies
-$(INSTALL_STAMP):
+$(INSTALL_STAMP): virtualenv
 	$(VENV)/bin/pip install -U pip
-	$(VENV)/bin/pip install -r requirements.txt
+	$(VENV)/bin/pip install -e .
 	touch $(INSTALL_STAMP)
 
 .PHONY: virtualenv
@@ -23,9 +23,9 @@ $(PYTHON):
 	$(VIRTUALENV) $(VENV)
 
 .PHONY: install-dev
-install-dev: $(INSTALL_STAMP) $(DEV_STAMP) ## Install development dependencies
+install-dev: setup.cfg $(INSTALL_STAMP) $(DEV_STAMP) ## Install development dependencies
-$(DEV_STAMP): $(PYTHON) dev-requirements.txt
+$(DEV_STAMP): $(PYTHON)
-	$(VENV)/bin/pip install -Ur dev-requirements.txt
+	$(VENV)/bin/pip install -Ue .[dev]
 	touch $(DEV_STAMP)
 
 .PHONY: remove-install-stamp
@@ -76,13 +76,6 @@ create-empty-database-revision: ## Create an empty database revision
 	@read -p "Please enter a message describing this revision: " rev_message; \
 	$(PYTHON) -m ihatemoney.manage db revision -d ihatemoney/migrations -m "$${rev_message}"
 
-.PHONY: build-requirements
-build-requirements: ## Save currently installed packages to requirements.txt
-	$(VIRTUALENV) $(TEMPDIR)
-	$(TEMPDIR)/bin/pip install -U pip
-	$(TEMPDIR)/bin/pip install -Ue "."
-	$(TEMPDIR)/bin/pip freeze | grep -v -- '-e' > requirements.txt
-
 .PHONY: clean
 clean: ## Destroy the virtual environment
 	rm -rf .venv

dev-requirements.txt

@@ -1,6 +0,0 @@
-zest.releaser
-tox
-pytest
-flake8
-Flask-Testing
-black ; python_version >= '3.6'

docs/contributing.rst

@@ -2,7 +2,7 @@ Contributing
 ############
 
 Set up a dev environment
-=======================
+========================
 
 You must develop on top of the Git master branch::
 
@@ -23,10 +23,8 @@ install dependencies, and run the test server.
 The hard way
 ------------
 
-Alternatively, you can also use the `requirements.txt` file to install the
+Alternatively, you can use pip to install dependencies yourself. That would be::
-dependencies yourself. That would be::
 
-     pip install -r requirements.txt
      pip install -e .
 
 And then run the application::

requirements.txt

@@ -1,28 +0,0 @@
-alembic==1.2.0
-aniso8601==8.0.0
-Babel==2.7.0
-blinker==1.4
-Click==7.0
-debts==0.4
-dnspython==1.16.0
-email-validator==1.0.4
-Flask==1.1.1
-Flask-Babel==0.12.2
-Flask-Cors==3.0.8
-Flask-Mail==0.9.1
-Flask-Migrate==2.5.2
-Flask-RESTful==0.3.7
-Flask-Script==2.0.6
-Flask-SQLAlchemy==2.4.1
-Flask-WTF==0.14.2
-idna==2.8
-itsdangerous==1.1.0
-Jinja2==2.10.1
-Mako==1.1.0
-MarkupSafe==1.1.1
-python-dateutil==2.8.0
-pytz==2019.2
-SQLAlchemy==1.3.8
-SQLAlchemy-Continuum==1.3.9
-Werkzeug==0.16.0
-WTForms==2.2.1

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
+    blinker==1.4
-    flask-wtf
+    debts==0.5
-    flask-sqlalchemy<3.0
+    email_validator==1.0.5
-    SQLAlchemy-Continuum
+    Flask-Babel==1.0.0
-    flask-mail
+    Flask-Cors==3.0.8
-    Flask-Migrate
+    Flask-Mail==0.9.1
-    Flask-script
+    Flask-Migrate==2.5.3
-    flask-babel
+    Flask-RESTful==0.3.8
-    flask-restful
+    Flask-Script==2.0.6
-    jinja2
+    Flask-SQLAlchemy==2.4.1
-    blinker
+    Flask-WTF==0.14.3
-    flask-cors
+    Flask==1.1.2
-    itsdangerous
+    itsdangerous==1.1.0
-    email_validator
+    Jinja2==2.11.2
-    debts
+    SQLAlchemy-Continuum==1.3.9
 
 [options.extras_require]
 dev =
-    zest.releaser
+    black==19.10b0 ; python_version >= '3.6'
-    tox
+    flake8==3.7.9
-    pytest
+    Flask-Testing==0.8.0
-    flake8
+    pytest==5.4.1
-    Flask-Testing
+    tox==3.14.6
+    zest.releaser==6.20.1
 
 [options.entry_points]
 console_scripts =

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
+    -e.[dev]
-    -rrequirements.txt
 
 # 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