Merge pull request #160 from ARGOeu/devel

Version 0.6.0

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.6.0] - 2022-11-03
+
+### Added
+
+* AM-143 Add support for requests ReadTimeOut exception
+* AM-228 Add user management fuctionality to AMS-library
+* AM-227 ams-library: add support for miscellaneous api calls
+* AM-225 AMS Library Support for more API Calls
+* ARGO-4050 Update tox to run unit tests against recent Python versions
+
+### Fixed
+
+* ARGO-4088 Fix ams-library test execute with local pyenv load
+
 ## [0.5.9] - 2022-08-02
 
 ### Fixed
@@ -20,7 +34,7 @@ AM-249 ams-library: bug fix regarding sub and topic acl methods #137
 
 ## [0.5.6] - 2022-06-21
 
-### Added 
+### Added
 
 AM-233 ams-library: support for project_member_get api call
 AM-230 ams-library: support for project_member_add api call
@@ -29,7 +43,7 @@ AM-226 ams-library: support for user_create api call
 
 ## [0.5.5] - 2021-04-15
 
-### Added 
+### Added
 
 ARGO-2768 ams-library: support for AMS authorization header
 
@@ -47,7 +61,7 @@ ARGO-2592 ams-library py2 RPM also packages py3 specific modules
 
 ## [0.5.2] - 2020-07-08
 
-### Fixed 
+### Fixed
 
 * ARGO-2479 Modify subscription offset method fails
 * ARGO-2360 Fix ack_sub retry loop
@@ -62,13 +76,13 @@ ARGO-2592 ams-library py2 RPM also packages py3 specific modules
 
 ## [0.5.0] - 2019-12-19
 
-### Added 
+### Added
 
 * ARGO-1481 Connection retry logic in ams-library
 
 ## [0.4.3] - 2019-11-08
 
-### Added 
+### Added
 
 * ARGO-1862 Make argo-ams-library Python 3 ready
 * ARGO-1841 Update the ams library to include the new timeToOffset functionality
@@ -86,7 +100,7 @@ ARGO-2592 ams-library py2 RPM also packages py3 specific modules
 
 ## [0.4.0-1] - 2018-05-09
 
-### Added 
+### Added
 
 * Extend ams library to support offset manipulation
 * Introduce AmsHttpRequests class
@@ -101,7 +115,7 @@ ARGO-2592 ams-library py2 RPM also packages py3 specific modules
 * Handle 404 for topic and subscription calls
 * Handle JSON error message propagated through AMS
 
-### Fixed 
+### Fixed
 
 * set for error codes and pass request args for iters
 * Status msg attach to AmsServiceException if exist

Jenkinsfile

@@ -13,24 +13,6 @@ pipeline {
     stages {
         stage ('Test'){
             parallel {
-                stage ('Test Centos 6') {
-                    agent {
-                        docker {
-                            image 'argo.registry:5000/epel-6-ams'
-                            args '-u jenkins:jenkins'
-                        }
-                    }
-                    steps {
-                        echo 'Building Rpm...'
-                        sh '''
-                            cd ${WORKSPACE}/$PROJECT_DIR
-                            coverage run -m unittest2 discover -v
-                            scl enable python27 rh-python36 'tox'
-                            scl enable rh-python36 'coverage xml --omit=*usr* --omit=*.tox*'
-                        '''
-                        cobertura coberturaReportFile: '**/coverage.xml'
-                    }
-                }
                 stage ('Test Centos 7') {
                     agent {
                         docker {
@@ -42,7 +24,11 @@ pipeline {
                         echo 'Building Rpm...'
                         sh '''
                             cd ${WORKSPACE}/$PROJECT_DIR
-                            coverage run -m unittest discover -v
+                            rm -f .python-version &>/dev/null
+                            source $HOME/pyenv.sh
+                            PY310V=$(pyenv versions | grep ams-py310)
+                            pyenv local 3.7.15 3.8.15 3.9.15 ${PY310V// /}
+                            tox
                             coverage xml --omit=*usr* --omit=*.tox*
                         '''
                         cobertura coberturaReportFile: '**/coverage.xml'
@@ -52,27 +38,6 @@ pipeline {
         }
         stage ('Build'){
             parallel {
-                stage ('Build Centos 6') {
-                    agent {
-                        docker {
-                            image 'argo.registry:5000/epel-6-ams'
-                            args '-u jenkins:jenkins'
-                        }
-                    }
-                    steps {
-                        echo 'Building Rpm...'
-                        withCredentials(bindings: [sshUserPrivateKey(credentialsId: 'jenkins-rpm-repo', usernameVariable: 'REPOUSER', \
-                                                                    keyFileVariable: 'REPOKEY')]) {
-                            sh "/home/jenkins/build-rpm.sh -w ${WORKSPACE} -b ${BRANCH_NAME} -d centos6 -p ${PROJECT_DIR} -s ${REPOKEY}"
-                        }
-                        archiveArtifacts artifacts: '**/*.rpm', fingerprint: true
-                    }
-                    post {
-                        always {
-                            cleanWs()
-                        }
-                    }
-                }
                 stage ('Build Centos 7') {
                     agent {
                         docker {

argo-ams-library.spec

@@ -6,7 +6,7 @@
 
 Name:           argo-ams-library
 Summary:        %{sum}
-Version:        0.5.9
+Version:        0.6.0
 Release:        1%{?dist}
 
 Group:          Development/Libraries
@@ -21,21 +21,6 @@ BuildArch:      noarch
 %{desc}
 
 
-%if 0%{?el6}
-
-%package -n python2-%{name}
-Obsoletes:     argo-ams-library
-Provides:      argo-ams-library
-Summary:       %{sum}
-BuildRequires: python2-devel    python2-setuptools
-Requires:      python2-requests
-AutoReq: no
-%description -n python2-%{name}
-%{desc}
-%{?python_provide:%python_provide python2-%{name}}
-
-%else
-
 %package -n python-%{name}
 Obsoletes:     argo-ams-library
 Provides:      argo-ams-library
@@ -47,19 +32,12 @@ AutoReq: no
 %{desc}
 %{?python_provide:%python_provide python-%{name}}
 
-%endif
 
 %package -n python%{python3_pkgversion}-%{name}
 Summary: %{sum}
-%if 0%{?el6}
-BuildRequires: python34-devel    python34-setuptools
-Requires:      python34-requests
-AutoReq: no
-%else
 BuildRequires: python36-devel    python36-setuptools
 Requires:      python36-requests
 AutoReq: no
-%endif
 %description -n python%{python3_pkgversion}-%{name}
 %{desc}
 %{?python_provide:%python_provide python3-%{name}}
@@ -95,6 +73,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Nov 3 2022 Daniel Vrcic <[email protected]>, agelostsal <[email protected]> - 0.6.0-1%{?dist}
+- AM-143 Add support for requests ReadTimeOut exception
+- AM-228 Add user management fuctionality to AMS-library
+- AM-227 ams-library: add support for miscellaneous api calls
+- AM-225 AMS Library Support for more API Calls
+- ARGO-4050 Update tox to run unit tests against recent Python versions
+- ARGO-4088 Fix ams-library test execute with local pyenv load
+- remove Centos 6 RPM build from spec
 * Tue Aug 2 2022 agelostsal <[email protected]> - 0.5.9-1%{?dist}
 - Different requests version for various  python versions
 * Tue Jul 26 2022 agelostsal <[email protected]> - 0.5.8-1%{?dist}