diff --git a/dropbox-10.4.1.tar.gz b/dropbox-10.4.1.tar.gz deleted file mode 100644 index c630f6b..0000000 --- a/dropbox-10.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20d039d030f7c1f54f22d182832c1909ee5b5626ad52469a19d274bf07041e06 -size 663762 diff --git a/dropbox-12.0.2.tar.gz b/dropbox-12.0.2.tar.gz new file mode 100644 index 0000000..c19764a --- /dev/null +++ b/dropbox-12.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eec8095311fcc8b4f48f6cd3a2ee539dbf18ffc906091c80c36ac042978c5093 +size 1155008 diff --git a/python-dropbox.changes b/python-dropbox.changes index 035136b..ac7e959 100644 --- a/python-dropbox.changes +++ b/python-dropbox.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Mon May 5 11:26:23 UTC 2025 - Felix Stegmeier + +- Update to 12.0.2 + * Remove the pin for urllib3 (#507) + * Fix incorrect pin of requests (#505) + +- Update to 12.0.0 + * Fixes to Restore CI (#492, #501) + * Fixes to doc generation (#500, #503) + * Manual Spec Update (#498) + * Stop providing a hardcoded CA bundle (#489, #499) + +- Update to 11.36.2 + * Fix invalid specifier in stone requirement (#456) + * Added _ca_certs property to _SSLAdapter to properly support pickling (broke in SDK v11.33) (#440) + * Add ca_certs argument for oauth and dropbox client (#385) + * [Setup] Update deprecated description-file to use description_file (#410) + * Add scopes to documentation (#408) + * Ensure Dropbox error is thrown in refresh access token (#407) + * Fix CI test environment (#391) + * Add integration tests to the test suite (#377) + * Refresh access token when using a very old short-lived access token with unknown expiration (#352) + * Bump actions/setup-python from v2.2.1 to v2.2.2 (#342) + * Bump codecov/codecov-action from v1.2.1 to v1.3.2 (#339) + * Update Release Notes Generator to Fetch Latest Tags (#341) + * Fix status classifier in setup.py (#334) + * Fix setup.py dependencies by removing pull from requirements.txt (#333) + * Move requirements.txt and test/requirements.txt as source of truth (#329) + * Update dropbox reference to link to the new name to fix documentation (#328) + * Fix and update build step for Python2.7 (#326) + * Fix DropboxOAuth2Flow Documentation Parameters (#325) + * Bump peter-evans/create-pull-request from v3.7.0 to v3.8.2 (#322) + * Bump peter-evans/create-pull-request from v3.5.1 to v3.7.0 (#318) + * Bump codecov/codecov-action from v1.0.15 to v1.2.1 (#315) + * Bump actions/setup-python from v2.1.4 to v2.2.1 (#306) + * Convert integration tests to use pytest instead of unittest (#313) + * Add support for app authentication (#305) + * Reorganize test directory (#312) + * Fix CI matrix Python version (#311 + * Add stone to setup.py (#300) + * Fix links in release notes to be absolute (#287) + * Bump peter-evans/create-pull-request from v3.4.1 to v3.5.1 (#297) + * change update_version.sh to reflect the renaming of dropbox/dropbox.py to dropbox/dropbox_client.py (#294) + * Regenerate client using Stone 3.2.0 (#291) + * Bump codecov/codecov-action from v1.0.14 to v1.0.15 (#290) + * remove auto generated stone_fixtures.py (#292) + +- Add remove_six.patch to remove six from requirements + ------------------------------------------------------------------- Tue Apr 23 22:28:00 UTC 2024 - Georg Pfuetzenreuter diff --git a/python-dropbox.spec b/python-dropbox.spec index a4f976b..13a6fac 100644 --- a/python-dropbox.spec +++ b/python-dropbox.spec @@ -1,7 +1,7 @@ # # spec file for package python-dropbox # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,23 +18,22 @@ %{?sle15_python_module_pythons} Name: python-dropbox -Version: 10.4.1 +Version: 12.0.2 Release: 0 Summary: Official Dropbox API Client License: MIT Group: Development/Languages/Python URL: https://github.com/dropbox/dropbox-sdk-python -Source: https://files.pythonhosted.org/packages/source/d/dropbox/dropbox-%{version}.tar.gz +Source: https://github.com/dropbox/dropbox-sdk-python/archive/refs/tags/v%{version}.tar.gz#/dropbox-%{version}.tar.gz +# PATCH-FIX-UPSTREAM remove_six.patch https://github.com/dropbox/dropbox-sdk-python/pull/493 +Patch1: remove_six.patch +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} -BuildRequires: python-rpm-macros -# SECTION test requirements -BuildRequires: %{python_module pytest} -BuildRequires: %{python_module requests >= 2.16.2} -BuildRequires: %{python_module six >= 1.3.0} -# /SECTION +BuildRequires: %{python_module wheel} BuildRequires: fdupes +BuildRequires: python-rpm-macros Requires: python-requests >= 2.16.2 -Requires: python-six >= 1.3.0 +Requires: python-stone BuildArch: noarch %python_subpackages @@ -43,15 +42,13 @@ BuildArch: noarch Official Dropbox API Client %prep -%setup -q -n dropbox-%{version} -# https://github.com/dropbox/dropbox-sdk-python/issues/401 -sed -i 's:pytest-runner::' setup.py +%autosetup -p1 -n dropbox-sdk-python-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} # Tests require an access token @@ -59,6 +56,9 @@ sed -i 's:pytest-runner::' setup.py %files %{python_files} %doc README.rst %license LICENSE -%{python_sitelib}/* +%{python_sitelib}/dropbox +%{python_sitelib}/dropbox-%{version}.dist-info + +%check %changelog diff --git a/remove_six.patch b/remove_six.patch new file mode 100644 index 0000000..69ffa0c --- /dev/null +++ b/remove_six.patch @@ -0,0 +1,152 @@ +From f27f5e46a92c0ee246a0563cc4b034beec7360d5 Mon Sep 17 00:00:00 2001 +From: Max Belanger +Date: Wed, 8 May 2024 16:27:20 -0700 +Subject: [PATCH] remove `six`, drop support for python 2 + +--- + dropbox/dropbox_client.py | 5 ++--- + dropbox/oauth.py | 25 +++++++------------------ + example/updown.py | 3 +-- + requirements.txt | 1 - + setup.py | 1 - + 5 files changed, 10 insertions(+), 25 deletions(-) + +Index: dropbox-sdk-python-12.0.2/dropbox/dropbox_client.py +=================================================================== +--- dropbox-sdk-python-12.0.2.orig/dropbox/dropbox_client.py ++++ dropbox-sdk-python-12.0.2/dropbox/dropbox_client.py +@@ -16,7 +16,6 @@ import random + import time + + import requests +-import six + + from datetime import datetime, timedelta + from dropbox.auth import ( +@@ -75,7 +74,7 @@ class RouteResult(object): + :param requests.models.Response http_resp: A raw HTTP response. It will + be used to stream the binary-body payload of the response. + """ +- assert isinstance(obj_result, six.string_types), \ ++ assert isinstance(obj_result, str), \ + 'obj_result: expected string, got %r' % type(obj_result) + if http_resp is not None: + assert isinstance(http_resp, requests.models.Response), \ +@@ -530,7 +529,7 @@ class _DropboxTransport(object): + if host not in self._host_map: + raise ValueError('Unknown value for host: %r' % host) + +- if not isinstance(request_binary, (six.binary_type, type(None))): ++ if not isinstance(request_binary, (bytes, type(None))): + # Disallow streams and file-like objects even though the underlying + # requests library supports them. This is to prevent incorrect + # behavior when a non-rewindable stream is read from, but the +Index: dropbox-sdk-python-12.0.2/dropbox/oauth.py +=================================================================== +--- dropbox-sdk-python-12.0.2.orig/dropbox/oauth.py ++++ dropbox-sdk-python-12.0.2/dropbox/oauth.py +@@ -14,7 +14,6 @@ __all__ = [ + + import base64 + import os +-import six + import urllib + import re + from datetime import datetime, timedelta +@@ -26,13 +25,6 @@ from .session import ( + DEFAULT_TIMEOUT, + ) + +-if six.PY3: +- url_path_quote = urllib.parse.quote # pylint: disable=no-member,useless-suppression +- url_encode = urllib.parse.urlencode # pylint: disable=no-member,useless-suppression +-else: +- url_path_quote = urllib.quote # pylint: disable=no-member,useless-suppression +- url_encode = urllib.urlencode # pylint: disable=no-member,useless-suppression +- + TOKEN_ACCESS_TYPES = ['offline', 'online', 'legacy'] + INCLUDE_GRANTED_SCOPES_TYPES = ['user', 'team'] + PKCE_VERIFIER_LENGTH = 128 +@@ -233,10 +225,7 @@ class DropboxOAuth2FlowBase(object): + :return: The path and parameters components of an API URL. + :rtype: str + """ +- if six.PY2 and isinstance(target, six.text_type): +- target = target.encode('utf8') +- +- target_path = url_path_quote(target) ++ target_path = urllib.parse.quote(target) + + params = params or {} + params = params.copy() +@@ -606,20 +595,20 @@ def _params_to_urlencoded(params): + Returns a application/x-www-form-urlencoded :class:`str` representing the key/value pairs in + :attr:`params`. + +- Keys are values are ``str()``'d before calling :meth:`urllib.urlencode`, with the exception of +- unicode objects which are utf8-encoded. ++ Keys and values are coerced via ``str()``'d and encoded via UTF-8 before calling ++ :meth:`urllib.parse.urlencode`. + """ + def encode(o): +- if isinstance(o, six.binary_type): ++ if isinstance(o, bytes): + return o + else: +- if isinstance(o, six.text_type): ++ if isinstance(o, str): + return o.encode('utf-8') + else: + return str(o).encode('utf-8') + +- utf8_params = {encode(k): encode(v) for k, v in six.iteritems(params)} +- return url_encode(utf8_params) ++ utf8_params = {encode(k): encode(v) for k, v in params.items()} ++ return urllib.parse.urlencode(utf8_params) + + def _generate_pkce_code_verifier(): + code_verifier = base64.urlsafe_b64encode(os.urandom(PKCE_VERIFIER_LENGTH)).decode('utf-8') +Index: dropbox-sdk-python-12.0.2/example/updown.py +=================================================================== +--- dropbox-sdk-python-12.0.2.orig/example/updown.py ++++ dropbox-sdk-python-12.0.2/example/updown.py +@@ -9,7 +9,6 @@ import argparse + import contextlib + import datetime + import os +-import six + import sys + import time + import unicodedata +@@ -74,7 +73,7 @@ def main(): + # First do all the files. + for name in files: + fullname = os.path.join(dn, name) +- if not isinstance(name, six.text_type): ++ if not isinstance(name, str): + name = name.decode('utf-8') + nname = unicodedata.normalize('NFC', name) + if name.startswith('.'): +Index: dropbox-sdk-python-12.0.2/requirements.txt +=================================================================== +--- dropbox-sdk-python-12.0.2.orig/requirements.txt ++++ dropbox-sdk-python-12.0.2/requirements.txt +@@ -1,6 +1,5 @@ + # Dependencies required for installation (keep in sync with setup.py) + requests>=2.16.2 +-six >= 1.12.0 + stone>=2,<3.3.3 + # Other dependencies for development + ply +Index: dropbox-sdk-python-12.0.2/setup.py +=================================================================== +--- dropbox-sdk-python-12.0.2.orig/setup.py ++++ dropbox-sdk-python-12.0.2/setup.py +@@ -26,7 +26,6 @@ version = eval(line.split('=', 1)[1].str + + install_reqs = [ + 'requests>=2.16.2', +- 'six >= 1.12.0', + 'stone>=2,<3.3.3', + ] +