fixup: requirements + ci

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f481995ace78f28b8f273e35e6835bcc02e54868..8c6a9a1be864db8d7c1d31370383988a22306cef 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,8 @@ stages:
 test:
   stage: test
   image: python:3.6
 test:
   stage: test
   image: python:3.6

+  tags:
+    - docker

   script:
     - pip install -e .
     - python test.py
   script:
     - pip install -e .
     - python test.py


@@ -12,6 +14,8 @@ test:
 build:
   stage: build
   image: docker:stable
 build:
   stage: build
   image: docker:stable

+  tags:
+    - docker

   services:
     - docker:dind
   variables:
   services:
     - docker:dind
   variables:

diff --git a/requirements.txt b/requirements.txt
index 2666f320aeba5f3365f5daa39df62c02f71b6ee4..11e1e6167271c299297e83274c13554237c5e2b5 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,9 +2,12 @@ alembic==1.0.1
 certifi==2018.10.15
 chardet==3.0.4
 Click==7.0
 certifi==2018.10.15
 chardet==3.0.4
 Click==7.0

+dominate==2.3.4

 Flask==1.0.2
 Flask==1.0.2

+Flask-Bootstrap==3.3.7.1

 Flask-Caching==1.4.0
 Flask-Migrate==2.3.0
 Flask-Caching==1.4.0
 Flask-Migrate==2.3.0

+flask-nav==0.6

 Flask-SQLAlchemy==2.3.2
 Flask-Testing==0.7.1
 idna==2.7
 Flask-SQLAlchemy==2.3.2
 Flask-Testing==0.7.1
 idna==2.7


@@ -18,4 +21,5 @@ requests==2.20.0
 six==1.11.0
 SQLAlchemy==1.2.12
 urllib3==1.24
 six==1.11.0
 SQLAlchemy==1.2.12
 urllib3==1.24

+visitor==0.1.3

 Werkzeug==0.14.1
 Werkzeug==0.14.1