Move to pipenv, fix dependencies

    move from requirements.txt to https://docs.pipenv.org/
    keep locked dependencies on Pipfile.lock
    fix dependencies: aio-libs/aiohttp#2662

.travis.yml

@@ -17,6 +17,7 @@ services:
 install:
   - pip install tox
   - npm install
+  - pip install pipenv
 
 before_script:
   - psql -U postgres -c "CREATE DATABASE osmvalidatortest;"
@@ -26,5 +27,5 @@ before_script:
 
 
 script:
-  - export $(cat .env.test | xargs) && tox
-  - ./node_modules/.bin/eslint --config ./.eslintrc 'osm_validator_front/js/**'
+  - export $(cat .env.test | xargs) && pipenv run tox
+  - pipenv run ./node_modules/.bin/eslint --config ./.eslintrc 'osm_validator_front/js/**'

Pipfile

@@ -0,0 +1,41 @@
+[[source]]
+
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+
+[dev-packages]
+
+aioresponses = "==0.3.0"
+"flake8" = "==3.5.0"
+isort = "==4.2.15"
+pytest = "==3.2.3"
+pytest-aiohttp = "==0.1.3"
+pytest-asyncio = "==0.8.0"
+pytest-mock = "==1.6.3"
+tox = "==2.9.1"
+
+
+[packages]
+
+aioauth-client = "==0.10.0"
+aiodns = "==1.1.1"
+aiohttp = "==2.3.9"
+aiohttp-devtools = "==0.5"
+"aiohttp-jinja2" = "==0.14.0"
+aiohttp-session = "==1.0.1"
+aiopg = "==0.13.1"
+aioredis = "==1.0.0b2"
+alembic = "==0.9.6"
+cchardet = "==2.1.1"
+cryptography = "==2.1.3"
+"geoalchemy2" = "==0.4.0"
+hiredis = "==0.2.0"
+"jinja2" = "==2.9.6"
+lxml = "==4.1.1"
+pillow = "==4.3.0"
+sqlalchemy = "==1.1.14"
+shapely = "==1.6.3"
+requests = "==2.18.4"
+trafaret = "==0.12.0"

README.md

@@ -11,7 +11,7 @@ OSM validator
 
 # Run tests
 
-    export $(cat .env.test | xargs) && tox
+    export $(cat .env.test | xargs) && pipenv run tox
 
 # Configure
 
@@ -32,20 +32,20 @@ OSM validator
 
 # Install front dependencies
 
-    npm install
+    pipenv run npm install
 
 # Build front application
 
-    node_modules/.bin/webpack
+    pipenv run node_modules/.bin/webpack
 
 # Migrate
 
-    export $(cat .env | xargs) && alembic upgrade head
+    export $(cat .env | xargs) && pipenv run alembic upgrade head
 
 # Run validators
 
-    export $(cat .env | xargs) && python schedule.py
+    export $(cat .env | xargs) && pipenv run python schedule.py
 
 # Run web server
 
-    export $(cat .env | xargs) && python main.py
+    export $(cat .env | xargs) && pipenv run python main.py

tox.ini

@@ -3,12 +3,12 @@ envlist = py36
 skipsdist = true
 
 [testenv]
+passenv=Home
+deps = pipenv
 commands =
-    flake8 osm_validator migrations main.py schedule.py setup.py
-    isort --check-only --diff --recursive osm_validator migrations main.py schedule.py setup.py
-    alembic upgrade head
-    pytest
-deps =
-    -rrequirements.txt
-    -rrequirements-dev.txt
-passenv = *
+    pipenv install
+    pipenv install --dev
+    pipenv run flake8 osm_validator migrations main.py schedule.py setup.py
+    pipenv run isort --check-only --diff --recursive osm_validator migrations main.py schedule.py setup.py
+    pipenv run alembic upgrade head
+    pipenv run pytest