From 793009aae7de9ba0870a75460e2d50f50ef6d571 Mon Sep 17 00:00:00 2001 From: Daniel Vrcic Date: Thu, 3 Nov 2022 07:53:56 +0100 Subject: [PATCH 1/8] Update CHANGELOG --- CHANGELOG.md | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a21bff..b460190 100644 --- a/CHANGELOG.md +++ b/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 From 2584bd63dd13c94d5614e7650e9de81041706fd8 Mon Sep 17 00:00:00 2001 From: Daniel Vrcic Date: Thu, 3 Nov 2022 08:47:02 +0100 Subject: [PATCH 2/8] Remove particular untested requests version from tox --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index f0abfef..8ded7e0 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,6 @@ deps = coverage httmock mock requests0: requests==2.20 - requests2123: requests==2.12.3 requests260: requests==2.6.0 requests2125: requests==2.12.5 commands = coverage run --append -m pytest From 9131bfe8611881914c65e75c86317805cce8608d Mon Sep 17 00:00:00 2001 From: Daniel Vrcic Date: Thu, 3 Nov 2022 08:52:55 +0100 Subject: [PATCH 3/8] Remove Centos 6 RPM build --- argo-ams-library.spec | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/argo-ams-library.spec b/argo-ams-library.spec index f803d12..b2d28be 100644 --- a/argo-ams-library.spec +++ b/argo-ams-library.spec @@ -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}} From 39d660329241202fa34a3ea4aa609705d61f7913 Mon Sep 17 00:00:00 2001 From: Daniel Vrcic Date: Thu, 3 Nov 2022 09:00:01 +0100 Subject: [PATCH 4/8] Update spec changelog --- argo-ams-library.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/argo-ams-library.spec b/argo-ams-library.spec index b2d28be..fd8e09f 100644 --- a/argo-ams-library.spec +++ b/argo-ams-library.spec @@ -73,6 +73,14 @@ rm -rf %{buildroot} %changelog +* Thu Nov 3 2022 Daniel Vrcic , agelostsal - 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 - 0.5.9-1%{?dist} - Different requests version for various python versions * Tue Jul 26 2022 agelostsal - 0.5.8-1%{?dist} From 324e3897b14f24d4b141ada5eb3525f8b328b011 Mon Sep 17 00:00:00 2001 From: Daniel Vrcic Date: Thu, 3 Nov 2022 09:00:16 +0100 Subject: [PATCH 5/8] Bump version 0.6.0 --- argo-ams-library.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/argo-ams-library.spec b/argo-ams-library.spec index fd8e09f..097c459 100644 --- a/argo-ams-library.spec +++ b/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 From e1aba64aa51be70b875346796b0bbca474e641c7 Mon Sep 17 00:00:00 2001 From: Daniel Vrcic Date: Thu, 3 Nov 2022 09:16:47 +0100 Subject: [PATCH 6/8] Force rm of pyenv version settings even if referenced file is not there --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f0e494b..312c573 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ pipeline { echo 'Building Rpm...' sh ''' cd ${WORKSPACE}/$PROJECT_DIR - rm .python-version &>/dev/null + 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// /} From f4cc06a93f8d6f4a660475ae0cbb883814db9999 Mon Sep 17 00:00:00 2001 From: Daniel Vrcic Date: Thu, 3 Nov 2022 09:28:52 +0100 Subject: [PATCH 7/8] Do not try to run tests in parallel --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 312c573..3a985e0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,6 @@ pipeline { stages { stage ('Test'){ parallel { - stage ('Test Centos 7') { agent { docker { @@ -29,7 +28,7 @@ pipeline { source $HOME/pyenv.sh PY310V=$(pyenv versions | grep ams-py310) pyenv local 3.7.15 3.8.15 3.9.15 ${PY310V// /} - tox -p + tox coverage xml --omit=*usr* --omit=*.tox* ''' cobertura coberturaReportFile: '**/coverage.xml' From c82c1f02435dfa508be6ad80eb26f12b69e4cc41 Mon Sep 17 00:00:00 2001 From: Daniel Vrcic Date: Thu, 3 Nov 2022 09:31:58 +0100 Subject: [PATCH 8/8] Remove older Python versions not supported and tested anymore --- setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py index d04634c..47fcc39 100644 --- a/setup.py +++ b/setup.py @@ -44,9 +44,7 @@ def get_ver(): "Development Status :: 5 - Production/Stable", "License :: OSI Approved :: Apache Software License", "Operating System :: POSIX", - "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8",