diff --git a/ops_fixture-order.patch b/ops_fixture-order.patch index 956d62a..9df3018 100644 --- a/ops_fixture-order.patch +++ b/ops_fixture-order.patch @@ -2,12 +2,11 @@ Author: Sean Marlow Date: 2019-12-11 Source: https://github.com/oracle/oci-python-sdk/issues/196 -Index: oci-python-sdk-2.6.2/tests/unit/test_basic_api_calls.py -=================================================================== ---- oci-python-sdk-2.6.2.orig/tests/unit/test_basic_api_calls.py -+++ oci-python-sdk-2.6.2/tests/unit/test_basic_api_calls.py -@@ -5,7 +5,7 @@ import oci - import pytest +diff -Nru oci-python-sdk-2.10.3.orig/tests/unit/test_basic_api_calls.py oci-python-sdk-2.10.3/tests/unit/test_basic_api_calls.py +--- oci-python-sdk-2.10.3.orig/tests/unit/test_basic_api_calls.py 2020-02-04 22:53:15.000000000 +0100 ++++ oci-python-sdk-2.10.3/tests/unit/test_basic_api_calls.py 2020-02-07 12:48:24.663500407 +0100 +@@ -4,7 +4,7 @@ + import oci -def test_identity_list_users(identity, config): @@ -15,7 +14,7 @@ Index: oci-python-sdk-2.6.2/tests/unit/test_basic_api_calls.py response = identity.list_users(config["tenancy"]) assert response is not None -@@ -31,7 +31,7 @@ def test_vcn_list_instances(compute, con +@@ -30,7 +30,7 @@ assert response.request_id is not None @@ -24,11 +23,54 @@ Index: oci-python-sdk-2.6.2/tests/unit/test_basic_api_calls.py response = identity.list_users(config["tenancy"], limit=1) assert response is not None -Index: oci-python-sdk-2.6.2/tests/unit/test_waiters.py -=================================================================== ---- oci-python-sdk-2.6.2.orig/tests/unit/test_waiters.py -+++ oci-python-sdk-2.6.2/tests/unit/test_waiters.py -@@ -108,7 +108,7 @@ def test_wait_multiple_states(virtual_ne +diff -Nru oci-python-sdk-2.10.3.orig/tests/unit/test_basic_api_calls.py.orig oci-python-sdk-2.10.3/tests/unit/test_basic_api_calls.py.orig +--- oci-python-sdk-2.10.3.orig/tests/unit/test_basic_api_calls.py.orig 1970-01-01 01:00:00.000000000 +0100 ++++ oci-python-sdk-2.10.3/tests/unit/test_basic_api_calls.py.orig 2020-02-04 22:53:15.000000000 +0100 +@@ -0,0 +1,40 @@ ++# coding: utf-8 ++# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. ++ ++import oci ++ ++ ++def test_identity_list_users(identity, config): ++ response = identity.list_users(config["tenancy"]) ++ ++ assert response is not None ++ assert len(response.data) > 0 ++ assert type(response.data[0]) is oci.identity.models.User ++ assert response.status == 200 ++ assert response.request_id is not None ++ ++ ++def test_vcn_list_vcns(virtual_network, config): ++ response = virtual_network.list_vcns(config["tenancy"]) ++ ++ assert response is not None ++ assert response.status == 200 ++ assert response.request_id is not None ++ ++ ++def test_vcn_list_instances(compute, config): ++ response = compute.list_instances(config["tenancy"]) ++ ++ assert response is not None ++ assert response.status == 200 ++ assert response.request_id is not None ++ ++ ++def test_limit(identity, config): ++ response = identity.list_users(config["tenancy"], limit=1) ++ ++ assert response is not None ++ assert len(response.data) == 1 ++ assert type(response.data[0]) is oci.identity.models.User ++ assert response.status == 200 ++ assert response.request_id is not None +diff -Nru oci-python-sdk-2.10.3.orig/tests/unit/test_waiters.py oci-python-sdk-2.10.3/tests/unit/test_waiters.py +--- oci-python-sdk-2.10.3.orig/tests/unit/test_waiters.py 2020-02-04 22:53:15.000000000 +0100 ++++ oci-python-sdk-2.10.3/tests/unit/test_waiters.py 2020-02-07 12:48:24.663500407 +0100 +@@ -108,7 +108,7 @@ assert total_time < 60 * 5 @@ -37,7 +79,7 @@ Index: oci-python-sdk-2.6.2/tests/unit/test_waiters.py # Create User request = oci.identity.models.CreateUserDetails() request.compartment_id = config["tenancy"] -@@ -131,7 +131,7 @@ def test_invalid_operation(identity, con +@@ -131,7 +131,7 @@ oci.wait_until(identity, response, 'not a real property', 'test') @@ -46,7 +88,7 @@ Index: oci-python-sdk-2.6.2/tests/unit/test_waiters.py description = 'test user' request = oci.identity.models.CreateUserDetails() request.compartment_id = config["tenancy"] -@@ -151,7 +151,7 @@ def test_already_in_state(identity, conf +@@ -151,7 +151,7 @@ identity.delete_user(user_id) @@ -55,7 +97,7 @@ Index: oci-python-sdk-2.6.2/tests/unit/test_waiters.py description = 'test user' request = oci.identity.models.CreateUserDetails() request.compartment_id = config["tenancy"] -@@ -182,7 +182,7 @@ def test_property_and_eval_function_prov +@@ -182,7 +182,7 @@ assert str(ve.value) == 'If an evaluate_response function is provided, then the property argument cannot also be provided' @@ -64,7 +106,7 @@ Index: oci-python-sdk-2.6.2/tests/unit/test_waiters.py user_id = None try: description = 'test user' -@@ -206,7 +206,7 @@ def test_eval_function_lambda(identity, +@@ -206,7 +206,7 @@ identity.delete_user(user_id) diff --git a/ops_relax-python-depends.patch b/ops_relax-python-depends.patch index 307a56b..b2f7895 100644 --- a/ops_relax-python-depends.patch +++ b/ops_relax-python-depends.patch @@ -1,11 +1,13 @@ -diff -Nru oci-python-sdk-2.6.2.orig/requirements.txt oci-python-sdk-2.6.2/requirements.txt ---- oci-python-sdk-2.6.2.orig/requirements.txt 2019-10-29 20:00:22.000000000 +0100 -+++ oci-python-sdk-2.6.2/requirements.txt 2019-11-04 15:12:48.102997387 +0100 -@@ -1,17 +1,17 @@ +diff -Nru oci-python-sdk-2.10.3.orig/requirements.txt oci-python-sdk-2.10.3/requirements.txt +--- oci-python-sdk-2.10.3.orig/requirements.txt 2020-02-04 22:53:15.000000000 +0100 ++++ oci-python-sdk-2.10.3/requirements.txt 2020-02-07 12:44:42.848928437 +0100 +@@ -1,18 +1,18 @@ +-autodocsumm==0.1.11 ++autodocsumm>=0.1.11 certifi -configparser==3.5.0 -coverage==4.5.2 --cryptography==2.5 +-cryptography==2.8 -flake8==3.6.0 -mock==2.0.0 -pyOpenSSL==18.0.0 @@ -15,7 +17,7 @@ diff -Nru oci-python-sdk-2.6.2.orig/requirements.txt oci-python-sdk-2.6.2/requir -python-dateutil>=2.5.3,<=2.7.3 +configparser>=3.5.0 +coverage>=4.5.2 -+cryptography>=2.5 ++cryptography>=2.8 +flake8>=3.6.0 +mock>=2.0.0 +pyOpenSSL>=18.0.0 @@ -34,17 +36,18 @@ diff -Nru oci-python-sdk-2.6.2.orig/requirements.txt oci-python-sdk-2.6.2/requir +tox>=3.6.1 +vcrpy>=2.0.1 +wheel>=0.32.3 -diff -Nru oci-python-sdk-2.6.2.orig/setup.py oci-python-sdk-2.6.2/setup.py ---- oci-python-sdk-2.6.2.orig/setup.py 2019-10-29 20:00:22.000000000 +0100 -+++ oci-python-sdk-2.6.2/setup.py 2019-11-04 15:12:23.198022546 +0100 -@@ -30,10 +30,9 @@ with open_relative("README.rst") as f: - +diff -Nru oci-python-sdk-2.10.3.orig/setup.py oci-python-sdk-2.10.3/setup.py +--- oci-python-sdk-2.10.3.orig/setup.py 2020-02-04 22:53:15.000000000 +0100 ++++ oci-python-sdk-2.10.3/setup.py 2020-02-07 12:45:33.917520586 +0100 +@@ -31,9 +31,9 @@ requires = [ "certifi", -- "configparser>=3.5.0b1", - "cryptography>=2.1.4", + "configparser>=3.5.0b1", +- "cryptography==2.8", ++ "cryptography>=2.8", "pyOpenSSL>=17.5.0", - "python-dateutil>=2.5.3,<3.0.0", + "python-dateutil>=2.5.3", "pytz>=2016.10", ] + diff --git a/python-oci-sdk.changes b/python-oci-sdk.changes index 89f1013..007afb7 100644 --- a/python-oci-sdk.changes +++ b/python-oci-sdk.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Fri Feb 7 12:02:15 UTC 2020 - John Paul Adrian Glaubitz + +- Update to version 2.10.3 + + Support for the Data Science service + + Support for calling Oracle Cloud Infrastructure services + in the ap-osaka-1 and ap-melbourne-1 regions +- from version 2.10.2 + + Support for the Application Migration service + + Support for the Data Flow service + + Support for the Data Catalog service + + Support for cross-shape Data Guard in the Database service + + Support for offline data export in the Data Transfer service +- from version 2.10.1 + + Support for getting DRG redundancy status in the Networking service + + Support for cloning autonomous databases from backups in the Database service +- from version 2.10.0 + + Support for a description field on route rules and security + rules in the Networking service + + Support for starting and stopping Digital Assistant instances + in the Digital Assistant service + + Support for shared database homes on Exadata, bare metal, and virtual + machine instances in the Database service + + Support for tracking a number of Database service operations + through the Work Requests service + + Field db_home_id in list_databases from database service is + changed from required to optional +- Refresh patches for new version + + ops_fixture-order.patch + + ops_relax-python-depends.patch +- Update file list to fix Python imports for unvendoring + ------------------------------------------------------------------- Wed Jan 29 21:31:17 UTC 2020 - Sean Marlow diff --git a/python-oci-sdk.spec b/python-oci-sdk.spec index 5ea20c3..34d0462 100644 --- a/python-oci-sdk.spec +++ b/python-oci-sdk.spec @@ -1,7 +1,7 @@ # # spec file for package python-oci-sdk # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,56 +12,56 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-oci-sdk -Version: 2.9.0 +Version: 2.10.3 Release: 0 -License: UPL-1.0 or Apache-2.0 Summary: Oracle Cloud Infrastructure Python SDK -Url: https://github.com/oracle/oci-python-sdk +License: UPL-1.0 OR Apache-2.0 Group: Development/Languages/Python +URL: https://github.com/oracle/oci-python-sdk Source: https://github.com/oracle/oci-python-sdk/archive/v%{version}.tar.gz Patch0: ops_relax-python-depends.patch Patch1: ops_fixture-order.patch -BuildRequires: python-rpm-macros BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} +BuildRequires: fdupes +BuildRequires: python-rpm-macros +Requires: python-PyJWT +Requires: python-certifi +Requires: python-cryptography >= 2.1.4 +Requires: python-httpsig_cffi +Requires: python-pyOpenSSL >= 17.5.0 +Requires: python-python-dateutil < 3.0.0 +Requires: python-python-dateutil >= 2.5.3 +Requires: python-pytz >= 2016.10 +Requires: python-requests +Requires: python-six +BuildArch: noarch # SECTION test requirements +BuildRequires: %{python_module PyJWT} BuildRequires: %{python_module certifi} +BuildRequires: %{python_module cryptography >= 2.1.4} +BuildRequires: %{python_module httpsig_cffi} +BuildRequires: %{python_module pyOpenSSL >= 17.5.0} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module python-dateutil < 3.0.0} +BuildRequires: %{python_module python-dateutil >= 2.5.3} +BuildRequires: %{python_module pytz >= 2016.10} +BuildRequires: %{python_module requests} +BuildRequires: %{python_module six} +BuildRequires: %{python_module vcrpy} %ifpython2 BuildRequires: python-configparser >= 3.5.0 %endif -BuildRequires: %{python_module cryptography >= 2.1.4} -BuildRequires: %{python_module PyJWT} -BuildRequires: %{python_module pyOpenSSL >= 17.5.0} -BuildRequires: %{python_module python-dateutil >= 2.5.3} -BuildRequires: %{python_module python-dateutil < 3.0.0} -BuildRequires: %{python_module pytz >= 2016.10} -BuildRequires: %{python_module pytest} -BuildRequires: %{python_module requests} -BuildRequires: %{python_module httpsig_cffi} -BuildRequires: %{python_module six} -BuildRequires: %{python_module vcrpy} # /SECTION -BuildRequires: fdupes -Requires: python-certifi %ifpython2 Requires: python-configparser >= 3.5.0 %endif -Requires: python-cryptography >= 2.1.4 -Requires: python-PyJWT -Requires: python-pyOpenSSL >= 17.5.0 -Requires: python-python-dateutil >= 2.5.3 -Requires: python-python-dateutil < 3.0.0 -Requires: python-pytz >= 2016.10 -Requires: python-requests -Requires: python-httpsig_cffi -Requires: python-six -BuildArch: noarch - %python_subpackages %description @@ -75,7 +75,7 @@ Python SDK for Oracle Cloud Infrastructure. Python 2.7+ and 3.5+ are supported. rm -rf src/oci/_vendor/ # Fix includes sed -i 's/from \._vendor //' src/oci/*.py -sed -i 's/from oci._vendor //' src/oci/*.py src/oci/analytics/*.py src/oci/apigateway/*.py src/oci/announcements_service/*.py src/oci/audit/*.py src/oci/auth/*.py src/oci/auth/signers/*.py src/oci/autoscaling/*.py src/oci/budget/*.py src/oci/container_engine/*.py src/oci/dns/*.py src/oci/core/*.py src/oci/database/*.py src/oci/dts/*.py src/oci/email/*.py src/oci/events/*.py src/oci/file_storage/*.py src/oci/functions/*.py src/oci/healthchecks/*.py src/oci/integration/*.py src/oci/key_management/*.py src/oci/marketplace/*.py src/oci/limits/*.py src/oci/load_balancer/*.py src/oci/monitoring/*.py src/oci/oda/*.py src/oci/object_storage/*.py src/oci/oce/*.py src/oci/ons/*.py src/oci/object_storage/transfer/*.py src/oci/object_storage/transfer/internal/*.py src/oci/os_management/*.py src/oci/resource_manager/*.py src/oci/streaming/*.py src/oci/identity/*.py src/oci/resource_search/*.py src/oci/waas/*.py src/oci/work_requests/*.py tests/*.py +sed -i 's/from oci._vendor //' src/oci/*.py src/oci/analytics/*.py src/oci/apigateway/*.py src/oci/application_migration/*.py src/oci/announcements_service/*.py src/oci/audit/*.py src/oci/auth/*.py src/oci/auth/signers/*.py src/oci/autoscaling/*.py src/oci/budget/*.py src/oci/container_engine/*.py src/oci/dns/*.py src/oci/core/*.py src/oci/database/*.py src/oci/data_catalog/*.py src/oci/data_flow/*.py src/oci/data_science/*.py src/oci/dts/*.py src/oci/email/*.py src/oci/events/*.py src/oci/file_storage/*.py src/oci/functions/*.py src/oci/healthchecks/*.py src/oci/integration/*.py src/oci/key_management/*.py src/oci/marketplace/*.py src/oci/limits/*.py src/oci/load_balancer/*.py src/oci/monitoring/*.py src/oci/oda/*.py src/oci/object_storage/*.py src/oci/oce/*.py src/oci/ons/*.py src/oci/object_storage/transfer/*.py src/oci/object_storage/transfer/internal/*.py src/oci/os_management/*.py src/oci/resource_manager/*.py src/oci/streaming/*.py src/oci/identity/*.py src/oci/resource_search/*.py src/oci/waas/*.py src/oci/work_requests/*.py tests/*.py sed -i 's/ oci._vendor.jwt as//' src/oci/auth/*.py sed -i 's/oci\._vendor\.//' src/oci/*.py src/oci/retry/*.py src/oci/object_storage/transfer/internal/*.py tests/*.py sed -i 's/from . import vcr_mods//' tests/test_config_container.py diff --git a/v2.10.3.tar.gz b/v2.10.3.tar.gz new file mode 100644 index 0000000..7e7a831 --- /dev/null +++ b/v2.10.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a0130f83f05647ab7b89d3761cb2c1f7aded68dca7362c59fe097a9d2a0a6c4 +size 3606412 diff --git a/v2.9.0.tar.gz b/v2.9.0.tar.gz deleted file mode 100644 index d3cd78c..0000000 --- a/v2.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3750791fae80717c47df92202720b025b4ea7256b9f23eb298abe2d54b6286a -size 3409853