From 3c00023007f7227a1e948a1845da93c068f31ea0 Mon Sep 17 00:00:00 2001
From: Michael Haas <michael.haas01@sap.com>
Date: Wed, 22 Jul 2020 17:07:45 +0200
Subject: [PATCH 1/2] Travis: move deploy into system tests phase

Travis does not retain any files between different stages (or jobs).
Because the traceability report is generated during the system test stage,
this commit moves the deploy steps into the system test stage where the
file is actually available.
---
 .travis.yml | 48 +++++++++++++++++++-----------------------------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b12c649..794468a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,8 +37,6 @@ stages:
 - name: test
 - name: "system tests"
   if:  type != pull_request AND (branch = master OR tag =~ ^rel/.*$)
-- name: deploy
-  if: type != pull_request AND tag =~ ^rel/.*$
 
 language: python
 python:
@@ -83,6 +81,25 @@ jobs:
     # also handled via tox
     script:
       - tox -e system_tests
+    deploy:
+      - provider: releases
+        skip_cleanup: true
+        api_key:
+          # API key for a machine user specifically created for this task:
+          # https://github.com/dar-sdk-machine-user
+          secure: "m0kXSf53vJY95nb7lrM4N4KTiSmNuSoHfS3swxhjuoEdCPuaYHkpkHjPYH6ZNIjBbFEMGw4YENEcUdyzlshPe/WIX5IQ1LjFTZ1U9wP8Iup0VNW9NAHn32Q9oRUFKdD5IeCtjvQwGdVZbAoJM7+IwX19qqhgkPf1VEPPcq3zW+J/aZNg1ayfH+79x60vybapeG7a8QNvxNATrHaO07+xuWIoDaSKZA0ggDn2zxdaDGk/1SJRZsu67YA0DqFAYB8CtspgewJg7MIrLQcHps9yq+vp1sPHiWy9SH87CDyG9+NMXBb2rnvsmRwxXI659wFOQqMWmCgSs/L3IMPBCGziSqgw7MG5hLVpyrmExINuag2yricm0RDPYVxnJKBz3a7J4pl1zudpdfudich8WDinJk7TJHR3tTgIFx1ASmA20RiY22NUvHWpRL88jNJn5LXDyOaT5bT7c6i9VwxpUq234DXLQ9iUMrbs5P576x/Px71dfJ8RLv52D4TmwQYVzgRdFeFI/TOvyvIKA4dYfGylpsueIScZTn5G0p9srzqpRT8gr1sOlIsBHjISppeyEG6C3uTuhaP/zu7o+soQtiMHWm7G2/5BpUBz7JwMODMnK1f4B4stQJYo7Kx+KsGPUrkJVst07klya44EYGS7Ik8Dm6YsNhvc0safYxxNK71cqGY="
+        file: "system_test_results/traceability.html"
+        on:
+          condition:  $TRAVIS_TAG =~ ^rel/.*$
+      - provider: pypi
+        skip_cleanup: true
+        username: __token__
+        distributions: "sdist bdist_wheel"
+        password:
+          secure: "Yo1GgXnDX8br7Gwy7IbIbTowfbuATV8hwMoWeQEfXb/rkPxJuElbGDb6xEy19E3qojxMbeY2Lm5ahyRXBcQmekyzG4/xa4aLqxa08TEYbH/QQi3T7pFaIpBdPwHE3e3dsKZIFJwFwPymjIBZGC79CQkkD2g2+9GvSSJVkc5OMY/q1rVeWeKxbNmLiSu9kIIusBt1nkmrctLaNNN6fRvjII61bxkujpmBjWGZcNmcVHqxXqEVplfAOhBymalrhl6ABtlzKxLoBWJchqILLsVGoIhHIcUFkA7PyH90UfR5k2mWh7W5kh44vbY4F/OV2Dr875RNc/BYfnNe/RofxtIg1B9Z5JLVpGXsUhfWBqDcymym+ugTdYwEL2D4S2cWEK5sSur+cb/Ib/CAwYUaVf6eWJERzsPKs+5bfHHpkphDUIs7Rp6Mf5bkPgiUgbyWQ0Wdx5a7WXqwHCVpskCDreCF54X4FQuHeSxXrOVQ1GnknpTm5ZCJhuB5ged1a6BmhzF4LbhalHZjmYqy37j+jCLAa8QrpoUkhvPrSKyUQVHnj8P8yw2jydHDdyuWoibwL+rbrHHeX66QreV/utBODfbx2j3tMzkAU8QqKsmP9hWnHFx5Lz6Dl/m8MniKbs7B3vMG3MCJsPz2nawHC/wlDeRqTTARZ+Fpc7VHzj2/ra8Egos="
+        on:
+          condition:  $TRAVIS_TAG =~ ^rel/.*$
+        skip_existing: true
   - stage: test
     name: "Python: 3.8 on Windows"
     # https://docs.travis-ci.com/user/languages/python/#running-python-tests-on-multiple-operating-systems
@@ -97,30 +114,3 @@ jobs:
     os: osx
     osx_image: xcode11.2  # Python 3.7.4 running on macOS 10.14.4
     language: shell       # 'language: python' is an error on Travis CI macOS
-  - stage: deploy
-    python: '3.7' # only run once
-    install: skip
-    script: skip
-    deploy:
-      - provider: pypi
-        skip_cleanup: true
-        username: __token__
-        distributions: "sdist bdist_wheel"
-        password:
-          secure: "Yo1GgXnDX8br7Gwy7IbIbTowfbuATV8hwMoWeQEfXb/rkPxJuElbGDb6xEy19E3qojxMbeY2Lm5ahyRXBcQmekyzG4/xa4aLqxa08TEYbH/QQi3T7pFaIpBdPwHE3e3dsKZIFJwFwPymjIBZGC79CQkkD2g2+9GvSSJVkc5OMY/q1rVeWeKxbNmLiSu9kIIusBt1nkmrctLaNNN6fRvjII61bxkujpmBjWGZcNmcVHqxXqEVplfAOhBymalrhl6ABtlzKxLoBWJchqILLsVGoIhHIcUFkA7PyH90UfR5k2mWh7W5kh44vbY4F/OV2Dr875RNc/BYfnNe/RofxtIg1B9Z5JLVpGXsUhfWBqDcymym+ugTdYwEL2D4S2cWEK5sSur+cb/Ib/CAwYUaVf6eWJERzsPKs+5bfHHpkphDUIs7Rp6Mf5bkPgiUgbyWQ0Wdx5a7WXqwHCVpskCDreCF54X4FQuHeSxXrOVQ1GnknpTm5ZCJhuB5ged1a6BmhzF4LbhalHZjmYqy37j+jCLAa8QrpoUkhvPrSKyUQVHnj8P8yw2jydHDdyuWoibwL+rbrHHeX66QreV/utBODfbx2j3tMzkAU8QqKsmP9hWnHFx5Lz6Dl/m8MniKbs7B3vMG3MCJsPz2nawHC/wlDeRqTTARZ+Fpc7VHzj2/ra8Egos="
-        on:
-          # Limitation on branches is done in the "stages" section, so if
-          # the stage is executed, we always want to deploy
-          all_branches: true
-        skip_existing: true
-      - provider: releases
-        skip_cleanup: true
-        api_key:
-          # API key for a machine user specifically created for this task:
-          # https://github.com/dar-sdk-machine-user
-          secure: "m0kXSf53vJY95nb7lrM4N4KTiSmNuSoHfS3swxhjuoEdCPuaYHkpkHjPYH6ZNIjBbFEMGw4YENEcUdyzlshPe/WIX5IQ1LjFTZ1U9wP8Iup0VNW9NAHn32Q9oRUFKdD5IeCtjvQwGdVZbAoJM7+IwX19qqhgkPf1VEPPcq3zW+J/aZNg1ayfH+79x60vybapeG7a8QNvxNATrHaO07+xuWIoDaSKZA0ggDn2zxdaDGk/1SJRZsu67YA0DqFAYB8CtspgewJg7MIrLQcHps9yq+vp1sPHiWy9SH87CDyG9+NMXBb2rnvsmRwxXI659wFOQqMWmCgSs/L3IMPBCGziSqgw7MG5hLVpyrmExINuag2yricm0RDPYVxnJKBz3a7J4pl1zudpdfudich8WDinJk7TJHR3tTgIFx1ASmA20RiY22NUvHWpRL88jNJn5LXDyOaT5bT7c6i9VwxpUq234DXLQ9iUMrbs5P576x/Px71dfJ8RLv52D4TmwQYVzgRdFeFI/TOvyvIKA4dYfGylpsueIScZTn5G0p9srzqpRT8gr1sOlIsBHjISppeyEG6C3uTuhaP/zu7o+soQtiMHWm7G2/5BpUBz7JwMODMnK1f4B4stQJYo7Kx+KsGPUrkJVst07klya44EYGS7Ik8Dm6YsNhvc0safYxxNK71cqGY="
-        file: "system_test_results/traceability.html"
-        on:
-          # Limitation on branches is done in the "stages" section, so if
-          # the stage is executed, we always want to deploy
-          all_branches: true
\ No newline at end of file

From 61b06457de51f7c1f9289a177d33eb4a95887318 Mon Sep 17 00:00:00 2001
From: Michael Haas <michael.haas01@sap.com>
Date: Wed, 22 Jul 2020 17:12:31 +0200
Subject: [PATCH 2/2] Prepare release 0.6.8

---
 CHANGELOG.md | 12 +++++++++++-
 version.txt  |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f42edc..f58fc1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * (Add here)
 
+## [0.6.8]
+
+### Changed
+
+* Improvements to build process [#55]
+* No functional changes.
+
+[#55]: https://github.com/SAP/data-attribute-recommendation-python-sdk/pull/55
+
 ## [0.6.7]
 
 ### Changed
@@ -70,7 +79,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * First public release
 
-[Unreleased]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/v0.6.7...HEAD
+[Unreleased]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/v0.6.8...HEAD
+[0.6.8]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/v0.6.7...0.6.8
 [0.6.7]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/v0.6.6...0.6.7
 [0.6.6]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/v0.6.5...0.6.6
 [0.6.5]: https://github.com/SAP/data-attribute-recommendation-python-sdk/compare/v0.6.4...0.6.5
diff --git a/version.txt b/version.txt
index 2228cad..fae59ca 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.6.7
+0.6.8