Skip to content

Commit a2eba1a

Browse files
committed
edits made by running pre-commit (removing whitespace)
1 parent 149bc28 commit a2eba1a

File tree

10 files changed

+53
-52
lines changed

10 files changed

+53
-52
lines changed

.coveragerc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[run]
2-
source =
2+
source =
33
src/diffpy/pdfmorph/
44
[report]
55
omit =

.github/workflows/docs.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: install requirements
2727
run: >-
28-
conda install -n build -c conda-forge
28+
conda install -n build -c conda-forge
2929
--file requirements/build.txt
3030
--file requirements/run.txt
3131
--file requirements/docs.txt
@@ -42,4 +42,3 @@ jobs:
4242
with:
4343
github_token: ${{ secrets.GITHUB_TOKEN }}
4444
publish_dir: ./doc/manual/build/html
45-

doc/manual/source/conf.py

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,65 +13,68 @@
1313
import sys
1414
from pathlib import Path
1515

16-
sys.path.insert(0, str(Path('../../..').resolve()))
17-
sys.path.insert(0, str(Path('../../../src').resolve()))
16+
sys.path.insert(0, str(Path("../../..").resolve()))
17+
sys.path.insert(0, str(Path("../../../src").resolve()))
1818

1919

2020
# -- Project information -----------------------------------------------------
2121

22-
project = 'PDFmorph'
23-
project_full = 'diffpy.pdfmorph'
24-
copyright = '2009-2019, Trustees of Columbia University in the City of New York, all rights reserved.'
25-
author = 'Chris Farrow, Christopher J. Wright, Pavol Juhás, Chia-Hao (Timothy) Liu, S. Matthew Román, Simon J.L. Billinge'
22+
project = "PDFmorph"
23+
project_full = "diffpy.pdfmorph"
24+
copyright = "2009-2019, Trustees of Columbia University in the City of New York, all rights reserved."
25+
author = "Chris Farrow, Christopher J. Wright, Pavol Juhás, Chia-Hao (Timothy) Liu, S. Matthew Román, Simon J.L. Billinge"
2626

2727
# The full version, including alpha/beta/rc tags
2828
from importlib.metadata import version
29+
2930
fullversion = version(project_full)
3031
# The short X.Y version.
31-
version = ''.join(fullversion.split('.post')[:1])
32+
version = "".join(fullversion.split(".post")[:1])
3233
# The full version, including alpha/beta/rc tags.
3334
release = fullversion
3435

3536
# Get current date for copyright
3637
import time
37-
today = time.strftime('%B %d, %Y', time.localtime())
38+
39+
today = time.strftime("%B %d, %Y", time.localtime())
3840
year = today.split()[-1]
39-
copyright = copyright.replace('%Y', year)
41+
copyright = copyright.replace("%Y", year)
4042

4143

4244
# -- General configuration ---------------------------------------------------
4345

4446
# Add any Sphinx extension module names here, as strings. They can be
4547
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
4648
# ones.
47-
extensions = ['sphinx.ext.autodoc',
48-
'sphinx.ext.napoleon',
49-
'sphinx.ext.todo',
50-
'sphinx.ext.viewcode',
51-
'sphinx.ext.intersphinx',
52-
'sphinx_rtd_theme',
53-
'm2r',
49+
extensions = [
50+
"sphinx.ext.autodoc",
51+
"sphinx.ext.napoleon",
52+
"sphinx.ext.todo",
53+
"sphinx.ext.viewcode",
54+
"sphinx.ext.intersphinx",
55+
"sphinx_rtd_theme",
56+
"m2r",
5457
]
5558
napoleon_google_docstring = False
5659
napoleon_use_param = False
5760
napoleon_use_ivar = False
5861

5962
# Add any paths that contain templates here, relative to this directory.
60-
templates_path = ['_templates']
63+
templates_path = ["_templates"]
6164

62-
from jinja2 import Template, Environment, FileSystemLoader
65+
from jinja2 import Environment, FileSystemLoader, Template
6366

64-
source_suffix = '.rst'
67+
source_suffix = ".rst"
6568

66-
master_doc = 'index'
69+
master_doc = "index"
6770

68-
language = 'en'
71+
language = "en"
6972
# List of patterns, relative to source directory, that match files and
7073
# directories to ignore when looking for source files.
7174
# This pattern also affects html_static_path and html_extra_path.
72-
exclude_patterns = ['Thumbs.db', '.DS_Store']
75+
exclude_patterns = ["Thumbs.db", ".DS_Store"]
7376

74-
pygments_style = 'sphinx'
77+
pygments_style = "sphinx"
7578

7679
todo_include_todos = True
7780

@@ -80,7 +83,8 @@
8083
# The theme to use for HTML and HTML Help pages. See the documentation for
8184
# a list of builtin themes.
8285
import sphinx_rtd_theme
83-
html_theme = 'sphinx_rtd_theme'
86+
87+
html_theme = "sphinx_rtd_theme"
8488
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
8589

8690
html_theme_options = {}
@@ -90,25 +94,29 @@
9094
# so a file named "default.css" will overwrite the builtin "default.css".
9195
html_static_path = []
9296

93-
htmlhelp_basename = 'PDFmorphdoc'
97+
htmlhelp_basename = "PDFmorphdoc"
9498

9599
latex_documents = [
96-
(master_doc, 'pdfmorph.tex', 'PDFmorph Documentation',
97-
'author', 'manual'),
100+
(master_doc, "pdfmorph.tex", "PDFmorph Documentation", "author", "manual"),
98101
]
99102

100-
man_pages = [
101-
(master_doc, 'pdfmorph', 'PDFmorph Documentation', [author], 1)
102-
]
103+
man_pages = [(master_doc, "pdfmorph", "PDFmorph Documentation", [author], 1)]
103104

104105
texinfo_documents = [
105-
(master_doc, 'PDFmorph', 'PDFmorph Documentation', author,
106-
'PDFmorph', 'One line description of project.', 'Miscellaneous'),
106+
(
107+
master_doc,
108+
"PDFmorph",
109+
"PDFmorph Documentation",
110+
author,
111+
"PDFmorph",
112+
"One line description of project.",
113+
"Miscellaneous",
114+
),
107115
]
108116

109117
epub_title = project
110118
epub_author = author
111119
epub_publisher = author
112120
epub_copyright = copyright
113121

114-
epub_exclude_files = ['search.html']
122+
epub_exclude_files = ["search.html"]

run_tests.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
#!/usr/bin/env python
22

33
import sys
4+
45
import pytest
56

6-
if __name__ == '__main__':
7+
if __name__ == "__main__":
78
# show output results from every test function
8-
args = ['-v']
9+
args = ["-v"]
910
# show the message output for skipped and expected failure tests
1011
if len(sys.argv) > 1:
1112
args.extend(sys.argv[1:])
12-
print('pytest arguments: {}'.format(args))
13+
print("pytest arguments: {}".format(args))
1314
# # compute coverage stats for xpdAcq
1415
# call pytest and exit with the return code from pytest so that
1516
# travis will fail correctly if tests fail

src/diffpy/pdfmorph/morphs/morphishape.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717
"""class MorphISphere -- apply inverse spherical shape function
18-
class MorphISpheroid -- apply inverse spheroidal shape function
18+
class MorphISpheroid -- apply inverse spheroidal shape function
1919
"""
2020

2121

src/diffpy/pdfmorph/tests/test_morphshape.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33

44
import os
5+
56
import numpy
67
import pytest
78

src/diffpy/pdfmorph/tests/test_pdfmorphapp.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44

55
import pytest
66

7-
from diffpy.pdfmorph.pdfmorphapp import (
8-
create_option_parser,
9-
multiple_morphs,
10-
single_morph,
11-
)
7+
from diffpy.pdfmorph.pdfmorphapp import create_option_parser, multiple_morphs, single_morph
128

139
thisfile = locals().get("__file__", "file.py")
1410
tests_dir = Path(thisfile).parent.resolve()

src/diffpy/pdfmorph/tests/test_pdfmorphio.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@
1010
except ImportError:
1111
pass
1212

13-
from diffpy.pdfmorph.pdfmorphapp import (
14-
create_option_parser,
15-
multiple_morphs,
16-
single_morph,
17-
)
13+
from diffpy.pdfmorph.pdfmorphapp import create_option_parser, multiple_morphs, single_morph
1814

1915
thisfile = locals().get("__file__", "file.py")
2016
tests_dir = Path(thisfile).parent.resolve()

src/diffpy/pdfmorph/tests/testdata/testsequence_serialfile.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,4 @@
132132
"rstep": 0.01,
133133
"rpoly": 0.7
134134
}
135-
}
135+
}

tutorial/sample_namesfile.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
"SaVe_MoRph_As": "this_also_works.extension",
1111
"note": "Capitalization does NOT matter. The program is case insensitive."
1212
}
13-
}
13+
}

0 commit comments

Comments
 (0)