Bug 2223432 - Review Request: python-merge3 - Python implementation of 3-way merge
Summary: Review Request: python-merge3 - Python implementation of 3-way merge
Keywords:
Status: CLOSED ERRATA
Alias: None
Product: Fedora
Classification: Fedora
Component: Package Review
Version: rawhide
Hardware: Unspecified
OS: Unspecified
unspecified
unspecified
Target Milestone: ---
Assignee: Davide Cavalca
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks: 2219952
TreeView+ depends on / blocked
 
Reported: 2023-07-17 20:04 UTC by Michel Lind
Modified: 2023-07-22 01:22 UTC (History)
3 users (show)

Fixed In Version:
Doc Type: If docs needed, set a value
Doc Text:
Clone Of:
Environment:
Last Closed: 2023-07-22 00:40:03 UTC
Type: ---
Embargoed:
davide: fedora-review+


Attachments (Terms of Use)

Description Michel Lind 2023-07-17 20:04:46 UTC
Spec URL: https://salimma.fedorapeople.org/python-merge3.spec
SRPM URL: https://salimma.fedorapeople.org/python-merge3-0.0.13-1.fc38.src.rpm

Description:
A Python implementation of 3-way merge of texts.

Given BASE, OTHER, THIS, tries to produce a combined text
incorporating the changes from both BASE->OTHER and BASE->THIS.
All three will typically be sequences of lines.

Fedora Account System Username: salimma

Comment 1 Miro Hrončok 2023-07-17 20:36:06 UTC
General comments on the spec, opiniuonated:

> %global srcname merge3

Please don't define this macro. It makes the spec file harder to read. Expand it in the spec instead.


> %if 0%{?fedora}
> %bcond_without attest
> %else
> # some attestation dependencies not in EPEL
> %bcond_with attest
> %endif

Consider this instead:

  # some testing dependencies not in EPEL
  %bcond attest 0%{?fedora}

it is simpler to write and simpler to read.


> Patch:          %{srcname}-verbose-testlog.diff

Please document the reason for this in the spec.


> # BuildRequires:  python3dist(pytest)

Why is this commented out? If it's not needed, please drop it entirely.


> %license COPYING

I haven't attempted a build yet but this might be duplicated. The wheel contains:

  License-File: COPYING
  License-File: AUTHORS

Comment 2 Michel Lind 2023-07-18 11:56:39 UTC
(In reply to Miro Hrončok from comment #1)
> General comments on the spec, opiniuonated:
> 
> > %global srcname merge3
> 
> Please don't define this macro. It makes the spec file harder to read.
> Expand it in the spec instead.

I guess this is the opinionated part ;-) ? But ... I'm on the fence, so yes, applied, thanks.

> > %if 0%{?fedora}
> > %bcond_without attest
> > %else
> > # some attestation dependencies not in EPEL
> > %bcond_with attest
> > %endif
> 
> Consider this instead:
> 
>   # some testing dependencies not in EPEL
>   %bcond attest 0%{?fedora}
>
Ah, this was inherited from a previous spec, I forgot to remove it. Sorry. But quick observation, I thought %bcond does not work yet in EL 9 and below
 
> > Patch:          %{srcname}-verbose-testlog.diff
> 
> Please document the reason for this in the spec.
>
Good point, thanks.
 
> 
> > # BuildRequires:  python3dist(pytest)
> 
> Why is this commented out? If it's not needed, please drop it entirely.
> 
From previous spec, I wanted to make sure the tests run first then forgot to remove
> 
> > %license COPYING
> 
> I haven't attempted a build yet but this might be duplicated. The wheel
> contains:
> 
>   License-File: COPYING
>   License-File: AUTHORS

Ah, I just checked with rpm -qpL on an updated local build and this indeed gets done automatically now, nice. Removed the %license declaration and added a comment to note. Thank you Miro!

Comment 3 Davide Cavalca 2023-07-18 14:41:32 UTC
Taking this review

Comment 4 Davide Cavalca 2023-07-18 14:45:43 UTC
Package Review
==============

Legend:
[x] = Pass, [!] = Fail, [-] = Not applicable, [?] = Not evaluated
[ ] = Manual review needed



===== MUST items =====

Generic:
[x]: Package is licensed with an open-source compatible license and meets
     other legal requirements as defined in the legal section of Packaging
     Guidelines.
[x]: License field in the package spec file matches the actual license.
     Note: Checking patched sources after %prep for licenses. Licenses
     found: "Unknown or generated", "GNU General Public License, Version
     2", "*No copyright* GNU General Public License v2.0 or later", "GNU
     General Public License v2.0 or later". 9 files have unknown license.
     Detailed output of licensecheck in /tmp/a/2223432-python-
     merge3/licensecheck.txt
[x]: Package contains no bundled libraries without FPC exception.
[x]: Changelog in prescribed format.
[x]: Sources contain only permissible code or content.
[-]: Package contains desktop file if it is a GUI application.
[x]: Development files must be in a -devel package
[x]: Package uses nothing in %doc for runtime.
[x]: Package consistently uses macros (instead of hard-coded directory
     names).
[x]: Package is named according to the Package Naming Guidelines.
[x]: Package does not generate any conflict.
[x]: Package obeys FHS, except libexecdir and /usr/target.
[-]: If the package is a rename of another package, proper Obsoletes and
     Provides are present.
[x]: Requires correct, justified where necessary.
[x]: Spec file is legible and written in American English.
[-]: Package contains systemd file(s) if in need.
[x]: Package is not known to require an ExcludeArch tag.
[x]: Large documentation must go in a -doc subpackage. Large could be size
     (~1MB) or number of files.
     Note: Documentation size is 10240 bytes in 1 files.
[x]: Package complies to the Packaging Guidelines
[x]: Package successfully compiles and builds into binary rpms on at least
     one supported primary architecture.
[x]: Package installs properly.
[x]: Rpmlint is run on all rpms the build produces.
     Note: No rpmlint messages.
[x]: If (and only if) the source package includes the text of the
     license(s) in its own file, then that file, containing the text of the
     license(s) for the package is included in %license.
[x]: Package requires other packages for directories it uses.
[x]: Package must own all directories that it creates.
[x]: Package does not own files or directories owned by other packages.
[x]: Package uses either %{buildroot} or $RPM_BUILD_ROOT
[x]: Package does not run rm -rf %{buildroot} (or $RPM_BUILD_ROOT) at the
     beginning of %install.
[x]: Macros in Summary, %description expandable at SRPM build time.
[x]: Dist tag is present.
[x]: Package does not contain duplicates in %files.
[x]: Permissions on files are set properly.
[x]: Package must not depend on deprecated() packages.
[x]: Package use %makeinstall only when make install DESTDIR=... doesn't
     work.
[x]: Package is named using only allowed ASCII characters.
[x]: Package does not use a name that already exists.
[x]: Package is not relocatable.
[x]: Sources used to build the package match the upstream source, as
     provided in the spec URL.
[x]: Spec file name must match the spec package %{name}, in the format
     %{name}.spec.
[x]: File names are valid UTF-8.
[x]: Packages must not store files under /srv, /opt or /usr/local

Python:
[x]: Python eggs must not download any dependencies during the build
     process.
[x]: A package which is used by another package via an egg interface should
     provide egg info.
[x]: Package meets the Packaging Guidelines::Python
[x]: Package contains BR: python2-devel or python3-devel
[x]: Packages MUST NOT have dependencies (either build-time or runtime) on
     packages named with the unversioned python- prefix unless no properly
     versioned package exists. Dependencies on Python packages instead MUST
     use names beginning with python2- or python3- as appropriate.
[x]: Python packages must not contain %{pythonX_site(lib|arch)}/* in %files
[x]: Binary eggs must be removed in %prep

===== SHOULD items =====

Generic:
[x]: If the source package does not include license text(s) as a separate
     file from upstream, the packager SHOULD query upstream to include it.
[x]: Final provides and requires are sane (see attachments).
[x]: Package functions as described.
[x]: Latest version is packaged.
[x]: Package does not include license text files separate from upstream.
[x]: Patches link to upstream bugs/comments/lists or are otherwise
     justified.
[-]: Sources are verified with gpgverify first in %prep if upstream
     publishes signatures.
     Note: gpgverify is not used.
[x]: Package should compile and build into binary rpms on all supported
     architectures.
[x]: %check is present and all tests pass.
[x]: Packages should try to preserve timestamps of original installed
     files.
[x]: Reviewer should test that the package builds in mock.
[x]: Buildroot is not present
[x]: Package has no %clean section with rm -rf %{buildroot} (or
     $RPM_BUILD_ROOT)
[x]: No file requires outside of /etc, /bin, /sbin, /usr/bin, /usr/sbin.
[x]: Packager, Vendor, PreReq, Copyright tags should not be in spec file
[x]: Sources can be downloaded from URI in Source: tag
[x]: SourceX is a working URL.
[x]: Spec use %global instead of %define unless justified.

===== EXTRA items =====

Generic:
[x]: Rpmlint is run on all installed packages.
     Note: No rpmlint messages.
[x]: Spec file according to URL is the same as in SRPM.


Rpmlint
-------
Checking: python3-merge3-0.0.13-1.fc38.noarch.rpm
          python-merge3-0.0.13-1.fc38.src.rpm
============================ rpmlint session starts ============================
rpmlint: 2.4.0
configuration:
    /usr/lib/python3.11/site-packages/rpmlint/configdefaults.toml
    /etc/xdg/rpmlint/fedora-legacy-licenses.toml
    /etc/xdg/rpmlint/fedora-spdx-licenses.toml
    /etc/xdg/rpmlint/fedora.toml
    /etc/xdg/rpmlint/scoring.toml
    /etc/xdg/rpmlint/users-groups.toml
    /etc/xdg/rpmlint/warn-on-functions.toml
rpmlintrc: [PosixPath('/tmp/tmptgmfblnj')]
checks: 31, packages: 2

 2 packages and 0 specfiles checked; 0 errors, 0 warnings, 0 badness; has taken 0.4 s 




Rpmlint (installed packages)
----------------------------
============================ rpmlint session starts ============================
rpmlint: 2.4.0
configuration:
    /usr/lib/python3.11/site-packages/rpmlint/configdefaults.toml
    /etc/xdg/rpmlint/fedora-legacy-licenses.toml
    /etc/xdg/rpmlint/fedora-spdx-licenses.toml
    /etc/xdg/rpmlint/fedora.toml
    /etc/xdg/rpmlint/scoring.toml
    /etc/xdg/rpmlint/users-groups.toml
    /etc/xdg/rpmlint/warn-on-functions.toml
checks: 31, packages: 1

 1 packages and 0 specfiles checked; 0 errors, 0 warnings, 0 badness; has taken 0.0 s 



Source checksums
----------------
https://github.com/breezy-team/merge3/archive/v0.0.13/merge3-0.0.13.tar.gz :
  CHECKSUM(SHA256) this package     : 6699905a42d66ebbf442c4354106300347e2d1f14b79dbbba967b26d534d494a
  CHECKSUM(SHA256) upstream package : 6699905a42d66ebbf442c4354106300347e2d1f14b79dbbba967b26d534d494a


Requires
--------
python3-merge3 (rpmlib, GLIBC filtered):
    python(abi)



Provides
--------
python3-merge3:
    python-merge3
    python3-merge3
    python3.11-merge3
    python3.11dist(merge3)
    python3dist(merge3)



Generated by fedora-review 0.9.0 (6761b6c) last change: 2022-08-23
Command line :/usr/bin/fedora-review -m fedora-38-aarch64 -b 2223432
Buildroot used: fedora-38-aarch64
Active plugins: Python, Generic, Shell-api
Disabled plugins: C/C++, SugarActivity, R, Haskell, Ocaml, fonts, PHP, Java, Perl
Disabled flags: EPEL6, EPEL7, DISTTAG, BATCH, EXARCH

Comment 5 Davide Cavalca 2023-07-18 14:46:01 UTC
lgtm, APPROVED

Comment 6 Fedora Admin user for bugzilla script actions 2023-07-18 16:11:46 UTC
The Pagure repository was created at https://src.fedoraproject.org/rpms/python-merge3

Comment 7 Fedora Update System 2023-07-18 20:56:15 UTC
FEDORA-2023-9056bde295 has been submitted as an update to Fedora 37. https://bodhi.fedoraproject.org/updates/FEDORA-2023-9056bde295

Comment 8 Fedora Update System 2023-07-19 03:07:38 UTC
FEDORA-2023-cdb22fd195 has been pushed to the Fedora 38 testing repository.
Soon you'll be able to install the update with the following command:
`sudo dnf install --enablerepo=updates-testing --refresh --advisory=FEDORA-2023-cdb22fd195 \*`
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2023-cdb22fd195

See also https://fedoraproject.org/wiki/QA:Updates_Testing for more information on how to test updates.

Comment 9 Fedora Update System 2023-07-19 04:06:55 UTC
FEDORA-2023-9056bde295 has been pushed to the Fedora 37 testing repository.
Soon you'll be able to install the update with the following command:
`sudo dnf install --enablerepo=updates-testing --refresh --advisory=FEDORA-2023-9056bde295 \*`
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2023-9056bde295

See also https://fedoraproject.org/wiki/QA:Updates_Testing for more information on how to test updates.

Comment 10 Fedora Update System 2023-07-22 00:40:03 UTC
FEDORA-2023-9056bde295 has been pushed to the Fedora 37 stable repository.
If problem still persists, please make note of it in this bug report.

Comment 11 Fedora Update System 2023-07-22 01:22:03 UTC
FEDORA-2023-cdb22fd195 has been pushed to the Fedora 38 stable repository.
If problem still persists, please make note of it in this bug report.


Note You need to log in before you can comment on or make changes to this bug.