-
Notifications
You must be signed in to change notification settings - Fork 6
style: cookiecutter and pre-commit formatting updates #77
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
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
47b966c
cookiecutter fixes and cleanups
cadenmyers13 f9ded61
more cookiecutter formatting and copyright year updates
cadenmyers13 3c1229e
flake8 line length errors
cadenmyers13 4d5df51
restore CHANGELOG.rst
cadenmyers13 afa73eb
Update email to sbillinge
cadenmyers13 d3df20e
remove noqa
cadenmyers13 13c4805
add 2024 to copyright
cadenmyers13 e609ee4
revert email back to sb
cadenmyers13 20c26f6
restore project.scripts
cadenmyers13 39ffc7b
correcting email
cadenmyers13 49c027d
update cp to 2022-2025
cadenmyers13 9216a29
news
cadenmyers13 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,13 @@ | ||
# As of now, flake8 does not natively support configuration via pyproject.toml | ||
# https://github.com/microsoft/vscode-flake8/issues/135 | ||
[flake8] | ||
exclude = | ||
.git, | ||
__pycache__, | ||
build, | ||
dist, | ||
doc/source/conf.py | ||
max-line-length = 115 | ||
max-line-length = 79 | ||
# Ignore some style 'errors' produced while formatting by 'black' | ||
# https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#labels-why-pycodestyle-warnings | ||
extend-ignore = E203 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
[settings] | ||
line_length = 115 | ||
# Keep import statement below line_length character limit | ||
line_length = 79 | ||
multi_line_output = 3 | ||
include_trailing_comma = True | ||
sbillinge marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,13 +6,13 @@ build-backend = "setuptools.build_meta" | |
name = "diffpy.fourigui" | ||
dynamic=['version', 'dependencies'] | ||
authors = [ | ||
{ name="Simon J.L. Billinge group", email="[email protected]" }, | ||
{ name="Simon Billinge", email="[email protected]" }, | ||
cadenmyers13 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
] | ||
maintainers = [ | ||
{ name="Simon J.L. Billinge group", email="[email protected]" }, | ||
{ name="Simon Billinge", email="[email protected]" }, | ||
cadenmyers13 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
] | ||
description = "Tool for visualizing 3D diffraction and PDF Images." | ||
keywords = ['diffraction', 'pdf', 'pair distribution function', 'gui'] | ||
description = "Tool for visualizing 3D diffraction and PDF images." | ||
keywords = ['diffraction', 'PDF', 'pair distribution function', 'gui'] | ||
readme = "README.rst" | ||
requires-python = ">=3.11, <3.14" | ||
classifiers = [ | ||
|
@@ -32,9 +32,6 @@ classifiers = [ | |
'Topic :: Scientific/Engineering :: Chemistry', | ||
] | ||
|
||
[project.scripts] | ||
cadenmyers13 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
fourigui = "diffpy.fourigui.fourigui:main" | ||
|
||
[project.urls] | ||
Homepage = "https://github.com/diffpy/diffpy.fourigui/" | ||
Issues = "https://github.com/diffpy/diffpy.fourigui/issues/" | ||
|
@@ -60,7 +57,7 @@ ignore-words = ".codespell/ignore_words.txt" | |
skip = "*.cif,*.dat" | ||
|
||
[tool.black] | ||
line-length = 115 | ||
line-length = 79 | ||
include = '\.pyi?$' | ||
exclude = ''' | ||
/( | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.