14
0

- Update to 0.16.3:

* Pinned Python 2 CI tests to legacy version of dependencies. See #408
  * Add PyPI badge for supported Python versions. See #408
  * Add Django 4.0+ compatibility. See #408
  * Update PR template. See #408
  * SC-95272: Remove support for Python 3.3. See #408
- Disable broken tests in python 3.11, test_encode_empty_tuple

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-rollbar?expand=0&rev=25
This commit is contained in:
2023-02-20 12:18:02 +00:00
committed by Git OBS Bridge
parent c04a1a18f9
commit 06c521c425
5 changed files with 86 additions and 75 deletions

View File

@@ -1,7 +1,7 @@
Index: pyrollbar-0.16.2/rollbar/test/__init__.py
Index: pyrollbar-0.16.3/rollbar/test/__init__.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/__init__.py
+++ pyrollbar-0.16.2/rollbar/test/__init__.py
--- pyrollbar-0.16.3.orig/rollbar/test/__init__.py
+++ pyrollbar-0.16.3/rollbar/test/__init__.py
@@ -1,13 +1,13 @@
-import unittest2
+import unittest
@@ -19,10 +19,10 @@ Index: pyrollbar-0.16.2/rollbar/test/__init__.py
def discover():
- return unittest2.defaultTestLoader.discover(__name__)
+ return unittest.defaultTestLoader.discover(__name__)
Index: pyrollbar-0.16.2/rollbar/test/test_lib.py
Index: pyrollbar-0.16.3/rollbar/test/test_lib.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/test_lib.py
+++ pyrollbar-0.16.2/rollbar/test/test_lib.py
--- pyrollbar-0.16.3.orig/rollbar/test/test_lib.py
+++ pyrollbar-0.16.3/rollbar/test/test_lib.py
@@ -2,6 +2,8 @@ from rollbar.lib import dict_merge
from rollbar.test import BaseTest
@@ -38,10 +38,10 @@ Index: pyrollbar-0.16.2/rollbar/test/test_lib.py
self.assertIn('y', result['a'])
- self.assertRegex(result['a']['y'], r'Uncopyable obj')
+ six.assertRegex(self, result['a']['y'], r'Uncopyable obj')
Index: pyrollbar-0.16.2/rollbar/test/test_rollbar.py
Index: pyrollbar-0.16.3/rollbar/test/test_rollbar.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/test_rollbar.py
+++ pyrollbar-0.16.2/rollbar/test/test_rollbar.py
--- pyrollbar-0.16.3.orig/rollbar/test/test_rollbar.py
+++ pyrollbar-0.16.3/rollbar/test/test_rollbar.py
@@ -17,6 +17,7 @@ except ImportError:
import mock
@@ -116,10 +116,10 @@ Index: pyrollbar-0.16.2/rollbar/test/test_rollbar.py
def test_filter_ip_no_user_ip(self):
request_data = {'something': 'but no ip'}
Index: pyrollbar-0.16.2/rollbar/test/test_scruburl_transform.py
Index: pyrollbar-0.16.3/rollbar/test/test_scruburl_transform.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/test_scruburl_transform.py
+++ pyrollbar-0.16.2/rollbar/test/test_scruburl_transform.py
--- pyrollbar-0.16.3.orig/rollbar/test/test_scruburl_transform.py
+++ pyrollbar-0.16.3/rollbar/test/test_scruburl_transform.py
@@ -1,4 +1,5 @@
import copy
+import six
@@ -134,10 +134,10 @@ Index: pyrollbar-0.16.2/rollbar/test/test_scruburl_transform.py
- self.assertNotRegex(result['link'][0]['url'], r'^-+$')
+ six.assertNotRegex(self, result['url'][0]['link'], r'^-+$')
+ six.assertNotRegex(self, result['link'][0]['url'], r'^-+$')
Index: pyrollbar-0.16.2/rollbar/test/test_serializable_transform.py
Index: pyrollbar-0.16.3/rollbar/test/test_serializable_transform.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/test_serializable_transform.py
+++ pyrollbar-0.16.2/rollbar/test/test_serializable_transform.py
--- pyrollbar-0.16.3.orig/rollbar/test/test_serializable_transform.py
+++ pyrollbar-0.16.3/rollbar/test/test_serializable_transform.py
@@ -10,6 +10,8 @@ except ImportError:
# Python 2.7
from collections import Mapping
@@ -180,10 +180,10 @@ Index: pyrollbar-0.16.2/rollbar/test/test_serializable_transform.py
result = transforms.transform(start, serializable)
- self.assertRegex(result['custom'], "<UnStringableException.*Exception.*str.*>")
+ six.assertRegex(self, result['custom'], "<UnStringableException.*Exception.*str.*>")
Index: pyrollbar-0.16.2/setup.py
Index: pyrollbar-0.16.3/setup.py
===================================================================
--- pyrollbar-0.16.2.orig/setup.py
+++ pyrollbar-0.16.2/setup.py
--- pyrollbar-0.16.3.orig/setup.py
+++ pyrollbar-0.16.3/setup.py
@@ -19,7 +19,6 @@ with open(INIT_PATH) as fd:
tests_require = [
'webob',
@@ -192,19 +192,19 @@ Index: pyrollbar-0.16.2/setup.py
'mock<=3.0.5; python_version < "3.3"',
'enum34; python_version < "3.4"',
'httpx; python_version >= "3.6"',
@@ -90,7 +89,7 @@ setup(
'requests<1.2,>=0.12.1; python_version == "3.2"',
'requests<1.2,>=0.12.1; python_version == "3.1"',
'requests<1.2,>=0.12.1; python_version == "3.0"',
@@ -85,7 +84,7 @@ setup(
'requests>=0.12.1; python_version >= "3.6"',
'requests<2.26,>=0.12.1; python_version == "3.5"',
'requests<2.22,>=0.12.1; python_version == "3.4"',
- 'six>=1.9.0'
+ 'six>=1.14.0'
],
tests_require=tests_require,
)
Index: pyrollbar-0.16.2/shell.nix
Index: pyrollbar-0.16.3/shell.nix
===================================================================
--- pyrollbar-0.16.2.orig/shell.nix
+++ pyrollbar-0.16.2/shell.nix
--- pyrollbar-0.16.3.orig/shell.nix
+++ pyrollbar-0.16.3/shell.nix
@@ -20,7 +20,7 @@ python = let
};
in python36.override { inherit packageOverrides; };
@@ -214,10 +214,10 @@ Index: pyrollbar-0.16.2/shell.nix
in
Index: pyrollbar-0.16.2/rollbar/test/starlette_tests/__init__.py
Index: pyrollbar-0.16.3/rollbar/test/starlette_tests/__init__.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/starlette_tests/__init__.py
+++ pyrollbar-0.16.2/rollbar/test/starlette_tests/__init__.py
--- pyrollbar-0.16.3.orig/rollbar/test/starlette_tests/__init__.py
+++ pyrollbar-0.16.3/rollbar/test/starlette_tests/__init__.py
@@ -1,9 +1,9 @@
import sys
-import unittest2
@@ -230,10 +230,10 @@ Index: pyrollbar-0.16.2/rollbar/test/starlette_tests/__init__.py
if sys.version_info < (3, 6):
Index: pyrollbar-0.16.2/rollbar/test/starlette_tests/test_middleware.py
Index: pyrollbar-0.16.3/rollbar/test/starlette_tests/test_middleware.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/starlette_tests/test_middleware.py
+++ pyrollbar-0.16.2/rollbar/test/starlette_tests/test_middleware.py
--- pyrollbar-0.16.3.orig/rollbar/test/starlette_tests/test_middleware.py
+++ pyrollbar-0.16.3/rollbar/test/starlette_tests/test_middleware.py
@@ -14,7 +14,7 @@ try:
except ImportError:
STARLETTE_INSTALLED = False
@@ -270,10 +270,10 @@ Index: pyrollbar-0.16.2/rollbar/test/starlette_tests/test_middleware.py
sys.version_info >= (3, 6), 'Global request access is supported in Python 3.6+'
)
def test_should_return_current_request(self):
Index: pyrollbar-0.16.2/rollbar/test/starlette_tests/test_requests.py
Index: pyrollbar-0.16.3/rollbar/test/starlette_tests/test_requests.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/starlette_tests/test_requests.py
+++ pyrollbar-0.16.2/rollbar/test/starlette_tests/test_requests.py
--- pyrollbar-0.16.3.orig/rollbar/test/starlette_tests/test_requests.py
+++ pyrollbar-0.16.3/rollbar/test/starlette_tests/test_requests.py
@@ -7,14 +7,14 @@ try:
except ImportError:
STARLETTE_INSTALLED = False
@@ -291,10 +291,10 @@ Index: pyrollbar-0.16.2/rollbar/test/starlette_tests/test_requests.py
STARLETTE_INSTALLED and ALLOWED_PYTHON_VERSION,
'Global request access requires Python3.6+',
)
Index: pyrollbar-0.16.2/rollbar/test/starlette_tests/test_logger.py
Index: pyrollbar-0.16.3/rollbar/test/starlette_tests/test_logger.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/starlette_tests/test_logger.py
+++ pyrollbar-0.16.2/rollbar/test/starlette_tests/test_logger.py
--- pyrollbar-0.16.3.orig/rollbar/test/starlette_tests/test_logger.py
+++ pyrollbar-0.16.3/rollbar/test/starlette_tests/test_logger.py
@@ -13,7 +13,7 @@ try:
except ImportError:
STARLETTE_INSTALLED = False
@@ -313,10 +313,10 @@ Index: pyrollbar-0.16.2/rollbar/test/starlette_tests/test_logger.py
STARLETTE_INSTALLED and ALLOWED_PYTHON_VERSION,
'Starlette LoggerMiddleware requires Python3.6+',
)
Index: pyrollbar-0.16.2/rollbar/test/fastapi_tests/__init__.py
Index: pyrollbar-0.16.3/rollbar/test/fastapi_tests/__init__.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/fastapi_tests/__init__.py
+++ pyrollbar-0.16.2/rollbar/test/fastapi_tests/__init__.py
--- pyrollbar-0.16.3.orig/rollbar/test/fastapi_tests/__init__.py
+++ pyrollbar-0.16.3/rollbar/test/fastapi_tests/__init__.py
@@ -1,9 +1,9 @@
import sys
-import unittest2
@@ -329,10 +329,10 @@ Index: pyrollbar-0.16.2/rollbar/test/fastapi_tests/__init__.py
if sys.version_info < (3, 6):
Index: pyrollbar-0.16.2/rollbar/test/fastapi_tests/test_logger.py
Index: pyrollbar-0.16.3/rollbar/test/fastapi_tests/test_logger.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/fastapi_tests/test_logger.py
+++ pyrollbar-0.16.2/rollbar/test/fastapi_tests/test_logger.py
--- pyrollbar-0.16.3.orig/rollbar/test/fastapi_tests/test_logger.py
+++ pyrollbar-0.16.3/rollbar/test/fastapi_tests/test_logger.py
@@ -13,7 +13,7 @@ try:
except ImportError:
FASTAPI_INSTALLED = False
@@ -351,10 +351,10 @@ Index: pyrollbar-0.16.2/rollbar/test/fastapi_tests/test_logger.py
FASTAPI_INSTALLED and ALLOWED_PYTHON_VERSION,
'FastAPI LoggerMiddleware requires Python3.6+',
)
Index: pyrollbar-0.16.2/rollbar/test/fastapi_tests/test_middleware.py
Index: pyrollbar-0.16.3/rollbar/test/fastapi_tests/test_middleware.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/fastapi_tests/test_middleware.py
+++ pyrollbar-0.16.2/rollbar/test/fastapi_tests/test_middleware.py
--- pyrollbar-0.16.3.orig/rollbar/test/fastapi_tests/test_middleware.py
+++ pyrollbar-0.16.3/rollbar/test/fastapi_tests/test_middleware.py
@@ -14,7 +14,7 @@ try:
except ImportError:
FASTAPI_INSTALLED = False
@@ -391,10 +391,10 @@ Index: pyrollbar-0.16.2/rollbar/test/fastapi_tests/test_middleware.py
sys.version_info >= (3, 6), 'Global request access is supported in Python 3.6+'
)
def test_should_return_current_request(self):
Index: pyrollbar-0.16.2/rollbar/test/fastapi_tests/test_routing.py
Index: pyrollbar-0.16.3/rollbar/test/fastapi_tests/test_routing.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/fastapi_tests/test_routing.py
+++ pyrollbar-0.16.2/rollbar/test/fastapi_tests/test_routing.py
--- pyrollbar-0.16.3.orig/rollbar/test/fastapi_tests/test_routing.py
+++ pyrollbar-0.16.3/rollbar/test/fastapi_tests/test_routing.py
@@ -17,7 +17,7 @@ except ImportError:
FASTAPI_INSTALLED = False
ALLOWED_FASTAPI_VERSION = False
@@ -444,10 +444,10 @@ Index: pyrollbar-0.16.2/rollbar/test/fastapi_tests/test_routing.py
sys.version_info >= (3, 6), 'Global request access is supported in Python 3.6+'
)
def test_should_return_current_request(self):
Index: pyrollbar-0.16.2/rollbar/test/fastapi_tests/test_utils.py
Index: pyrollbar-0.16.3/rollbar/test/fastapi_tests/test_utils.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/fastapi_tests/test_utils.py
+++ pyrollbar-0.16.2/rollbar/test/fastapi_tests/test_utils.py
--- pyrollbar-0.16.3.orig/rollbar/test/fastapi_tests/test_utils.py
+++ pyrollbar-0.16.3/rollbar/test/fastapi_tests/test_utils.py
@@ -7,14 +7,14 @@ try:
except ImportError:
FASTAPI_INSTALLED = False
@@ -474,10 +474,10 @@ Index: pyrollbar-0.16.2/rollbar/test/fastapi_tests/test_utils.py
FASTAPI_INSTALLED and ALLOWED_PYTHON_VERSION, 'FastAPI requires Python3.6+'
)
class UtilsBareRoutingTest(BaseTest):
Index: pyrollbar-0.16.2/rollbar/test/asgi_tests/__init__.py
Index: pyrollbar-0.16.3/rollbar/test/asgi_tests/__init__.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/asgi_tests/__init__.py
+++ pyrollbar-0.16.2/rollbar/test/asgi_tests/__init__.py
--- pyrollbar-0.16.3.orig/rollbar/test/asgi_tests/__init__.py
+++ pyrollbar-0.16.3/rollbar/test/asgi_tests/__init__.py
@@ -1,9 +1,9 @@
import sys
-import unittest2
@@ -490,10 +490,10 @@ Index: pyrollbar-0.16.2/rollbar/test/asgi_tests/__init__.py
if sys.version_info < (3, 5):
Index: pyrollbar-0.16.2/rollbar/test/asgi_tests/test_middleware.py
Index: pyrollbar-0.16.3/rollbar/test/asgi_tests/test_middleware.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/asgi_tests/test_middleware.py
+++ pyrollbar-0.16.2/rollbar/test/asgi_tests/test_middleware.py
--- pyrollbar-0.16.3.orig/rollbar/test/asgi_tests/test_middleware.py
+++ pyrollbar-0.16.3/rollbar/test/asgi_tests/test_middleware.py
@@ -7,7 +7,7 @@ try:
except ImportError:
import mock
@@ -539,10 +539,10 @@ Index: pyrollbar-0.16.2/rollbar/test/asgi_tests/test_middleware.py
@mock.patch('logging.Logger.warning')
@mock.patch('rollbar.lib._async.report_exc_info', new_callable=AsyncMock)
@mock.patch('rollbar.report_exc_info')
Index: pyrollbar-0.16.2/rollbar/test/asgi_tests/test_spec.py
Index: pyrollbar-0.16.3/rollbar/test/asgi_tests/test_spec.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/asgi_tests/test_spec.py
+++ pyrollbar-0.16.2/rollbar/test/asgi_tests/test_spec.py
--- pyrollbar-0.16.3.orig/rollbar/test/asgi_tests/test_spec.py
+++ pyrollbar-0.16.3/rollbar/test/asgi_tests/test_spec.py
@@ -1,14 +1,14 @@
import inspect
import sys
@@ -560,10 +560,10 @@ Index: pyrollbar-0.16.2/rollbar/test/asgi_tests/test_spec.py
class ASGISpecTest(BaseTest):
def test_asgi_v3_middleware_is_single_callable_coroutine(self):
from rollbar.contrib.asgi import ReporterMiddleware
Index: pyrollbar-0.16.2/rollbar/test/async_tests/__init__.py
Index: pyrollbar-0.16.3/rollbar/test/async_tests/__init__.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/async_tests/__init__.py
+++ pyrollbar-0.16.2/rollbar/test/async_tests/__init__.py
--- pyrollbar-0.16.3.orig/rollbar/test/async_tests/__init__.py
+++ pyrollbar-0.16.3/rollbar/test/async_tests/__init__.py
@@ -1,9 +1,9 @@
import sys
-import unittest2
@@ -576,10 +576,10 @@ Index: pyrollbar-0.16.2/rollbar/test/async_tests/__init__.py
if sys.version_info < (3, 6):
Index: pyrollbar-0.16.2/rollbar/test/async_tests/test_async.py
Index: pyrollbar-0.16.3/rollbar/test/async_tests/test_async.py
===================================================================
--- pyrollbar-0.16.2.orig/rollbar/test/async_tests/test_async.py
+++ pyrollbar-0.16.2/rollbar/test/async_tests/test_async.py
--- pyrollbar-0.16.3.orig/rollbar/test/async_tests/test_async.py
+++ pyrollbar-0.16.3/rollbar/test/async_tests/test_async.py
@@ -6,7 +6,7 @@ try:
except ImportError:
import mock