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.

Sign up for GitHub

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

Jump to bottom

Format gdscript.py and conf.py using Black and Flake8 #3229

Merged
merged 1 commit into from
Mar 13, 2020
Merged

Format gdscript.py and conf.py using Black and Flake8 #3229

merged 1 commit into from
Mar 13, 2020
+352 −176

Conversation

Calinou
Copy link
Member

@Calinou Calinou commented Mar 2, 2020

This also adds a missing comma in the middle of the list of built-in types. The name, funcname and classname were also missing a r qualifier, so it was added.

Commands used for formatting and linting:

black conf.py extensions/gdscript.py
flake8 --ignore E501 conf.py extensions/gdscript.py

@Calinou
Format gdscript.py and conf.py using Black and Flake8
9902e4f 
This also adds a missing comma in the middle of the list of
built-in types. The `name`, `funcname` and `classname` were also
missing a `r` qualifier, so it was added.

Commands used for formatting and linting:

    black conf.py extensions/gdscript.py
    flake8 --ignore E501 conf.py extensions/gdscript.py
@Calinou Calinou requested a review from akien-mga March 4, 2020 08:54
@akien-mga akien-mga merged commit 8c7f02a into godotengine:master Mar 13, 2020
@akien-mga
Copy link
Member

Thanks!

@akien-mga
Copy link
Member

Did you omit testing this commit by any chance? ;)

$ make html
sphinx-build -b html -d _build/doctrees   . _build/html
Running Sphinx v1.8.4

Configuration error:
There is a programmable error in your configuration file:

Traceback (most recent call last):
  File "/usr/lib/python2.7/site-packages/sphinx/config.py", line 368, in eval_config_file
    execfile_(filename, namespace)
  File "/usr/lib/python2.7/site-packages/sphinx/util/pycompat.py", line 150, in execfile_
    exec_(code, _globals)
  File "/usr/lib/python2.7/site-packages/six.py", line 709, in exec_
    exec("""exec _code_ in _globs_, _locs_""")
  File "<string>", line 1, in <module>
  File "/home/akien/Projects/godot/godot-docs/conf.py", line 8, in <module>
    from gdscript import GDScriptLexer
ImportError: No module named gdscript

make: *** [Makefile:60: html] Error 2

akien-mga added a commit to akien-mga/godot-docs that referenced this pull request Mar 13, 2020
@akien-mga
conf.py: Fix regression from black formatting in godotengine#3229
ea944ff
akien-mga added a commit to akien-mga/godot-docs that referenced this pull request Mar 13, 2020
@akien-mga
conf.py: Fix regression from black formatting in godotengine#3229
450c2ed
akien-mga added a commit that referenced this pull request Mar 13, 2020
@akien-mga
Merge pull request #3268 from akien-mga/black-format-regression
966fd00 
conf.py: Fix regression from black formatting in #3229
@Calinou Calinou deleted the format-python-files branch May 4, 2020 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akien-mga akien-mga Awaiting requested review from akien-mga

Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Calinou @akien-mga @SocialGoo