search

packit / dist-git-to-source-git

Converting dist-git to source-git
MIT License
4 stars 9 forks source link

copy patches which are not applied during %prep #81

Closed TomasTomecek closed 3 years ago

TomasTomecek commented 3 years ago

because rpmbuild -bs needs those files - hence packit srpm fails

57

softwarefactory-project-zuul[bot] commented 3 years ago

Build failed.

TomasTomecek commented 3 years ago

recheck

TomasTomecek commented 3 years ago

looks like a CI flake, since the first package install took ~20 minutes while it should take 2

I like that we are copying the real patches and not some empty ones.

+1, originally I wanted to do empty ones but then realized that doesn't make any sense and with this, people can even develop patches for different arches, even though source-git won't be too helpful for them

softwarefactory-project-zuul[bot] commented 3 years ago

Build failed.

dhodovsk commented 3 years ago

This one tracebacks for me with

  File "/usr/local/lib/python3.6/site-packages/dist2src/core.py", line 455, in copy_conditional_patches
    file_src = self.dist_git_path / "SOURCES" / patch_name
  File "/usr/lib64/python3.6/pathlib.py", line 899, in __truediv__
    return self._make_child((key,))
  File "/usr/lib64/python3.6/pathlib.py", line 686, in _make_child
    drv, root, parts = self._parse_args(args)
  File "/usr/lib64/python3.6/pathlib.py", line 640, in _parse_args
    a = os.fspath(a)
TypeError: expected str, bytes or os.PathLike object, not PatchObject

:(

TomasTomecek commented 3 years ago

Yes, it needs https://github.com/packit/packit/pull/972 forgot to add it to the description, sorry

I'm gonna install packit from master in the meantime.

dhodovsk commented 3 years ago

I have RUN pip3 install --upgrade setuptools && pip3 install wheel && pip3 install git+https://github.com/packit/packit added at the end of Containerfile and it still fails

TomasTomecek commented 3 years ago

@dhodovsk thanks, on it

TomasTomecek commented 3 years ago

recheck

TomasTomecek commented 3 years ago

Tomas' awesome local :beer: CI status: :green_heart: 

black....................................................................Passed
prettier.................................................................Passed
Check for added large files..............................................Passed
Check python ast.........................................................Passed
Check for merge conflicts................................................Passed
Check Yaml...............................................................Passed
Detect Private Key.......................................................Passed
Fix End of Files.........................................................Passed
Trim Trailing Whitespace.................................................Passed
flake8...................................................................Passed
mypy.....................................................................Passed
Check if rebase is needed................................................Passed

=== 56 passed in 1803.78s (0:30:03) ===
TomasTomecek commented 3 years ago

I have RUN pip3 install --upgrade setuptools && pip3 install wheel && pip3 install git+https://github.com/packit/packit added at the end of Containerfile and it still fails

I suspect that the stable packit was still being used despite you installing it from git master. I removed packitos from setup.cfg and it works now correctly, are we good to merge?