Skip to content

Upgrade CI tools #5823

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

Merged
merged 2 commits into from
Feb 2, 2023
Merged

Upgrade CI tools #5823

merged 2 commits into from
Feb 2, 2023

Conversation

Gallaecio
Copy link
Member

@Gallaecio Gallaecio commented Feb 2, 2023

Includes:

  • Downgrading flake8 and isort for Python 3.7 support.
  • Replacing tox environments for bandit, flake8, and black with one for pre-commit.
  • Code changes due to upgrading black. Most notably, removing empty lines after class/def lines.

@Gallaecio Gallaecio requested review from kmike and wRAR February 2, 2023 05:43
@codecov
Copy link

codecov bot commented Feb 2, 2023

Codecov Report

Merging #5823 (32a01e3) into master (c34ca4a) will not change coverage.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master    #5823   +/-   ##
=======================================
  Coverage   88.94%   88.94%           
=======================================
  Files         162      162           
  Lines       11002    11002           
  Branches     1798     1798           
=======================================
  Hits         9786     9786           
  Misses        937      937           
  Partials      279      279           
Impacted Files Coverage Δ
scrapy/commands/__init__.py 74.71% <ø> (ø)
scrapy/commands/bench.py 100.00% <ø> (ø)
scrapy/commands/crawl.py 60.00% <ø> (ø)
scrapy/commands/edit.py 51.85% <ø> (ø)
scrapy/commands/fetch.py 89.13% <ø> (ø)
scrapy/commands/genspider.py 87.38% <ø> (ø)
scrapy/commands/list.py 77.77% <ø> (ø)
scrapy/commands/runspider.py 93.47% <ø> (ø)
scrapy/commands/settings.py 71.87% <ø> (ø)
scrapy/commands/shell.py 92.85% <ø> (ø)
... and 32 more

@Gallaecio
Copy link
Member Author

Note: Whichever gets merged first, this or #5816, requires the other pull request to be updated accordingly to have black versions match.

@@ -4,7 +4,7 @@
# and then run "tox" from this directory.

[tox]
envlist = security,flake8,black,typing,py
envlist = pre-commit,pylint,typing,py
Copy link
Member

Choose a reason for hiding this comment

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

Should we include pre-commit to github actions "checks" workflow? Any other changes needed to the workflow?

Copy link
Member Author

@Gallaecio Gallaecio Feb 2, 2023

Choose a reason for hiding this comment

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

We already run pre-commit in GitHub (without tox).

Since the pre-commit configuration freezes versions at the pre-commit level, and all other checks use tox, I don’t think we need anything else.

@kmike kmike merged commit 1e01f29 into scrapy:master Feb 2, 2023
@kmike
Copy link
Member

kmike commented Feb 2, 2023

Thanks @Gallaecio!

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.

3 participants