diff --git a/oc_relax-python-depends.patch b/oc_relax-python-depends.patch index 81e5bea..ce99ce9 100644 --- a/oc_relax-python-depends.patch +++ b/oc_relax-python-depends.patch @@ -1,7 +1,7 @@ -diff -Nru oci-cli-3.22.0.orig/requirements.txt oci-cli-3.22.0/requirements.txt ---- oci-cli-3.22.0.orig/requirements.txt 2022-12-13 13:06:31.000000000 +0100 -+++ oci-cli-3.22.0/requirements.txt 2023-01-03 10:16:41.463841833 +0100 -@@ -2,41 +2,41 @@ +diff -Nru oci-cli-3.22.3.orig/requirements.txt oci-cli-3.22.3/requirements.txt +--- oci-cli-3.22.3.orig/requirements.txt 2023-01-24 11:01:27.000000000 +0100 ++++ oci-cli-3.22.3/requirements.txt 2023-01-25 16:27:46.000400884 +0100 +@@ -2,42 +2,42 @@ # (https://pip.pypa.io/en/stable/reference/pip_install/#requirements-file-format), # you may need to use the --extra-index-url option instead. @@ -12,17 +12,23 @@ diff -Nru oci-cli-3.22.0.orig/requirements.txt oci-cli-3.22.0/requirements.txt cffi>=1.9.1 -click==7.1.2 -coverage==4.5.2 --cryptography>=3.2.1,<=39.0.0 +-cryptography>=3.2.1,<39.0.0 -httpsig-cffi==15.0.0 -Jinja2==3.0.3 -jmespath==0.10.0 -ndg-httpsclient==0.4.2 -mock==2.0.0 --oci==2.90.0 +-oci==2.90.3 -packaging==20.2 -pluggy==0.13.0 -py==1.10.0 -pyasn1==0.2.3 +-pyOpenSSL>=17.5.0,<=22.1.0 +-pycparser==2.20 +-pyparsing==2.2.0 +-pytest==3.2.3 +-pytest-cov==2.5.1 +-python-dateutil>=2.5.3,<3.0.0 +click>=7.1.2 +coverage>=4.5.2 +cryptography>=3.2.1 @@ -31,17 +37,12 @@ diff -Nru oci-cli-3.22.0.orig/requirements.txt oci-cli-3.22.0/requirements.txt +jmespath>=0.10.0 +ndg-httpsclient>=0.4.2 +mock>=2.0.0 -+oci>=2.90.0 ++oci>=2.90.3 +packaging>=20.2 +pluggy>=0.13.0 +py>=1.10.0 +pyasn1>=0.2.3 - pyOpenSSL>=22.1.0 --pycparser==2.20 --pyparsing==2.2.0 --pytest==3.2.3 --pytest-cov==2.5.1 --python-dateutil>=2.5.3,<3.0.0 ++pyOpenSSL>=17.5.0 +pycparser>=2.20 +pyparsing>=2.2.0 +pytest>=3.2.3 @@ -50,7 +51,6 @@ diff -Nru oci-cli-3.22.0.orig/requirements.txt oci-cli-3.22.0/requirements.txt pytz>=2016.10 -requests==2.21.0 +requests>=2.21.0 - setuptools<45 six>=1.15.0 -sphinx==3.3.0 -sphinx-rtd-theme==0.4.3 @@ -60,9 +60,6 @@ diff -Nru oci-cli-3.22.0.orig/requirements.txt oci-cli-3.22.0/requirements.txt -virtualenv==20.13.0 -pytest-xdist==1.22.2 -pytest-forked==1.0.2 --PyYAML>=5.4,<6 --docutils==0.15.2 --prompt-toolkit==3.0.29 +sphinx>=3.3.0 +sphinx-rtd-theme>=0.4.3 +terminaltables>=3.1.0 @@ -71,22 +68,28 @@ diff -Nru oci-cli-3.22.0.orig/requirements.txt oci-cli-3.22.0/requirements.txt +virtualenv>=20.13.0 +pytest-xdist>=1.22.2 +pytest-forked>=1.0.2 -+PyYAML>=5.4 + PyYAML>=5.4,<6 +-docutils==0.15.2 +-prompt-toolkit==3.0.29 +docutils>=0.15.2 +prompt-toolkit>=3.0.29 -diff -Nru oci-cli-3.22.0.orig/setup.py oci-cli-3.22.0/setup.py ---- oci-cli-3.22.0.orig/setup.py 2022-12-13 13:06:31.000000000 +0100 -+++ oci-cli-3.22.0/setup.py 2023-01-03 10:15:58.071299986 +0100 + setuptools>65.5.1; python_version > '3.6' +-setuptools==59.6.0; python_version == '3.6' +\ No newline at end of file ++setuptools>=59.6.0; python_version >= '3.6' +diff -Nru oci-cli-3.22.3.orig/setup.py oci-cli-3.22.3/setup.py +--- oci-cli-3.22.3.orig/setup.py 2023-01-24 11:01:27.000000000 +0100 ++++ oci-cli-3.22.3/setup.py 2023-01-25 16:26:58.163937566 +0100 @@ -29,23 +29,23 @@ readme = f.read() requires = [ -- 'oci==2.90.0', -+ 'oci>=2.90.0', +- 'oci==2.90.3', ++ 'oci>=2.90.3', 'arrow>=1.0.0', 'certifi', - 'click==7.1.2', -- 'cryptography>=3.2.1,<=39.0.0', +- 'cryptography>=3.2.1,<39.0.0', - 'jmespath==0.10.0', - 'python-dateutil>=2.5.3,<3.0.0', + 'click>=7.1.2', @@ -96,10 +99,11 @@ diff -Nru oci-cli-3.22.0.orig/setup.py oci-cli-3.22.0/setup.py 'pytz>=2016.10', 'six>=1.15.0', - 'terminaltables==3.1.0', -+ 'terminaltables>=3.1.0', - 'pyOpenSSL>=22.1.0', +- 'pyOpenSSL>=17.5.0,<=22.1.0', - 'PyYAML>=5.4,<6', - 'prompt-toolkit==3.0.29' ++ 'terminaltables>=3.1.0', ++ 'pyOpenSSL>=17.5.0', + 'PyYAML>=5.4', + 'prompt-toolkit>=3.0.29' ] diff --git a/oci-cli-3.22.0.tar.gz b/oci-cli-3.22.0.tar.gz deleted file mode 100644 index f9ffedb..0000000 --- a/oci-cli-3.22.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4243e741d21d20ddebfbb0780fe39f2f1a7cd318a863dc496d48c7bb07fb226 -size 2799599 diff --git a/oci-cli-3.22.3.tar.gz b/oci-cli-3.22.3.tar.gz new file mode 100644 index 0000000..dc1a538 --- /dev/null +++ b/oci-cli-3.22.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df8cc927b4c974986f23651365eb33e4bf5448bb8e3c416f9346c75ad99d0031 +size 2815222 diff --git a/oci-cli.changes b/oci-cli.changes index 8c3c1c8..f951283 100644 --- a/oci-cli.changes +++ b/oci-cli.changes @@ -1,3 +1,64 @@ +------------------------------------------------------------------- +Wed Jan 25 15:29:36 UTC 2023 - John Paul Adrian Glaubitz + +- Update to version 3.22.3 + * Support for the Cloud Migrations service + * ``oci cloud-migrations`` + * Support for new optional parameter to set Custom Private IP + during Private End Point provisioning in the Database service + * ``oci db autonomous-database create --private-endpoint-ip`` + * ``oci db autonomous-database create-adb-cross-region-data-guard-details + --private-endpoint-ip`` + * ``oci db autonomous-database create-from-backup-id --private-endpoint-ip`` + * ``oci db autonomous-database create-from-backup-timestamp --private-endpoint-ip`` + * ``oci db autonomous-database create-from-clone --private-endpoint-ip`` + * ``oci db autonomous-database create-refreshable-clone --private-endpoint-ip`` + * ``oci db autonomous-database update --private-endpoint-ip`` + * Support for Machine Learning pipelines for the Data Science Service + * ``oci data-science pipeline`` + * ``oci data-science pipeline-run`` + * Support for the language PII (Personal Identifiable Information) + detection in the AI Language service + * ``oci ai language batch-detect-pii-entities`` + * Support for cross region replication in the File Storage service + * ``oci fs replication create`` + * ``oci fs replication get`` + * ``oci fs replication list`` + * ``oci fs replication delete`` + * ``oci fs replication change-compartment`` + * ``oci fs file-system estimate-replication`` +- from version 3.22.2 + * Database service + * Support for Private DNS in ExaCS systems during provisioning + * ``oci db cloud-vm-cluster create --private-zone-id`` + * Support for Elastic Storage Expansion (Multi-Rack) feature + * ``oci db exadata-infrastructure create --is-multi-rack-deployment, + --multi-rack-configuration-file`` + * ``oci db exadata-infrastructure get --excluded-fields`` + * ``oci db exadata-infrastructure list --excluded-fields`` + * ``oci db exadata-infrastructure update --is-multi-rack-deployment, + --multi-rack-configuration-file`` + * Support for target version fields of infra patching v2 + features on cloud exadata infrastructure + * ``oci db cloud-exa-infra get --storageserverversion`` + * ``oci db cloud-exa-infra get --dbserverversion`` + * ``oci db cloud-exa-infra get --monthlystorageserverversion`` + * ``oci db cloud-exa-infra get --monthlydbserverversion`` + * Data Science Service + * Support for creating model version sets in model catalog + * ``oci data-science model-version-set *`` + * Support for option paramater ``model-version-set-id`` and + ``version-label`` for following commands + * ``oci data-science model create --model-version-set-id, --version-label`` + * ``oci data-science model list --model-version-set-name, --version-label`` + * ``oci data-science model update --model-version-set-id, --version-label`` +- from version 3.22.1 + * Changelog entries for version 3.22.1 are missing upstream + * https://github.com/oracle/oci-cli/issues/627 +- Refresh patches for new version + * oc_relax-python-depends.patch +- Update BuildRequires and Requires from setup.py + ------------------------------------------------------------------- Tue Jan 3 09:26:25 UTC 2023 - John Paul Adrian Glaubitz diff --git a/oci-cli.spec b/oci-cli.spec index 8e47bba..4bf1f51 100644 --- a/oci-cli.spec +++ b/oci-cli.spec @@ -28,7 +28,7 @@ %bcond_with test %endif Name: oci-cli%{psuffix} -Version: 3.22.0 +Version: 3.22.3 Release: 0 Summary: Oracle Cloud Infrastructure CLI License: Apache-2.0 @@ -46,7 +46,7 @@ BuildRequires: python3-click >= 8.0.4 BuildRequires: python3-cryptography >= 3.2.1 BuildRequires: python3-devel BuildRequires: python3-jmespath >= 0.10.0 -BuildRequires: python3-oci-sdk >= 2.90.0 +BuildRequires: python3-oci-sdk >= 2.90.3 BuildRequires: python3-pyOpenSSL >= 22.1.0 BuildRequires: python3-python-dateutil >= 2.5.3 BuildRequires: python3-pytz >= 2016.10 @@ -82,7 +82,7 @@ Requires: python3-certifi Requires: python3-click >= 8.0.4 Requires: python3-cryptography >= 3.2.1 Requires: python3-jmespath >= 0.10.0 -Requires: python3-oci-sdk >= 2.90.0 +Requires: python3-oci-sdk >= 2.90.3 Requires: python3-prompt_toolkit >= 3.0.29 Requires: python3-pyOpenSSL >= 22.1.0 Requires: python3-python-dateutil >= 2.5.3