Bug 276549 - devel/py-oci: update to 2.119.1 and devel/oci-cli to 3.37.5
Summary: devel/py-oci: update to 2.119.1 and devel/oci-cli to 3.37.5
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Koichiro Iwao
URL: https://github.com/oracle/oci-python-...
Keywords:
Depends on:
Blocks:
 
Reported: 2024-01-23 08:47 UTC by Alessandro Sagratini
Modified: 2024-01-30 10:10 UTC (History)
2 users (show)

See Also:

Attachments
trivial update of Makefile and distinfo (4.30 KB, patch)
2024-01-23 08:47 UTC, Alessandro Sagratini 		ale_sagra: maintainer-approval+
Details | Diff
trivial update of Makefile and distinfo (4.30 KB, patch)
2024-01-29 11:32 UTC, Alessandro Sagratini 		ale_sagra: maintainer-approval+
Details | Diff
trivial update of Makefile and distinfo (4.36 KB, patch)
2024-01-29 12:34 UTC, Alessandro Sagratini 		no flags Details | Diff
trivial update of Makefile and distinfo (4.36 KB, patch)
2024-01-29 12:53 UTC, Alessandro Sagratini 		ale_sagra: maintainer-approval+
Details | Diff
Show Obsolete (3) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Alessandro Sagratini 2024-01-23 08:47:43 UTC 
Created attachment 247873 [details]
trivial update of Makefile and distinfo

oci-cli changelog: https://github.com/oracle/oci-cli/releases/tag/v3.37.5

Following the upgrade to 3.37.4 version, I noticed https://github.com/oracle/oci-cli/issues/661 patch was merged into mainline oci-cli, so we should remove attached patch

This bug will also do that and fix the build.
Comment 1 Koichiro Iwao freebsd_committer freebsd_triage 2024-01-29 04:38:10 UTC 
The patch doesn't apply. Could you check?
Comment 2 Alessandro Sagratini 2024-01-29 06:11:27 UTC 
right, I tried and the patch doesn't seem to apply for me as well, it's interesting because I generated it as usual with git format-patch main.

I will check and get back to you
Comment 3 Alessandro Sagratini 2024-01-29 06:22:42 UTC 
What error are you getting while applying the patch, Koichiro?

Thank you
Comment 4 Alessandro Sagratini 2024-01-29 06:50:19 UTC 
if I try to apply patch from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276625 bug, I get:

[username@hostname /usr/ports]$ patch -p0 --dry-run < cdk.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|From 614f2c1b53f1205b3c2c81b862c2dc908fe5b0a4 Mon Sep 17 00:00:00 2001
|From: "Thomas E. Dickey" <dickey@invisible-island.net>
|Date: Thu, 25 Jan 2024 19:22:36 -0500
|Subject: [PATCH 5/9] devel/cdk: update to 5.0.20230201
|
|---
| devel/cdk/Makefile  | 7 ++++---
| devel/cdk/distinfo  | 6 +++---
| devel/cdk/pkg-plist | 2 --
| 3 files changed, 7 insertions(+), 8 deletions(-)
|
|diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
|index 513650bf4d21..d970afbb46a0 100644
|--- a/devel/cdk/Makefile
|+++ b/devel/cdk/Makefile
--------------------------
File to patch:

Is this the same error you are getting? Thank you
Comment 5 Koichiro Iwao freebsd_committer freebsd_triage 2024-01-29 11:30:36 UTC 
Here it is.

% curl -L 'https://bz-attachments.freebsd.org/attachment.cgi?id=247873' | git am
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  4400    0  4400    0     0   2814      0 --:--:--  0:00:01 --:--:--  2816
Applying: Bumping py-oci to 2.119.1 and oci-cli to 3.37.5
error: patch failed: devel/oci-cli/files/patch-services_object__storage_src_oci__cli__object__storage_objectstorage__cli__extended.py:1
error: devel/oci-cli/files/patch-services_object__storage_src_oci__cli__object__storage_objectstorage__cli__extended.py: patch does not apply
Patch failed at 0001 Bumping py-oci to 2.119.1 and oci-cli to 3.37.5
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Comment 6 Alessandro Sagratini 2024-01-29 11:32:04 UTC 
Created attachment 248057 [details]
trivial update of Makefile and distinfo

runnijng a "git apply 0001-Bumping-py-oci-to-2.119.1-and-oci-cli-to-3.37.5.patch" works for me locally: would you mind checking if everything is fine for you, as well? Thank you
Comment 7 Alessandro Sagratini 2024-01-29 12:34:04 UTC 
Created attachment 248060 [details]
trivial update of Makefile and distinfo

updating new file
Comment 8 Alessandro Sagratini 2024-01-29 12:53:56 UTC 
Created attachment 248061 [details]
trivial update of Makefile and distinfo
Comment 9 Koichiro Iwao freebsd_committer freebsd_triage 2024-01-29 12:59:30 UTC 
Now I could apply your new patch, will commit soon.
Comment 10 Alessandro Sagratini 2024-01-29 13:01:18 UTC 
awesome, thank you for your help Koichiro!
Comment 11 commit-hook freebsd_committer freebsd_triage 2024-01-30 10:06:20 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=98811c93a7c61176d10e233bf8ec469719d54aad

commit 98811c93a7c61176d10e233bf8ec469719d54aad
Author:     Alessandro Sagratini <alessandro.sagratini@gmail.com>
AuthorDate: 2024-01-29 12:30:40 +0000
Commit:     Koichiro Iwao <meta@FreeBSD.org>
CommitDate: 2024-01-30 10:02:42 +0000

    devel/{py-oci,oci-cli}: Update to 2.119.1 / 3.37.5

    PR:             276549
    Changes:        https://github.com/oracle/oci-python-sdk/releases/tag/v2.119.1
    Changes:        https://github.com/oracle/oci-cli/releases/tag/v3.37.5

 devel/oci-cli/Makefile                                |  4 ++--
 devel/oci-cli/distinfo                                |  6 +++---
 ...ct__storage_objectstorage__cli__extended.py (gone) | 19 -------------------
 devel/py-oci/Makefile                                 |  2 +-
 devel/py-oci/distinfo                                 |  6 +++---
 5 files changed, 9 insertions(+), 28 deletions(-)
Comment 12 Koichiro Iwao freebsd_committer freebsd_triage 2024-01-30 10:10:27 UTC 
Committed, thanks!