Merge pull request #52 from arbulu89/release/3.8.0

Release/3.8.0

.travis.yml

@@ -18,7 +18,7 @@ jobs:
           - pip install tox
       script:
           - tox
-          
+
     - stage: test
       python: 3.6
       env: TOXENV=py36-codeclimate
@@ -35,9 +35,8 @@ jobs:
           - ./cc-test-reporter after-build -t coverage.py --exit-code $TRAVIS_TEST_RESULT tests/coverage.xml
 
     - stage: delivery
-      if: type != pull_request
+      if: (type != pull_request AND (branch = master or env(DELIVER_BRANCHES))) or tag IS present
       env:
-        - FOLDER=/package
         - PACKAGE_NAME=python-shaptools
         - TAR_NAME=shaptools
 
@@ -46,18 +45,15 @@ jobs:
 
       script:
         - |
-          docker run -t -v "$(pwd):/package" \
-          -e OBS_USER=$OBS_USER \
-          -e OBS_PASS=$OBS_PASS \
-          -e FOLDER=$FOLDER \
-          -e OBS_PROJECT=$OBS_PROJECT \
-          -e PACKAGE_NAME=$PACKAGE_NAME \
-          -e TAR_NAME=$TAR_NAME \
+          docker run -t -v "$(pwd):/package" -w /package \
+          -e OBS_USER -e OBS_PASS=$OBS_PASS -e FOLDER -e OBS_PROJECT -e PACKAGE_NAME -e TAR_NAME=$TAR_NAME \
           shap/continuous_deliver \
-          /bin/bash -c "cd /package;/scripts/upload.sh"
+          /bin/bash -c "sed -i 's~%%VERSION%%~$TRAVIS_COMMIT~' _service && \
+          sed -i 's~%%REPOSITORY%%~$TRAVIS_REPO_SLUG~' _service && \
+          /scripts/upload.sh"
 
     - stage: submit
-      if: type != pull_request AND branch = master
+      if: tag IS present
       env:
         - PACKAGE_NAME=python-shaptools
 
@@ -66,11 +62,7 @@ jobs:
 
       script:
         - |
-          docker run -t -v "$(pwd):/package" \
-          -e OBS_USER=$OBS_USER \
-          -e OBS_PASS=$OBS_PASS \
-          -e OBS_PROJECT=$OBS_PROJECT \
-          -e PACKAGE_NAME=$PACKAGE_NAME \
-          -e TARGET_PROJECT=$TARGET_PROJECT \
+          docker run -t -v "$(pwd):/package" -w /package \
+          -e OBS_USER -e OBS_PASS=$OBS_PASS -e FOLDER -e OBS_PROJECT -e PACKAGE_NAME -e TAR_NAME=$TAR_NAME \
           shap/continuous_deliver \
-          /bin/bash -c "cd /package;/scripts/submit.sh"
+          /scripts/submit.sh

CONTRIBUTING.md

@@ -1,18 +1,12 @@
 # How to contribute
 
-To contribute to the project follow the next steps:
+## OBS Releases
 
-1. Fork the upstream project
-2. Create a new branch from **master**. Set meaningful name
-3. Add the new features
-4. Create/Update the unittary tests
-5. Make sure the CI pipelines are working
-  - Travis CI for the unitary tests
-  - Coveralls for the code coverage
-  - Code climate for the code analysis
-6. Create a pull request (all of the previous steps shall be checked)
+The CI will automatically interact with SUSE's [Open Build Service](https://build.opensuse.org): the master branch will be kept in sync with the `network:ha-clustering:sap-deployments:devel` project (the development upstream), while a new Submit Request against the `openSUSE:Factory` project (the stable downstream) can be triggered by publishing a new GitHub release or pushing a new Git tag.
 
-# Releasing
+When releasing to `openSUSE:Factory`, please ensure that tags always follow the [SemVer](https://semver.org/) scheme, and that [the changelog](python-shaptools.changes) contains a new entry, otherwise the request submission might fail.
 
-When the new release is planned, all the accepted pull requests shall be merged,
-the version number updated and the new code released.
+#### Note to maintainers
+
+The OBS projects can be changed via various environment variables like `OBS_PROJECT` and `TARGET_PROJECT` in the Travis settings.
+You can enable the OBS delivery for feature branches in your own fork by setting the variable `DELIVER_BRANCHES` to a non-empty value.

_service

@@ -0,0 +1,19 @@
+<services>
+  <service name="tar_scm" mode="disabled">
+    <param name="url">https://github.com/%%REPOSITORY%%.git</param>
+    <param name="scm">git</param>
+    <param name="exclude">.git</param>
+    <param name="filename">python-shaptools</param>
+    <param name="versionformat">@PARENT_TAG@+git.%ct.%h</param>
+    <param name="revision">%%VERSION%%</param>
+  </service>
+
+  <service name="recompress" mode="disabled">
+    <param name="file">*.tar</param>
+    <param name="compression">gz</param>
+  </service>
+
+  <service name="set_version" mode="disabled">
+    <param name="basename">python-shaptools</param>
+  </service>
+</services>

python-shaptools.changes

@@ -4,18 +4,20 @@ Fri Mar 27 18:15:37 UTC 2020 - Simranpal Singh <simranpal.singh@suse.com>
 - Create version 0.3.8
 - Add functionality to extract SAP sar files using SAPCAR tool
 
+  (jsc#SLE-10902, jsc#SLE-10903, jsc#ECO-817, jsc#ECO-818)
+
 -------------------------------------------------------------------
 Tue Mar 24 11:29:14 UTC 2020 - Xabier Arbulu <xarbulu@suse.com>
 
 - Create version 0.3.7
 - Improve hana installation software detection to allow more use
-  cases 
+  cases
 
 -------------------------------------------------------------------
 Thu Mar 19 15:31:22 UTC 2020 - Xabier Arbulu <xarbulu@suse.com>
 
 - Create version 0.3.6
-- Change the get_platform method to include the system OS type 
+- Change the get_platform method to include the system OS type
 
 -------------------------------------------------------------------
 Thu Jan  2 21:59:30 UTC 2020 - Simranpal Singh <simranpal.singh@suse.com>

python-shaptools.spec

@@ -22,13 +22,13 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-shaptools
-Version:        0.3.8
+Version:        0
 Release:        0
 Summary:        Python tools to interact with SAP HANA utilities
 License:        Apache-2.0
 Group:          Development/Languages/Python
 Url:            https://github.com/SUSE/shaptools
-Source:         shaptools-%{version}.tar.gz
+Source:         %{name}-%{version}.tar.gz
 %if %{with test}
 BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module pytest}
@@ -43,7 +43,7 @@ BuildArch:      noarch
 API to expose SAP HANA functionalities
 
 %prep
-%setup -q -n shaptools-%{version}
+%setup -q -n %{name}-%{version}
 
 %build
 %python_build

shaptools/__init__.py

@@ -6,4 +6,4 @@
 :since: 2018-11-15
 """
 
-__version__ = "0.3.2"
+__version__ = "0.3.8"