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

Modernise tooling and fix CI failing #335

Merged
merged 10 commits into from
Apr 21, 2023
Merged

Modernise tooling and fix CI failing #335

merged 10 commits into from
Apr 21, 2023

Conversation

DMRobertson
Copy link
Contributor

@DMRobertson DMRobertson commented Apr 21, 2023

Commitwise reviewable.

I think the only necessary changes were

  • Fix a unit test failure
  • Dump flake8 for ruff

In particular, moving to pyproject.toml was my first attempt/guess to fix the CI errors, but I don't think it was strictly necessary.

@DMRobertson DMRobertson force-pushed the dmr/modernize branch 2 times, most recently from d1bc119 to d66558b Compare April 21, 2023 12:40
@dklimpel
Copy link
Contributor

Failing flake8 looks like this: python/importlib_metadata#406

:(

@DMRobertson
Copy link
Contributor Author

This is an exc

Failing flake8 looks like this: python/importlib_metadata#406

:(

Good spot, thank you.

This is an excellent excuse for us to move to ruff instead of flake8.

@DMRobertson DMRobertson changed the title Move from setup.py to pyproject.toml Modernise tooling Apr 21, 2023
@DMRobertson DMRobertson changed the title Modernise tooling Modernise tooling and fix CI failing Apr 21, 2023
@DMRobertson DMRobertson force-pushed the dmr/modernize branch 5 times, most recently from 6cbfadf to 24b06ea Compare April 21, 2023 13:50
scripts-dev/lint.sh Outdated Show resolved Hide resolved
@DMRobertson
Copy link
Contributor Author

There is one unit test failing. I can't obviously see why it's failing.

@DMRobertson DMRobertson marked this pull request as ready for review April 21, 2023 14:08
@DMRobertson DMRobertson requested a review from a team as a code owner April 21, 2023 14:08
@dklimpel
Copy link
Contributor

dklimpel commented Apr 21, 2023

Fix an unintended rename in #333

Sorry.

@DMRobertson
Copy link
Contributor Author

Fix an unintended rename in #333

Sorry.

No worries. It's easily done, and was our fault for having broken CI.

David Robertson and others added 10 commits April 21, 2023 16:10
Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
IDK we sometimes have to invoke trial explicitly like this
And remove py2-style type annotations, which ruff doesn't recognise

Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
Presumably this fixes complaints from #333 and #334
Needed for unit tests to be happy
@DMRobertson DMRobertson merged commit 4e1ed66 into main Apr 21, 2023
6 checks passed
@DMRobertson DMRobertson deleted the dmr/modernize branch April 21, 2023 15:41
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.

None yet

3 participants