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

Issue 270 #271

Merged
merged 2 commits into from
Jun 3, 2021
Merged

Issue 270 #271

merged 2 commits into from
Jun 3, 2021

Conversation

widdowquinn
Copy link
Owner

@widdowquinn widdowquinn commented May 27, 2021

Fixes #270

The origin of the warning was the rev: key for black. This was mutable (stable) but black doesn't support this, and so we have to pin the .pre-commit-config.yaml file to a specific black version.

In making the change the pinned dependency for blacken-docs in the same file was causing an issue, so I unpinned that.

Finally, I added blacken-docs to the requirements-dev.txt file.

Type of change

  • Bug fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that would cause existing functionality not to work as expected)
  • This change requires a documentation update

Action Checklist

  • Work on a single issue/concept (if there are multiple separate issues to address, please use a separate pull request for each)
  • Fork the pyani repository under your own account (please allow write access for repository maintainers)
  • Set up an appropriate development environment (please see CONTRIBUTING.md)
  • Create a new branch with a short, descriptive name
  • Work on this branch
    • style guidelines have been followed
    • new code is commented, especially in hard-to-understand areas
    • corresponding changes to documentation have been made
    • tests for the change have been added that demonstrate the fix or feature works
  • Test locally with pytest -v non-passing code will not be merged
  • Rebase against origin/master
  • Check changes with flake8 and black before submission
  • Commit branch
  • Submit pull request, describing the content and intent of the pull request
  • Request a code review
  • Continue the discussion at Pull requests section in the pyani repository

Leighton Pritchard added 2 commits May 27, 2021 09:34
As inidicated in psf/black#420 the mutable tag is not appropriate,
so we change to pin a fixed version tag.

Additionally, we remove the black version dependency from
blacken-docs, and add blacken-docs to the requirements-dev.txt file.
@widdowquinn widdowquinn added the bug something isn't working how it should label May 27, 2021
@codecov
Copy link

codecov bot commented May 27, 2021

Codecov Report

Merging #271 (2ddcf26) into master (6d665d2) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #271   +/-   ##
=======================================
  Coverage   75.82%   75.82%           
=======================================
  Files          52       52           
  Lines        3239     3239           
=======================================
  Hits         2456     2456           
  Misses        783      783           

@baileythegreen
Copy link
Contributor

I've tested this in both the fastANI branch, and by pulling issue_270 and making a commit there. It seems to solve the problem.

@widdowquinn
Copy link
Owner Author

Thanks @baileythegreen - merging, now.

@widdowquinn widdowquinn merged commit eb0653a into master Jun 3, 2021
@widdowquinn widdowquinn deleted the issue_270 branch June 3, 2021 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug something isn't working how it should
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The repo for black has changed locations
2 participants