Merge pull request #13 from geometalab/develop

Stability improvement

.dockerignore

@@ -3,4 +3,6 @@ README.md
 *.swp
 .venv*/
 *.tar
-*.sqlite
+*.sqlite
+.env
+geoconverter.env

.gitignore

@@ -2,4 +2,4 @@
 .venv*/
 *.pyc
 geoconverter.env
-
+.env

GeoConverter/_version.py

@@ -40,7 +40,7 @@ def get_config():
     # _version.py
     cfg = VersioneerConfig()
     cfg.VCS = "git"
-    cfg.style = "git-describe"
+    cfg.style = "pep440"
     cfg.tag_prefix = ""
     cfg.parentdir_prefix = "GeoConverter-"
     cfg.versionfile_source = "GeoConverter/_version.py"

OGRgeoConverter/management/commands/geoconvversion.py

@@ -1,7 +1,7 @@
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 from optparse import make_option
 from GeoConverter import settings
-
+import re
 
 class Command(BaseCommand):
     help = 'Get version information'
@@ -12,10 +12,21 @@ class Command(BaseCommand):
             dest='short',
             default=False,
             help='Print only the numbers and nothing more'),
+        make_option(
+            '--dockertag',
+            action='store_true',
+            dest='dockertag',
+            default=False,
+            help='Print only the numbers following docker tag convention and nothing more'),
     )
 
     def handle(self, *args, **options):
-        v_infostring = '{version}'
-        if options['short'] is False:
-            v_infostring = 'Version: {version}, Date: {date}'
-        self.stdout.write(v_infostring.format(**settings.METADATA))
+        v_infostring = 'Version: {version}, Date: {date}'
+        _version = settings.METADATA.get('version', '0.0.0')
+        # pep440 formatted strings are not suitable as docker image tags, replace illegal chars
+        _version = re.sub('^([^+]+)(.*)$', lambda mo: mo.group(1)+mo.group(2).replace('+','-').replace('.', '-'), _version)
+        if options['short']:
+            v_infostring = '{version}'
+        elif options['dockertag']:
+            v_infostring = '{_version}'
+        self.stdout.write(v_infostring.format(_version=_version, **settings.METADATA))

OGRgeoConverter/modelhandlers/jobhandler.py

@@ -183,6 +183,8 @@ def remove_file(self, file_id):
     def file_removed(self, file_id):
         conversion_job_file = self.__get_conversion_job_files_query_set().filter(
             file_id=file_id)
+        if not conversion_job_file:
+            return True
         return conversion_job_file[0].is_removed
 
     def set_file_uploaded(self, file_id):

Procfile.django

@@ -1 +1 @@
-web: gunicorn GeoConverter.wsgi --workers=$(($(nproc)*2)) -b ${APP_HOST:-0.0.0.0}:${APP_PORT:-8000}
+web: gunicorn GeoConverter.wsgi --workers=${HONCHO_WORKERS:-8} -b ${APP_HOST:-0.0.0.0}:${APP_PORT:-8000}

circle.yml

@@ -25,13 +25,13 @@ deployment:
     commands:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
       - docker push $docker_image
-      - docker tag $docker_image $docker_image:$(docker run -it --rm --env DJANGO_ENV_FILE=/dev/null $docker_image python3 manage.py geoconvversion --short | sed -rn 's/^([-._A-Za-z0-9]+).*$/\1/p')
-      - docker push $docker_image:$(docker run -it --rm --env DJANGO_ENV_FILE=/dev/null $docker_image python3 manage.py geoconvversion --short | sed -rn 's/^([-._A-Za-z0-9]+).*$/\1/p')
+      - docker tag $docker_image $docker_image:$(docker run -it --rm --env DJANGO_ENV_FILE=/dev/null $docker_image python3 manage.py geoconvversion --dockertag | sed -rn 's/^([-._A-Za-z0-9]+).*$/\1/p')
+      - docker push $docker_image:$(docker run -it --rm --env DJANGO_ENV_FILE=/dev/null $docker_image python3 manage.py geoconvversion --dockertag | sed -rn 's/^([-._A-Za-z0-9]+).*$/\1/p')
   develop:
     branch: develop
     commands:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
       - docker tag $docker_image $docker_image:latest-dev
       - docker push $docker_image:latest-dev
-      - docker tag $docker_image:latest-dev $docker_image:$(docker run -it --rm --env DJANGO_ENV_FILE=/dev/null $docker_image python3 manage.py geoconvversion --short | sed -rn 's/^([-._A-Za-z0-9]+).*$/\1/p')
-      - docker push $docker_image:$(docker run -it --rm --env DJANGO_ENV_FILE=/dev/null $docker_image python3 manage.py geoconvversion --short | sed -rn 's/^([-._A-Za-z0-9]+).*$/\1/p')
+      - docker tag $docker_image:latest-dev $docker_image:$(docker run -it --rm --env DJANGO_ENV_FILE=/dev/null $docker_image python3 manage.py geoconvversion --dockertag | sed -rn 's/^([-._A-Za-z0-9]+).*$/\1/p')
+      - docker push $docker_image:$(docker run -it --rm --env DJANGO_ENV_FILE=/dev/null $docker_image python3 manage.py geoconvversion --dockertag | sed -rn 's/^([-._A-Za-z0-9]+).*$/\1/p')

docker/crane.yaml

@@ -12,7 +12,8 @@ containers:
       env:
       - APP_HOST
       - APP_PORT
-      - HONCHO_STARTFILE
+#      - HONCHO_STARTFILE
+      - HONCHO_WORKERS
       - VIRTUAL_HOST
 #      - VIRTUAL_PORT
 #      - CERT_NAME

setup.cfg

@@ -8,7 +8,7 @@ ignore = E501
 
 [versioneer]
 VCS = git
-style = git-describe
+style = pep440
 versionfile_source = GeoConverter/_version.py
 versionfile_build = GeoConverter/_version.py
 tag_prefix =

setup.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 import os
 import versioneer
@@ -12,9 +13,7 @@
 
 
 def get_packages(package):
-    """
-    Return root package and all sub-packages.
-    """
+    """Return root package and all sub-packages."""
     return [dirpath
             for dirpath, _, _ in os.walk(package)
             if os.path.exists(os.path.join(dirpath, '__init__.py'))]
@@ -39,6 +38,7 @@ def get_requirements():
     version=versioneer.get_version(),
     cmdclass=versioneer.get_cmdclass(),
     author="Josua Stähli",
+    author_email="jstaehli@hsr.ch",
     maintainer="Marcel Huber",
     maintainer_email="marcel.huber@hsr.ch",
     description="GIS file format converter",