From cbf7bf1a35d45618e46634232b391f88d6848bb8 Mon Sep 17 00:00:00 2001
From: Dominik Berner <dominik.berner@gmail.com>
Date: Wed, 28 Aug 2019 13:18:12 +0200
Subject: [PATCH 1/3] Added deploy stable stage

---
 .travis.yml | 133 ++++++++++++++++++++++++++++------------------------
 1 file changed, 72 insertions(+), 61 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f56d8e2f..54e1d195 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,23 +3,23 @@ dist: bionic
 addons:
   apt:
     sources:
-    - ubuntu-toolchain-r-test
+      - ubuntu-toolchain-r-test
     packages:
-    - cmake
-    - g++-7
-    - g++-8
-    - clang-5.0
-    - clang-6.0
-    - libstdc++-8-dev
-    - shunit2
-    - ninja-build
-    - python3
-    - python3-pip
-    - python3-setuptools
+      - cmake
+      - g++-7
+      - g++-8
+      - clang-5.0
+      - clang-6.0
+      - libstdc++-8-dev
+      - shunit2
+      - ninja-build
+      - python3
+      - python3-pip
+      - python3-setuptools
   homebrew:
     packages:
-    - ninja
-    - shunit2
+      - ninja
+      - shunit2
 os: linux
 env:
   - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
@@ -28,55 +28,66 @@ env:
   - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
 matrix:
   include:
-  - os: windows
-    name: Windows Visual Studio 15 2017
-    script:
-    - cmake --version
-    - mkdir build && cd build && cmake .. -G "Visual Studio 15 2017" -A x64
-    - cmake --build . --config Debug
-    - ctest -C Debug
-  
-  - os: osx
-    osx_image: xcode10.2
-    compiler: clang
-    env:
-    - MATRIX_EVAL=""
-  
-  - os: linux
-    name: installation tests
-    env:
-    - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
-    before_script:
-    - pip3 install conan
-    script:
-    - "./test/installation-tests.sh"
-  - os: linux
-    name: compilation tests
-    env:
-    - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
-    script:
-    - "./test/compilation-tests.sh"
-  
-  - stage: deploy-unstable
-    os: linux
-    env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
-    before_script:
-    - pip3 install conan
-    script:
-    - conan remote add bernedom https://api.bintray.com/conan/bernedom/conan 
-    - conan create . SI/unstable
-    - conan upload SI/*@SI/unstable --all -c -r bernedom
+    - os: windows
+      name: Windows Visual Studio 15 2017
+      script:
+        - cmake --version
+        - mkdir build && cd build && cmake .. -G "Visual Studio 15 2017" -A x64
+        - cmake --build . --config Debug
+        - ctest -C Debug
+
+    - os: osx
+      osx_image: xcode10.2
+      compiler: clang
+      env:
+        - MATRIX_EVAL=""
+
+    - os: linux
+      name: installation tests
+      env:
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
+      before_script:
+        - pip3 install conan
+      script:
+        - "./test/installation-tests.sh"
+    - os: linux
+      name: compilation tests
+      env:
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
+      script:
+        - "./test/compilation-tests.sh"
+
+    - stage: deploy-unstable
+      os: linux
+      env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
+      before_script:
+        - pip3 install conan
+      script:
+        - conan remote add bernedom https://api.bintray.com/conan/bernedom/conan
+        - conan create . SI/unstable
+        - conan upload SI/*@SI/unstable --all -c -r bernedom
+
+    - stage: deploy-stable
+      os: linux
+      env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
+      before_script:
+        - pip3 install conan
+      script:
+        - conan remote add bernedom https://api.bintray.com/conan/bernedom/conan
+        - conan create . SI/stable
+        - conan upload SI/*@SI/stable --all -c -r bernedom
 
 before_install:
-- eval "${MATRIX_EVAL}"
+  - eval "${MATRIX_EVAL}"
 script:
-- cmake --version
-- mkdir build && cd build && cmake .. -G Ninja
-- cmake --build . --config Debug
-- ctest -C Debug
-
+  - cmake --version
+  - mkdir build && cd build && cmake .. -G Ninja
+  - cmake --build . --config Debug
+  - ctest -C Debug
 
 stages:
-- Test
-- name: deploy-unstable
-  if: branch = master AND type NOT IN (pull_request)
+  - Test
+  - name: deploy-unstable
+    if: branch = master AND type NOT IN (pull_request) AND tag IS NOT present
+  - name: deploy-stable
+    if: type NOT IN (pull_request) AND tag IS present AND tag ~= /^[0-9]+\.[0-9]+\.[0-9]+$/

From 052537648526cf28af4280e1a3f50447c5d1ab96 Mon Sep 17 00:00:00 2001
From: Dominik Berner <dominik.berner@gmail.com>
Date: Wed, 28 Aug 2019 14:11:49 +0200
Subject: [PATCH 2/3] Added pycache to gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 63b3065f..15e3edeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,5 @@ build
 build
 
 # exclude generated documentation
-doc/generated
\ No newline at end of file
+doc/generated
+__pycache
\ No newline at end of file

From 8e93976b185e842b90561a5c866e07f0d2bdb099 Mon Sep 17 00:00:00 2001
From: Dominik Berner <dominik.berner@gmail.com>
Date: Wed, 28 Aug 2019 14:12:19 +0200
Subject: [PATCH 3/3] Removed obsolte dependencies from travis

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 54e1d195..ac0577ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,15 +2,12 @@ language: cpp
 dist: bionic
 addons:
   apt:
-    sources:
-      - ubuntu-toolchain-r-test
     packages:
       - cmake
       - g++-7
       - g++-8
       - clang-5.0
       - clang-6.0
-      - libstdc++-8-dev
       - shunit2
       - ninja-build
       - python3