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

Run `black` on user directory code #4635

Merged
merged 2 commits into from Feb 13, 2019

Conversation

Projects
None yet
2 participants
@hawkowl
Copy link
Contributor

hawkowl commented Feb 13, 2019

To prevent mixing up of functional/formatting changes in the userdir rewrite branch.

hawkowl added some commits Feb 13, 2019

@hawkowl hawkowl requested a review from matrix-org/synapse-core Feb 13, 2019

@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Feb 13, 2019

Codecov Report

Merging #4635 into develop will decrease coverage by 0.01%.
The diff coverage is 66.66%.

@@             Coverage Diff             @@
##           develop    #4635      +/-   ##
===========================================
- Coverage    75.29%   75.27%   -0.02%     
===========================================
  Files          338      338              
  Lines        34575    34575              
  Branches      5654     5654              
===========================================
- Hits         26032    26027       -5     
- Misses        6952     6958       +6     
+ Partials      1591     1590       -1

@hawkowl hawkowl merged commit bb4fd8f into develop Feb 13, 2019

7 checks passed

ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
codecov/patch 66.66% of diff hit (target 0%)
Details
codecov/project 75.27% (target 0%)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@hawkowl hawkowl deleted the hawkowl/blackify-user-dir branch Feb 13, 2019

richvdh added a commit that referenced this pull request Mar 6, 2019

Run `black` on synapse/handlers/user_directory.py
This got done on the develop branch in #4635, but the subsequent merge to
hotfixes (88af031) discarded the changes for some reason.

Fixing this here and now means (a) there are fewer differences between
matrix-org-hotfixes and develop, making future patches easier to merge, and (b)
fixes some pep8 errors on the hotfixes branch which have been annoying me for
some time.

richvdh added a commit that referenced this pull request Mar 6, 2019

Run `black` on synapse/handlers/user_directory.py (#4812)
This got done on the develop branch in #4635, but the subsequent merge to
hotfixes (88af031) discarded the changes for some reason.

Fixing this here and now means (a) there are fewer differences between
matrix-org-hotfixes and develop, making future patches easier to merge, and (b)
fixes some pep8 errors on the hotfixes branch which have been annoying me for
some time.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.