travis2docker 6.4.20__tar.gz → 6.4.22__tar.gz

{travis2docker-6.4.20 → travis2docker-6.4.22}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.4.20
+current_version = 6.4.22
 commit = True
 tag = True
 

{travis2docker-6.4.20 → travis2docker-6.4.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: travis2docker
-Version: 6.4.20
+Version: 6.4.22
 Summary: Script to generate Dockerfile from .travis.yml file
 Home-page: https://github.com/vauxoo/travis2docker
 Author: Vauxoo

{travis2docker-6.4.20 → travis2docker-6.4.22}/docs/conf.py

@@ -26,7 +26,7 @@ project = u'travis2docker'
 year = '2016'
 author = u'Vauxoo'
 copyright = '{0}, {1}'.format(year, author)
-version = release = u'6.4.20'
+version = release = u'6.4.22'
 
 pygments_style = 'trac'
 templates_path = ['.']

{travis2docker-6.4.20 → travis2docker-6.4.22}/setup.py

@@ -15,7 +15,7 @@ def read(*names, **kwargs):
 
 setup(
     name='travis2docker',
-    version='6.4.20',
+    version='6.4.22',
     license='BSD',
     description='Script to generate Dockerfile from .travis.yml file',
     long_description='%s\n%s'

travis2docker-6.4.22/src/travis2docker/__init__.py

@@ -0,0 +1 @@
+__version__ = "6.4.22"

{travis2docker-6.4.20 → travis2docker-6.4.22}/src/travis2docker/templates/build.sh

@@ -224,7 +224,7 @@ configure_vim(){
     # Get vim version
     VIM_VERSION=$(dpkg -s vim | grep Version | sed -n 's/.*\([0-9]\+\.[0-9]\+\)\..*/\1/p' | sed -r 's/\.//g')
 
-    wget -q -O /usr/share/vim/vim${VIM_VERSION}/spell/es.utf-8.spl http://ftp.vim.org/pub/vim/runtime/spell/es.utf-8.spl
+    wget -q -O /usr/share/vim/vim${VIM_VERSION}/spell/es.utf-8.spl https://ftp.nluug.nl/pub/vim/runtime/spell/es.utf-8.spl
     wget -O  - https://raw.githubusercontent.com/spf13/spf13-vim/3.0/bootstrap.sh | sh
     git_clone_copy "https://github.com/vauxoo/vim-openerp.git" "master" "vim/" "${HOME}/.vim/bundle/vim-openerp"
     git_clone_copy "https://github.com/davidhalter/jedi-vim.git" "master" "." "${HOME}/.vim/bundle/jedi-vim"

{travis2docker-6.4.20 → travis2docker-6.4.22}/src/travis2docker/templates/entrypoint_deployv.sh

@@ -104,6 +104,14 @@ def start_odoo():
     except subprocess.CalledProcessError:
         database_created = False
 
+    configpy = "/home/odoo/instance/odoo/odoo/tools/config.py"
+    if os.path.isfile(configpy):
+        with open(configpy) as f_configpy:
+            for line in f_configpy:
+                if "--with-demo" in line:
+                    cmd.extend(["--with-demo"])
+                    break
+
     if not database_created:
         cmd.extend(["-i", ",".join(modules), "--workers=0", "--stop-after-init"])
         if test_enable:

{travis2docker-6.4.20 → travis2docker-6.4.22}/src/travis2docker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: travis2docker
-Version: 6.4.20
+Version: 6.4.22
 Summary: Script to generate Dockerfile from .travis.yml file
 Home-page: https://github.com/vauxoo/travis2docker
 Author: Vauxoo

travis2docker-6.4.20/src/travis2docker/__init__.py

@@ -1 +0,0 @@
-__version__ = "6.4.20"