Merge branch 'release/1.1.16'

lueschem · Dec 16, 2019 · 256d46f · 256d46f
2 parents 9a72227 + 3740f5c
commit 256d46f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+edi (1.1.16) bionic; urgency=medium
+
+  [ Matthias Lüscher ]
+  * Another attempt to fix sftp package upload.
+
+ -- Matthias Luescher <lueschem@gmail.com>  Mon, 16 Dec 2019 18:19:45 +0100
+
 edi (1.1.15) bionic; urgency=medium
 
   [ Matthias Lüscher ]

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,8 +55,8 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.15'
-release = '1.1.15'
+version = '1.1.16'
+release = '1.1.16'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/edi/lib/versionhelpers.py b/edi/lib/versionhelpers.py
@@ -26,7 +26,7 @@
 
 # The do_release script will update this version!
 # During launchpad debuild neither the git version nor the package version is available.
-edi_fallback_version = '1.1.15'
+edi_fallback_version = '1.1.16'
 
 
 def get_edi_version():

diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@
 setup(
     name='edi',
 
-    version='1.1.15',
+    version='1.1.16',
 
     description='Embedded Development Infrastructure - edi',
     long_description=long_description,

diff --git a/travis/travis-build b/travis/travis-build
@@ -14,15 +14,15 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd ${SCRIPTDIR}/..
 
 export DEBIAN_FRONTEND=noninteractive
-apt-get update -qq
-apt-get --no-install-recommends -y -qq install sudo
+apt-get update > /dev/null
+apt-get --no-install-recommends -y install sudo > /dev/null
 
 TESTUSER=ediuser
 TESTUSERHOME=/home/${TESTUSER}
 adduser --disabled-password --gecos "" ${TESTUSER}
 addgroup  ${TESTUSER} adm
 
-apt-get --no-install-recommends -y -qq install git
+apt-get --no-install-recommends -y install git > /dev/null
 
 git config --system user.email "lueschem@gmail.com"
 git config --system user.name "Matthias Luescher"
@@ -43,12 +43,12 @@ sudo -u ${TESTUSER} git clone .git ${TESTUSERHOME}/edi
 
 DPUT_LIBRARIES="python3-paramiko"
 
-apt-get -y --no-install-recommends -qq install git-buildpackage dh-make equivs lintian
+apt-get -y --no-install-recommends install git-buildpackage dh-make equivs lintian > /dev/null
 if [ "${VERSION_ID}" == "16.04" ]
 then
     # Ansible >= 2.1 is required
     DPUT_LIBRARIES="python-paramiko python-bzrlib"
-    apt-get -y --no-install-recommends -qq install ansible/xenial-backports
+    apt-get -y --no-install-recommends install ansible/xenial-backports > /dev/null
 fi
 
 CONTAINER_WORK="${TESTUSERHOME}/edi"
@@ -139,6 +139,10 @@ then
     GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
     if [ "${GIT_BRANCH}" == "master" ]
     then
+        apt-get --no-install-recommends -y install openssh-client dput locales ${DPUT_LIBRARIES} > /dev/null
+        locale-gen en_US.UTF-8
+        export LANG=en_US.UTF-8
+
         SSH_FOLDER=/root/.ssh
         mkdir ${SSH_FOLDER}
         chmod 0700 ${SSH_FOLDER}
@@ -148,13 +152,8 @@ then
         cp ${CONTAINER_WORK}/travis/known_hosts ${SSH_FOLDER}/
         chmod -R 0600 ${SSH_FOLDER}/*
 
-        apt-get --no-install-recommends -y -qq install openssh-client dput locales ${DPUT_LIBRARIES}
         ssh-keyscan ppa.launchpad.net >> ${SSH_FOLDER}/known_hosts
-        echo "Host key of ppa.launchpad.net:" 
-        ssh-keygen -H -F ppa.launchpad.net
 
-        locale-gen en_US.UTF-8
-        export LANG=en_US.UTF-8
         dput --unchecked --config ${CONTAINER_WORK}/travis/dput.cf ppa:m-luescher/edi-snapshots ${RESULT}
     else
         echo "Skipping deployment on ${GIT_BRANCH} branch."