Merge branch 'model' into 'master'

Model

See merge request !2

.gitlab-ci.yml

@@ -7,38 +7,39 @@ cache:
 stages:
   - check_style
   - build
-
-before_script:
-  - pip install tox==2.9.1
+  - build_develop
 
 pep8:
+  before_script:
+    - pip install tox==2.9.1
   stage: check_style
   script:
     - tox -v -e pep8
 
 docstyle:
+  before_script:
+    - pip install tox==2.9.1
   stage: check_style
   script:
     - tox -v -e docstyle
 
-build_image:
+build_master:
   stage: build
   image: 'docker:18.09.7'
   only:
     - master
-  services:
-    - 'docker:18.09.7-dind'
-  variables:
-    DOCKERHUB_NAME: clarinpl/$CI_PROJECT_NAME
-  before_script:
-    - ''
   script:
-    - docker build -t $DOCKERHUB_NAME .
-    - echo $DOCKER_PASSWORD > pass.txt
-    - cat pass.txt | docker login --username $DOCKER_USERNAME --password-stdin
-    - rm pass.txt
-    - docker push $DOCKERHUB_NAME
+    - docker build -t $CI_REGISTRY_IMAGE:latest .
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker push $CI_REGISTRY_IMAGE:latest
+
+
+build_develop:
+  stage: build_develop
+  image: 'docker:18.09.7'
+  only:
+    - model
+  script:
+    - docker build -t $CI_REGISTRY_IMAGE:develop .
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker image tag $DOCKERHUB_NAME $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-    - docker image tag $DOCKERHUB_NAME $CI_REGISTRY_IMAGE:latest
-    - docker push $CI_REGISTRY_IMAGE
+    - docker push $CI_REGISTRY_IMAGE:develop

requirements.txt

-autocorrect==2.1.0
-nlp-ws
+autocorrect
+nlp-ws<=0.8
 numpy==1.17.4