python/python-python-jenkins
SHA256
14
0
Fork 0
forked from pool/python-python-jenkins
Code Pull Requests Activity

Accepting request 1079857 from devel:languages:python

Browse Source 
- Update to 1.8.0:
  * Add retrieval of stages of artifacts
  * Switch links to opendev.org
  * Allow build number to be a string
  * Use fullname in get_job_info_regex
- Add patch use-parts-of-legacy-version.patch:
  * Use underpining parts of LegacyVersion pre-removal.

OBS-URL: https://build.opensuse.org/request/show/1079857
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-python-jenkins?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger
2023-04-17 15:41:20 +00:00
committed by Git OBS Bridge
parent 2902062b66 a9b7b31b4c
commit 58edc1c727
6 changed files with 342 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
python-jenkins-1.7.0.tar.gz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:deed8fa79d32769a615984a5dde5e01eda04914d3f4091bd9a23d30474695106
size 61250

3
python-jenkins-1.8.0.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0180a5463f68e2e0110f382b4248d2284bc68481db4a16fcbf61f4f55801c31f
size 64814

314
python-python-jenkins-no-mock.patch
View File

@@ -1,17 +1,79 @@
diff -upr python-jenkins-1.7.0.orig/tests/base.py python-jenkins-1.7.0/tests/base.py ---
--- python-jenkins-1.7.0.orig/tests/base.py 2022-05-03 14:48:58.234141501 +0200 test-requirements.txt | 2 --
+++ python-jenkins-1.7.0/tests/base.py 2022-05-03 14:48:58.242141551 +0200 tests/base.py | 7 ++-----
@@ -1,6 +1,6 @@ tests/helper.py | 2 +-
tests/jobs/test_assert.py | 2 +-
tests/jobs/test_build.py | 2 +-
tests/jobs/test_config.py | 2 +-
tests/jobs/test_copy.py | 2 +-
tests/jobs/test_count.py | 2 +-
tests/jobs/test_create.py | 2 +-
tests/jobs/test_debug.py | 2 +-
tests/jobs/test_delete.py | 2 +-
tests/jobs/test_disable.py | 2 +-
tests/jobs/test_enable.py | 2 +-
tests/jobs/test_get.py | 2 +-
tests/jobs/test_getall.py | 2 +-
tests/jobs/test_info.py | 2 +-
tests/jobs/test_name.py | 2 +-
tests/jobs/test_reconfig.py | 2 +-
tests/jobs/test_rename.py | 2 +-
tests/jobs/test_set_next_build_number.py | 2 +-
tests/test_build.py | 2 +-
tests/test_check_jenkinsfile_syntax.py | 2 +-
tests/test_credential.py | 2 +-
tests/test_info.py | 2 +-
tests/test_jenkins.py | 2 +-
tests/test_job_folder.py | 2 +-
tests/test_node.py | 2 +-
tests/test_plugins.py | 2 +-
tests/test_promotion.py | 2 +-
tests/test_queue.py | 2 +-
tests/test_quiet_down.py | 2 +-
tests/test_script.py | 2 +-
tests/test_version.py | 2 +-
tests/test_view.py | 2 +-
tests/test_whoami.py | 2 +-
35 files changed, 35 insertions(+), 40 deletions(-)
Index: python-jenkins-1.8.0/test-requirements.txt
===================================================================
--- python-jenkins-1.8.0.orig/test-requirements.txt
+++ python-jenkins-1.8.0/test-requirements.txt
@@ -1,8 +1,6 @@
cmd2!=0.8.3,<0.9.0;python_version<'3.0' # MIT
cmd2!=0.8.3;python_version>='3.0' # MIT
coverage>=3.6
-mock
-unittest2
python-subunit
requests-mock>=1.4.0
requests-kerberos<=0.12.0;python_version<'3.6'
Index: python-jenkins-1.8.0/tests/base.py
===================================================================
--- python-jenkins-1.8.0.orig/tests/base.py
+++ python-jenkins-1.8.0/tests/base.py
@@ -1,14 +1,11 @@
import sys import sys
-import mock -import mock
+from unittest import mock +from unittest import mock
+import unittest
from testscenarios import TestWithScenarios from testscenarios import TestWithScenarios
import jenkins import jenkins
diff -upr python-jenkins-1.7.0.orig/tests/helper.py python-jenkins-1.7.0/tests/helper.py
--- python-jenkins-1.7.0.orig/tests/helper.py 2022-05-03 14:48:58.234141501 +0200 -if sys.version_info < (2, 7):
+++ python-jenkins-1.7.0/tests/helper.py 2022-05-03 14:48:58.242141551 +0200 - import unittest2 as unittest
-else:
- import unittest
class JenkinsTestBase(TestWithScenarios, unittest.TestCase):
Index: python-jenkins-1.8.0/tests/helper.py
===================================================================
--- python-jenkins-1.8.0.orig/tests/helper.py
+++ python-jenkins-1.8.0/tests/helper.py
@@ -4,7 +4,7 @@ from multiprocessing import Process @@ -4,7 +4,7 @@ from multiprocessing import Process
from multiprocessing import Queue from multiprocessing import Queue
import traceback import traceback
@@ -21,9 +83,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/helper.py python-jenkins-1.7.0/tests/h
import requests import requests
from six.moves import socketserver from six.moves import socketserver
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_assert.py python-jenkins-1.7.0/tests/jobs/test_assert.py Index: python-jenkins-1.8.0/tests/jobs/test_assert.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_assert.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_assert.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_assert.py
+++ python-jenkins-1.8.0/tests/jobs/test_assert.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -31,9 +94,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_assert.py python-jenkins-1.7
import jenkins import jenkins
from tests.jobs.base import JenkinsJobsTestBase from tests.jobs.base import JenkinsJobsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_build.py python-jenkins-1.7.0/tests/jobs/test_build.py Index: python-jenkins-1.8.0/tests/jobs/test_build.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_build.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_build.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_build.py
+++ python-jenkins-1.8.0/tests/jobs/test_build.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
-from mock import patch -from mock import patch
@@ -41,18 +105,20 @@ diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_build.py python-jenkins-1.7.
import jenkins import jenkins
from six.moves.urllib.parse import quote from six.moves.urllib.parse import quote
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_config.py python-jenkins-1.7.0/tests/jobs/test_config.py Index: python-jenkins-1.8.0/tests/jobs/test_config.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_config.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_config.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_config.py
+++ python-jenkins-1.8.0/tests/jobs/test_config.py
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-from mock import patch -from mock import patch
+from unittest.mock import patch +from unittest.mock import patch
import jenkins import jenkins
from tests.jobs.base import JenkinsJobsTestBase from tests.jobs.base import JenkinsJobsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_copy.py python-jenkins-1.7.0/tests/jobs/test_copy.py Index: python-jenkins-1.8.0/tests/jobs/test_copy.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_copy.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_copy.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_copy.py
+++ python-jenkins-1.8.0/tests/jobs/test_copy.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -60,9 +126,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_copy.py python-jenkins-1.7.0
import jenkins import jenkins
from tests.jobs.base import JenkinsJobsTestBase from tests.jobs.base import JenkinsJobsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_count.py python-jenkins-1.7.0/tests/jobs/test_count.py Index: python-jenkins-1.8.0/tests/jobs/test_count.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_count.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_count.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_count.py
+++ python-jenkins-1.8.0/tests/jobs/test_count.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -70,9 +137,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_count.py python-jenkins-1.7.
import jenkins import jenkins
from tests.jobs.base import JenkinsJobsTestBase from tests.jobs.base import JenkinsJobsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_create.py python-jenkins-1.7.0/tests/jobs/test_create.py Index: python-jenkins-1.8.0/tests/jobs/test_create.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_create.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_create.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_create.py
+++ python-jenkins-1.8.0/tests/jobs/test_create.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -80,9 +148,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_create.py python-jenkins-1.7
import jenkins import jenkins
from tests.jobs.base import JenkinsJobsTestBase from tests.jobs.base import JenkinsJobsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_debug.py python-jenkins-1.7.0/tests/jobs/test_debug.py Index: python-jenkins-1.8.0/tests/jobs/test_debug.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_debug.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_debug.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_debug.py
+++ python-jenkins-1.8.0/tests/jobs/test_debug.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -90,9 +159,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_debug.py python-jenkins-1.7.
import jenkins import jenkins
from tests.jobs.base import JenkinsJobsTestBase from tests.jobs.base import JenkinsJobsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_delete.py python-jenkins-1.7.0/tests/jobs/test_delete.py Index: python-jenkins-1.8.0/tests/jobs/test_delete.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_delete.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_delete.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_delete.py
+++ python-jenkins-1.8.0/tests/jobs/test_delete.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -100,9 +170,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_delete.py python-jenkins-1.7
import jenkins import jenkins
from tests.jobs.base import JenkinsJobsTestBase from tests.jobs.base import JenkinsJobsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_disable.py python-jenkins-1.7.0/tests/jobs/test_disable.py Index: python-jenkins-1.8.0/tests/jobs/test_disable.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_disable.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_disable.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_disable.py
+++ python-jenkins-1.8.0/tests/jobs/test_disable.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -110,9 +181,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_disable.py python-jenkins-1.
import jenkins import jenkins
from tests.jobs.base import JenkinsJobsTestBase from tests.jobs.base import JenkinsJobsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_enable.py python-jenkins-1.7.0/tests/jobs/test_enable.py Index: python-jenkins-1.8.0/tests/jobs/test_enable.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_enable.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_enable.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_enable.py
+++ python-jenkins-1.8.0/tests/jobs/test_enable.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -120,9 +192,21 @@ diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_enable.py python-jenkins-1.7
import jenkins import jenkins
from tests.jobs.base import JenkinsJobsTestBase from tests.jobs.base import JenkinsJobsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_getall.py python-jenkins-1.7.0/tests/jobs/test_getall.py Index: python-jenkins-1.8.0/tests/jobs/test_get.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_getall.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_getall.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_get.py
+++ python-jenkins-1.8.0/tests/jobs/test_get.py
@@ -1,5 +1,5 @@
import json
-from mock import patch
+from unittest.mock import patch
import jenkins
from tests.helper import build_response_mock
Index: python-jenkins-1.8.0/tests/jobs/test_getall.py
===================================================================
--- python-jenkins-1.8.0.orig/tests/jobs/test_getall.py
+++ python-jenkins-1.8.0/tests/jobs/test_getall.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -130,9 +214,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_getall.py python-jenkins-1.7
import jenkins import jenkins
from tests.jobs.base import JenkinsGetJobsTestBase from tests.jobs.base import JenkinsGetJobsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_get.py python-jenkins-1.7.0/tests/jobs/test_get.py Index: python-jenkins-1.8.0/tests/jobs/test_info.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_get.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_get.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_info.py
+++ python-jenkins-1.8.0/tests/jobs/test_info.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -140,19 +225,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_get.py python-jenkins-1.7.0/
import jenkins import jenkins
from tests.helper import build_response_mock from tests.helper import build_response_mock
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_info.py python-jenkins-1.7.0/tests/jobs/test_info.py Index: python-jenkins-1.8.0/tests/jobs/test_name.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_info.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_info.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_name.py
@@ -1,5 +1,5 @@ +++ python-jenkins-1.8.0/tests/jobs/test_name.py
import json
-from mock import patch
+from unittest.mock import patch
import jenkins
from tests.helper import build_response_mock
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_name.py python-jenkins-1.7.0/tests/jobs/test_name.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_name.py 2022-05-03 14:48:58.238141526 +0200
+++ python-jenkins-1.7.0/tests/jobs/test_name.py 2022-05-03 14:48:58.246141576 +0200
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -160,9 +236,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_name.py python-jenkins-1.7.0
import jenkins import jenkins
from tests.jobs.base import JenkinsJobsTestBase from tests.jobs.base import JenkinsJobsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_reconfig.py python-jenkins-1.7.0/tests/jobs/test_reconfig.py Index: python-jenkins-1.8.0/tests/jobs/test_reconfig.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_reconfig.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_reconfig.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_reconfig.py
+++ python-jenkins-1.8.0/tests/jobs/test_reconfig.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -170,9 +247,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_reconfig.py python-jenkins-1
import jenkins import jenkins
from tests.jobs.base import JenkinsJobsTestBase from tests.jobs.base import JenkinsJobsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_rename.py python-jenkins-1.7.0/tests/jobs/test_rename.py Index: python-jenkins-1.8.0/tests/jobs/test_rename.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_rename.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_rename.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_rename.py
+++ python-jenkins-1.8.0/tests/jobs/test_rename.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -180,18 +258,20 @@ diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_rename.py python-jenkins-1.7
import jenkins import jenkins
from tests.jobs.base import JenkinsJobsTestBase from tests.jobs.base import JenkinsJobsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/jobs/test_set_next_build_number.py python-jenkins-1.7.0/tests/jobs/test_set_next_build_number.py Index: python-jenkins-1.8.0/tests/jobs/test_set_next_build_number.py
--- python-jenkins-1.7.0.orig/tests/jobs/test_set_next_build_number.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/jobs/test_set_next_build_number.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/jobs/test_set_next_build_number.py
+++ python-jenkins-1.8.0/tests/jobs/test_set_next_build_number.py
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-from mock import patch -from mock import patch
+from unittest.mock import patch +from unittest.mock import patch
import jenkins import jenkins
from tests.jobs.base import JenkinsJobsTestBase from tests.jobs.base import JenkinsJobsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/test_build.py python-jenkins-1.7.0/tests/test_build.py Index: python-jenkins-1.8.0/tests/test_build.py
--- python-jenkins-1.7.0.orig/tests/test_build.py 2022-05-03 14:48:58.234141501 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_build.py 2022-05-03 14:48:58.242141551 +0200 --- python-jenkins-1.8.0.orig/tests/test_build.py
+++ python-jenkins-1.8.0/tests/test_build.py
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
import json import json
@@ -201,18 +281,20 @@ diff -upr python-jenkins-1.7.0.orig/tests/test_build.py python-jenkins-1.7.0/tes
import jenkins import jenkins
from tests.base import JenkinsTestBase from tests.base import JenkinsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/test_check_jenkinsfile_syntax.py python-jenkins-1.7.0/tests/test_check_jenkinsfile_syntax.py Index: python-jenkins-1.8.0/tests/test_check_jenkinsfile_syntax.py
--- python-jenkins-1.7.0.orig/tests/test_check_jenkinsfile_syntax.py 2022-05-03 14:48:58.234141501 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_check_jenkinsfile_syntax.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/test_check_jenkinsfile_syntax.py
+++ python-jenkins-1.8.0/tests/test_check_jenkinsfile_syntax.py
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-from mock import patch -from mock import patch
+from unittest.mock import patch +from unittest.mock import patch
from tests.base import JenkinsTestBase from tests.base import JenkinsTestBase
from tests.helper import build_response_mock from tests.helper import build_response_mock
diff -upr python-jenkins-1.7.0.orig/tests/test_credential.py python-jenkins-1.7.0/tests/test_credential.py Index: python-jenkins-1.8.0/tests/test_credential.py
--- python-jenkins-1.7.0.orig/tests/test_credential.py 2022-05-03 14:48:58.234141501 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_credential.py 2022-05-03 14:48:58.242141551 +0200 --- python-jenkins-1.8.0.orig/tests/test_credential.py
+++ python-jenkins-1.8.0/tests/test_credential.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -220,9 +302,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/test_credential.py python-jenkins-1.7.
import jenkins import jenkins
from tests.base import JenkinsTestBase from tests.base import JenkinsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/test_info.py python-jenkins-1.7.0/tests/test_info.py Index: python-jenkins-1.8.0/tests/test_info.py
--- python-jenkins-1.7.0.orig/tests/test_info.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_info.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/test_info.py
+++ python-jenkins-1.8.0/tests/test_info.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -230,9 +313,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/test_info.py python-jenkins-1.7.0/test
import jenkins import jenkins
from tests.base import JenkinsTestBase from tests.base import JenkinsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/test_jenkins.py python-jenkins-1.7.0/tests/test_jenkins.py Index: python-jenkins-1.8.0/tests/test_jenkins.py
--- python-jenkins-1.7.0.orig/tests/test_jenkins.py 2022-05-03 14:48:58.234141501 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_jenkins.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/test_jenkins.py
+++ python-jenkins-1.8.0/tests/test_jenkins.py
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
import json import json
import socket import socket
@@ -242,18 +326,20 @@ diff -upr python-jenkins-1.7.0.orig/tests/test_jenkins.py python-jenkins-1.7.0/t
import six import six
from tests.base import JenkinsTestBase from tests.base import JenkinsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/test_job_folder.py python-jenkins-1.7.0/tests/test_job_folder.py Index: python-jenkins-1.8.0/tests/test_job_folder.py
--- python-jenkins-1.7.0.orig/tests/test_job_folder.py 2022-05-03 14:48:58.234141501 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_job_folder.py 2022-05-03 14:48:58.242141551 +0200 --- python-jenkins-1.8.0.orig/tests/test_job_folder.py
+++ python-jenkins-1.8.0/tests/test_job_folder.py
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-from mock import patch -from mock import patch
+from unittest.mock import patch +from unittest.mock import patch
import jenkins import jenkins
from tests.base import JenkinsTestBase from tests.base import JenkinsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/test_node.py python-jenkins-1.7.0/tests/test_node.py Index: python-jenkins-1.8.0/tests/test_node.py
--- python-jenkins-1.7.0.orig/tests/test_node.py 2022-05-03 14:48:58.234141501 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_node.py 2022-05-03 14:48:58.242141551 +0200 --- python-jenkins-1.8.0.orig/tests/test_node.py
+++ python-jenkins-1.8.0/tests/test_node.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -261,9 +347,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/test_node.py python-jenkins-1.7.0/test
import jenkins import jenkins
import requests_mock import requests_mock
diff -upr python-jenkins-1.7.0.orig/tests/test_plugins.py python-jenkins-1.7.0/tests/test_plugins.py Index: python-jenkins-1.8.0/tests/test_plugins.py
--- python-jenkins-1.7.0.orig/tests/test_plugins.py 2022-05-03 14:48:58.234141501 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_plugins.py 2022-05-03 14:48:58.242141551 +0200 --- python-jenkins-1.8.0.orig/tests/test_plugins.py
+++ python-jenkins-1.8.0/tests/test_plugins.py
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
@@ -273,9 +360,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/test_plugins.py python-jenkins-1.7.0/t
from testscenarios.scenarios import multiply_scenarios from testscenarios.scenarios import multiply_scenarios
import jenkins import jenkins
diff -upr python-jenkins-1.7.0.orig/tests/test_promotion.py python-jenkins-1.7.0/tests/test_promotion.py Index: python-jenkins-1.8.0/tests/test_promotion.py
--- python-jenkins-1.7.0.orig/tests/test_promotion.py 2022-05-03 14:48:58.234141501 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_promotion.py 2022-05-03 14:48:58.242141551 +0200 --- python-jenkins-1.8.0.orig/tests/test_promotion.py
+++ python-jenkins-1.8.0/tests/test_promotion.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -283,9 +371,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/test_promotion.py python-jenkins-1.7.0
import jenkins import jenkins
from tests.base import JenkinsTestBase from tests.base import JenkinsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/test_queue.py python-jenkins-1.7.0/tests/test_queue.py Index: python-jenkins-1.8.0/tests/test_queue.py
--- python-jenkins-1.7.0.orig/tests/test_queue.py 2022-05-03 14:48:58.234141501 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_queue.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/test_queue.py
+++ python-jenkins-1.8.0/tests/test_queue.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -293,9 +382,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/test_queue.py python-jenkins-1.7.0/tes
import jenkins import jenkins
from tests.base import JenkinsTestBase from tests.base import JenkinsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/test_quiet_down.py python-jenkins-1.7.0/tests/test_quiet_down.py Index: python-jenkins-1.8.0/tests/test_quiet_down.py
--- python-jenkins-1.7.0.orig/tests/test_quiet_down.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_quiet_down.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/test_quiet_down.py
+++ python-jenkins-1.8.0/tests/test_quiet_down.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -303,27 +393,30 @@ diff -upr python-jenkins-1.7.0.orig/tests/test_quiet_down.py python-jenkins-1.7.
import jenkins import jenkins
from tests.base import JenkinsTestBase from tests.base import JenkinsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/test_script.py python-jenkins-1.7.0/tests/test_script.py Index: python-jenkins-1.8.0/tests/test_script.py
--- python-jenkins-1.7.0.orig/tests/test_script.py 2022-05-03 14:48:58.234141501 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_script.py 2022-05-03 14:48:58.242141551 +0200 --- python-jenkins-1.8.0.orig/tests/test_script.py
+++ python-jenkins-1.8.0/tests/test_script.py
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-from mock import patch -from mock import patch
+from unittest.mock import patch +from unittest.mock import patch
import jenkins import jenkins
from tests.base import JenkinsTestBase from tests.base import JenkinsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/test_version.py python-jenkins-1.7.0/tests/test_version.py Index: python-jenkins-1.8.0/tests/test_version.py
--- python-jenkins-1.7.0.orig/tests/test_version.py 2022-05-03 14:48:58.234141501 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_version.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/test_version.py
+++ python-jenkins-1.8.0/tests/test_version.py
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-from mock import patch -from mock import patch
+from unittest.mock import patch +from unittest.mock import patch
import jenkins import jenkins
from tests.base import JenkinsTestBase from tests.base import JenkinsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/test_view.py python-jenkins-1.7.0/tests/test_view.py Index: python-jenkins-1.8.0/tests/test_view.py
--- python-jenkins-1.7.0.orig/tests/test_view.py 2022-05-03 14:48:58.238141526 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_view.py 2022-05-03 14:48:58.246141576 +0200 --- python-jenkins-1.8.0.orig/tests/test_view.py
+++ python-jenkins-1.8.0/tests/test_view.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch
@@ -331,9 +424,10 @@ diff -upr python-jenkins-1.7.0.orig/tests/test_view.py python-jenkins-1.7.0/test
import jenkins import jenkins
from tests.base import JenkinsTestBase from tests.base import JenkinsTestBase
diff -upr python-jenkins-1.7.0.orig/tests/test_whoami.py python-jenkins-1.7.0/tests/test_whoami.py Index: python-jenkins-1.8.0/tests/test_whoami.py
--- python-jenkins-1.7.0.orig/tests/test_whoami.py 2022-05-03 14:48:58.234141501 +0200 ===================================================================
+++ python-jenkins-1.7.0/tests/test_whoami.py 2022-05-03 14:48:58.242141551 +0200 --- python-jenkins-1.8.0.orig/tests/test_whoami.py
+++ python-jenkins-1.8.0/tests/test_whoami.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import json import json
-from mock import patch -from mock import patch

11
python-python-jenkins.changes
View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Apr 17 08:05:56 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
- Update to 1.8.0:
* Add retrieval of stages of artifacts
* Switch links to opendev.org
* Allow build number to be a string
* Use fullname in get_job_info_regex
- Add patch use-parts-of-legacy-version.patch:
* Use underpining parts of LegacyVersion pre-removal.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 4 05:46:39 UTC 2022 - pgajdos@suse.com Wed May 4 05:46:39 UTC 2022 - pgajdos@suse.com

26
python-python-jenkins.spec
View File

@@ -1,7 +1,7 @@
# #
# spec file for package python-python-jenkins # spec file for package python-python-jenkins
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# Copyright (c) 2014 Thomas Bechtold <thomasbechtold@jpberlin.de> # Copyright (c) 2014 Thomas Bechtold <thomasbechtold@jpberlin.de>
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@@ -17,30 +17,34 @@
# #
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-python-jenkins Name: python-python-jenkins
Version: 1.7.0 Version: 1.8.0
Release: 0 Release: 0
Summary: Python bindings for the remote Jenkins API Summary: Python bindings for the remote Jenkins API
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Languages/Python
URL: https://opendev.org/jjb/python-jenkins URL: https://opendev.org/jjb/python-jenkins
Source: https://files.pythonhosted.org/packages/source/p/python-jenkins/python-jenkins-%{version}.tar.gz Source: https://files.pythonhosted.org/packages/source/p/python-jenkins/python-jenkins-%{version}.tar.gz
# https://bugs.launchpad.net/python-jenkins/+bug/1971524 # https://bugs.launchpad.net/python-jenkins/+bug/1971524
Patch0: python-python-jenkins-no-mock.patch Patch0: python-python-jenkins-no-mock.patch
# PATCH-FIX-OPENSUSE Upstream are arguing about version parsing, use the
# underlying parts of LegacyVersion from packaging pre-removal
Patch1: use-parts-of-legacy-version.patch
BuildRequires: %{python_module cmd2} BuildRequires: %{python_module cmd2}
BuildRequires: %{python_module multi_key_dict} BuildRequires: %{python_module multi_key_dict}
BuildRequires: %{python_module pbr >= 0.8.2} BuildRequires: %{python_module pbr >= 0.8.2}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module requests-mock >= 1.4} BuildRequires: %{python_module requests-mock >= 1.4}
BuildRequires: %{python_module requests} BuildRequires: %{python_module requests}
BuildRequires: %{python_module testscenarios} BuildRequires: %{python_module testscenarios}
BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
BuildRequires: pkgconfig(krb5-gssapi) BuildRequires: pkgconfig(krb5-gssapi)
Requires: python-multi_key_dict Requires: python-multi_key_dict
Requires: python-pbr
Requires: python-requests Requires: python-requests
Requires: python-setuptools
Requires: python-six >= 1.3.0 Requires: python-six >= 1.3.0
Provides: python-jenkins = %{version} Provides: python-jenkins = %{version}
Obsoletes: python-jenkins < %{version} Obsoletes: python-jenkins < %{version}
@@ -57,18 +61,22 @@ API. It currently supports management of:
%prep %prep
%autosetup -p1 -n python-jenkins-%{version} %autosetup -p1 -n python-jenkins-%{version}
sed -i '1{\@^#!%{_bindir}/env python@d}' jenkins/__init__.py
%build %build
%python_build %pyproject_wheel
%install %install
%python_install %pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check %check
%pyunittest tests/*.py %pyunittest discover -v tests
%files %{python_files} %files %{python_files}
%license COPYING %license COPYING
%doc README.rst %doc README.rst
%{python_sitelib}/* %{python_sitelib}/jenkins
%{python_sitelib}/python_jenkins-%{version}*-info
%changelog %changelog

107
use-parts-of-legacy-version.patch Normal file
View File

@@ -0,0 +1,107 @@
Index: python-jenkins-1.8.0/jenkins/plugins.py
===================================================================
--- python-jenkins-1.8.0.orig/jenkins/plugins.py
+++ python-jenkins-1.8.0/jenkins/plugins.py
@@ -41,8 +41,7 @@
import operator
import re
-
-import pkg_resources
+from typing import Iterator, Tuple
class Plugin(dict):
@@ -67,6 +66,63 @@ class Plugin(dict):
super(Plugin, self).__setitem__(key, value)
+# Portion of code from packaging module, dual licensed under the terms of
+# the Apache License, Version 2.0, and the BSD License.
+_legacy_version_component_re = re.compile(r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE)
+
+_legacy_version_replacement_map = {
+ "pre": "c",
+ "preview": "c",
+ "-": "final-",
+ "rc": "c",
+ "dev": "@",
+}
+
+
+def _parse_version_parts(s: str) -> Iterator[str]:
+ for part in _legacy_version_component_re.split(s):
+ part = _legacy_version_replacement_map.get(part, part)
+
+ if not part or part == ".":
+ continue
+
+ if part[:1] in "0123456789":
+ # pad for numeric comparison
+ yield part.zfill(8)
+ else:
+ yield "*" + part
+
+ # ensure that alpha/beta/candidate are before final
+ yield "*final"
+
+
+def _legacy_cmpkey(version: str) -> Tuple[int, Tuple[str, ...]]:
+
+ # We hardcode an epoch of -1 here. A PEP 440 version can only have a epoch
+ # greater than or equal to 0. This will effectively put the LegacyVersion,
+ # which uses the defacto standard originally implemented by setuptools,
+ # as before all PEP 440 versions.
+ epoch = -1
+
+ # This scheme is taken from pkg_resources.parse_version setuptools prior to
+ # it's adoption of the packaging library.
+ parts: List[str] = []
+ for part in _parse_version_parts(version.lower()):
+ if part.startswith("*"):
+ # remove "-" before a prerelease tag
+ if part < "*final":
+ while parts and parts[-1] == "*final-":
+ parts.pop()
+
+ # remove trailing zeros from each series of numeric parts
+ while parts and parts[-1] == "00000000":
+ parts.pop()
+
+ parts.append(part)
+
+ return epoch, tuple(parts)
+
+
class PluginVersion(str):
'''Class providing comparison capabilities for plugin versions.'''
@@ -76,15 +132,14 @@ class PluginVersion(str):
'''Parse plugin version and store it for comparison.'''
self._version = version
- self.parsed_version = pkg_resources.parse_version(
- self.__convert_version(version))
+ self.parsed_version = _legacy_cmpkey(self.__convert_version(version))
def __convert_version(self, version):
return self._VERSION_RE.sub(r'\g<1>.preview', str(version))
def __compare(self, op, version):
- return op(self.parsed_version, pkg_resources.parse_version(
- self.__convert_version(version)))
+ return op(self.parsed_version,
+ _legacy_cmpkey(self.__convert_version(version)))
def __le__(self, version):
return self.__compare(operator.le, version)
Index: python-jenkins-1.8.0/requirements.txt
===================================================================
--- python-jenkins-1.8.0.orig/requirements.txt
+++ python-jenkins-1.8.0/requirements.txt
@@ -1,5 +1,3 @@
-# Setuptools removed support for PEP 440 non-conforming versions
-setuptools<66
six>=1.3.0
pbr>=0.8.2
multi_key_dict