Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve packagecode and other release prep #2992

Merged
merged 85 commits into from
Jun 13, 2022
Merged

Improve packagecode and other release prep #2992

merged 85 commits into from
Jun 13, 2022

Conversation

pombredanne
Copy link
Member

@pombredanne pombredanne commented Jun 12, 2022

This PR adds:

  • a few improvements and bug fixes to package processing on Python and Gradle
  • fix the Apple M1 installation issues

This is a potpourri towards the latest release.

Tasks

  • Reviewed contribution guidelines
  • PR is descriptively titled 📑 and links the original issue above 🔗
  • Tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR
    Run tests locally to check for errors.
  • Commits are in uniquely-named feature branch and has no merge conflicts 📁

* Also improve cleaning keywords


Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Rather than trying to get things recompiled on ARM for now, we instead
force relaunching the current shell script (scancode, configure, ...)
under the x86_64 Intel architecture. This makes things work OK on
macOS M1 and does not impact other OSes.

Reference: #2938
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
This is borrowed from dephell_setuptools

Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
We now include the original requirements as-is

Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
@pombredanne
Copy link
Member Author

Closing now, while fixing flaky tests

The code that was computing depth was mistakenly counting iterations
instead of computin the os.walk depth and this was the source of
a seemingly randon issue in the CI. The reason why only the CI was
failing is likely because Azure builds of Python have a slightly different set of defaults and the os.walk iteration order is not the
same as a plain Ubuntu installation.

Signed-off-by: Philippe Ombredanne <[email protected]>
YAML output is mostly strings. Some JSON output was numeric.
Conversion to CSV was failing with --from-json using a JSON output
converted by hand from a YAML output

Signed-off-by: Philippe Ombredanne <[email protected]>
@pombredanne pombredanne reopened this Jun 13, 2022
@pombredanne pombredanne requested a review from JonoYang June 13, 2022 17:15
@pombredanne
Copy link
Member Author

@JonoYang please have a look at this before I merge ... This is a bit of a mini mess of many unrelated things:

  • improved gradle parsing
  • improved setup.py parsing
  • fix for the PyPI heisenbug
  • support for apple M1

I could split this in multiple PRs instead.

Copy link
Member

@JonoYang JonoYang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just had a question about is_setup_call

configure Outdated Show resolved Hide resolved
src/packagedcode/pypi_setup_py.py Show resolved Hide resolved
Reported-by: Jono Yang <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
Signed-off-by: Philippe Ombredanne <[email protected]>
@pombredanne
Copy link
Member Author

@JonoYang Thanks!
See my comments from your review.
Please merge when this is passing if you thinks this is OK.
And if you do not mind to push afterwards a 31.0.0rc1 tag, this way we will get a release :)

@JonoYang
Copy link
Member

@pombredanne Thanks, merging now!

@JonoYang JonoYang merged commit 746c336 into develop Jun 13, 2022
@JonoYang JonoYang deleted the improve-gradle branch June 13, 2022 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants