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

Fix slither-analyzer by upgrading its python dependencies | slither-analyzer: 0.10.1 -> 0.10.2 #298687

Merged
merged 7 commits into from
Apr 18, 2024

Conversation

hellwolf
Copy link
Contributor

@hellwolf hellwolf commented Mar 24, 2024

Description of changes

This fixes #294418 (broken slither binary.)

Things done

  1. Upgrading the packages it depends on: python311Packages.rlp, python311Packages.hexbytes, python311Packages.eth-rlp, python311Packages.eth-keys, python311Packages.eth-keyfile.
  2. Add a simple test in its check phase to avoid future regressions.
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@hellwolf
Copy link
Contributor Author

hellwolf commented Mar 24, 2024

@ofborg build slither-analyzer

again

@hellwolf
Copy link
Contributor Author

As of now:

Result of nixpkgs-review pr 298687 run on x86_64-linux 1

5 packages marked as broken and skipped:
  • echidna
  • python311Packages.py-eth-sig-utils
  • python311Packages.py-eth-sig-utils.dist
  • python312Packages.py-eth-sig-utils
  • python312Packages.py-eth-sig-utils.dist
14 packages failed to build:
  • python311Packages.labgrid
  • python311Packages.labgrid.dist
  • python311Packages.strawberry-graphql
  • python311Packages.strawberry-graphql.dist
  • python312Packages.labgrid
  • python312Packages.labgrid.dist
  • python312Packages.magic-wormhole
  • python312Packages.magic-wormhole-mailbox-server
  • python312Packages.magic-wormhole-mailbox-server.dist
  • python312Packages.magic-wormhole-transit-relay
  • python312Packages.magic-wormhole-transit-relay.dist
  • python312Packages.magic-wormhole.dist
  • python312Packages.strawberry-graphql
  • python312Packages.strawberry-graphql.dist
70 packages built:
  • authentik
  • baserow
  • baserow.dist
  • buildbot
  • buildbot-full
  • buildbot-ui
  • buildbot-worker
  • buildbot-worker.dist
  • buildbot.dist
  • gnome-keysign
  • gnome-keysign.dist
  • magic-wormhole (python311Packages.magic-wormhole)
  • magic-wormhole.dist (python311Packages.magic-wormhole.dist)
  • paperless-ngx
  • python311Packages.autobahn
  • python311Packages.autobahn.dist
  • python311Packages.channels
  • python311Packages.channels-redis
  • python311Packages.channels-redis.dist
  • python311Packages.channels.dist
  • python311Packages.daphne
  • python311Packages.daphne.dist
  • python311Packages.eth-account
  • python311Packages.eth-account.dist
  • python311Packages.eth-keyfile
  • python311Packages.eth-keyfile.dist
  • python311Packages.eth-keys
  • python311Packages.eth-keys.dist
  • python311Packages.eth-rlp
  • python311Packages.eth-rlp.dist
  • python311Packages.hexbytes
  • python311Packages.hexbytes.dist
  • python311Packages.magic-wormhole-mailbox-server
  • python311Packages.magic-wormhole-mailbox-server.dist
  • python311Packages.magic-wormhole-transit-relay
  • python311Packages.magic-wormhole-transit-relay.dist
  • python311Packages.rlp
  • python311Packages.rlp.dist
  • slither-analyzer (python311Packages.slither-analyzer)
  • slither-analyzer.dist (python311Packages.slither-analyzer.dist)
  • python311Packages.web3
  • python311Packages.web3.dist
  • python312Packages.autobahn
  • python312Packages.autobahn.dist
  • python312Packages.channels
  • python312Packages.channels-redis
  • python312Packages.channels-redis.dist
  • python312Packages.channels.dist
  • python312Packages.daphne
  • python312Packages.daphne.dist
  • python312Packages.eth-account
  • python312Packages.eth-account.dist
  • python312Packages.eth-keyfile
  • python312Packages.eth-keyfile.dist
  • python312Packages.eth-keys
  • python312Packages.eth-keys.dist
  • python312Packages.eth-rlp
  • python312Packages.eth-rlp.dist
  • python312Packages.hexbytes
  • python312Packages.hexbytes.dist
  • python312Packages.rlp
  • python312Packages.rlp.dist
  • python312Packages.slither-analyzer
  • python312Packages.slither-analyzer.dist
  • python312Packages.web3
  • python312Packages.web3.dist
  • tahoe-lafs
  • tahoe-lafs.dist
  • tahoe-lafs.doc
  • tahoe-lafs.info

Checking if there were any regressions...

@hellwolf
Copy link
Contributor Author

A quick check from the master branch suggests that those are not regressions. So, I am making this ready for review now.

@hellwolf hellwolf marked this pull request as ready for review March 24, 2024 17:16
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

Please use pyproject = true everywhere.


pythonImportsCheck = [
Copy link
Member

Choose a reason for hiding this comment

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

Please don't remove this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

okay. let me add it back.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

added back

@ofborg ofborg bot requested a review from arcz March 24, 2024 17:49
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Mar 24, 2024
@hellwolf hellwolf force-pushed the update-python-eth-rlp-packages branch from ace661b to 7afd3d9 Compare March 24, 2024 18:15
Comment on lines 26 to 27
nativeBuildInputs = [
setuptools-scm
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
nativeBuildInputs = [
setuptools-scm
build-system = [
setuptools

and elsewhere

Copy link
Contributor Author

Choose a reason for hiding this comment

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

how about now?

Copy link
Member

Choose a reason for hiding this comment

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

No. Read carefully

Copy link
Contributor Author

Choose a reason for hiding this comment

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

what's the difference between setuptools and setuptools-scm, I saw somewhere else was setuptools-scm.

Copy link
Member

Choose a reason for hiding this comment

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

SCM sets the version from a git tag. Upstream decides what they use.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks. I changed them all.

Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

eth-keys is missing passthru.optional-dependencies, so is rlp

pkgs/development/python-modules/rlp/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/hexbytes/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/eth-rlp/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/eth-keys/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/eth-keyfile/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/eth-keyfile/default.nix Outdated Show resolved Hide resolved
@hellwolf hellwolf force-pushed the update-python-eth-rlp-packages branch 3 times, most recently from be9b33e to 89327b7 Compare March 24, 2024 18:34
@hellwolf
Copy link
Contributor Author

hellwolf commented Mar 24, 2024

eth-keys is missing passthru.optional-dependencies, so is rlp

Hmm, I don't know what to do exactly. I didn't intend to be the packager of these packages.

Would you be okay merge them now, since they should be strictly not worse than before?

Or: suggest the changes, I can do rebasings.

@hellwolf hellwolf force-pushed the update-python-eth-rlp-packages branch from 89327b7 to adde7b8 Compare March 24, 2024 20:02
@hellwolf
Copy link
Contributor Author

@dotlambda what's left to do for this one before we can merge?

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3699

@hellwolf hellwolf force-pushed the update-python-eth-rlp-packages branch 2 times, most recently from fc9243c to 902522b Compare April 8, 2024 20:58
@hellwolf hellwolf changed the title Fix slither-analyzer by upgrading its python dependencies Fix slither-analyzer by upgrading its python dependencies | slither-analyzer: 0.10.1 -> 0.10.2 Apr 8, 2024
@hellwolf
Copy link
Contributor Author

hellwolf commented Apr 8, 2024

@ofborg build slither-analyzer

@hellwolf hellwolf requested a review from dotlambda April 13, 2024 14:39
- use pyproject & setuptools-scm
- remove the setuptools-markdown post patch
- use pyproject & setuptools-scm
- use pyproject & setuptools-scm
- use pyproject & setuptools-scm
- use pyproject & setuptools-scm
- remove the setuptools-markdown post patch
@hellwolf hellwolf force-pushed the update-python-eth-rlp-packages branch from 902522b to 95eca14 Compare April 18, 2024 13:37
@SuperSandro2000 SuperSandro2000 merged commit 49e7c10 into NixOS:master Apr 18, 2024
26 of 28 checks passed
@hellwolf hellwolf deleted the update-python-eth-rlp-packages branch April 19, 2024 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

slither is broken due to eth-utils version 4
4 participants