Skip to content

Commit 7ae5330

Browse files
authored
Merge pull request #85 from Sparks29032/pep8
Formatting for pep8
2 parents 2f3b5f0 + 3d94e42 commit 7ae5330

File tree

5 files changed

+13
-90
lines changed

5 files changed

+13
-90
lines changed

.flake8

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ exclude =
88
labpdfproc/_version.py,
99
doc/manual/source/conf.py
1010
max-line-length = 115
11-
# Ignore some style 'errors' produced while formatting by 'black'
12-
ignore = W503
11+
# Ignore some style 'errors' produced while formatting by 'black' (see link below)
12+
# https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#labels-why-pycodestyle-warnings
13+
extend-ignore = E203

conda-recipe/build.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

conda-recipe/meta.yaml

Lines changed: 0 additions & 64 deletions
This file was deleted.

conda-recipe/run_test.py

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/diffpy/utils/tests/test_diffraction_objects.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,12 +249,17 @@ def test_dump(tmp_path, mocker):
249249
expected = (
250250
"[Diffraction_object]\nname = test\nwavelength = 1.54\nscat_quantity = x-ray\nthing1 = 1\n"
251251
"thing2 = thing2\npackage_info = {'package2': '3.4.5', 'diffpy.utils': '3.3.0'}\n"
252-
"creation_time = 2012-01-14 00:00:00\n\n#### start data\n0.000000000000000000e+00 0.000000000000000000e+00\n"
253-
"1.000000000000000000e+00 1.000000000000000000e+00\n2.000000000000000000e+00 2.000000000000000000e+00\n"
254-
"3.000000000000000000e+00 3.000000000000000000e+00\n4.000000000000000000e+00 4.000000000000000000e+00\n"
252+
"creation_time = 2012-01-14 00:00:00\n\n"
253+
"#### start data\n0.000000000000000000e+00 0.000000000000000000e+00\n"
254+
"1.000000000000000000e+00 1.000000000000000000e+00\n"
255+
"2.000000000000000000e+00 2.000000000000000000e+00\n"
256+
"3.000000000000000000e+00 3.000000000000000000e+00\n"
257+
"4.000000000000000000e+00 4.000000000000000000e+00\n"
255258
"5.000000000000000000e+00 5.000000000000000000e+00\n"
256-
"6.000000000000000000e+00 6.000000000000000000e+00\n7.000000000000000000e+00 7.000000000000000000e+00\n"
257-
"8.000000000000000000e+00 8.000000000000000000e+00\n9.000000000000000000e+00 9.000000000000000000e+00\n"
259+
"6.000000000000000000e+00 6.000000000000000000e+00\n"
260+
"7.000000000000000000e+00 7.000000000000000000e+00\n"
261+
"8.000000000000000000e+00 8.000000000000000000e+00\n"
262+
"9.000000000000000000e+00 9.000000000000000000e+00\n"
258263
"1.000000000000000000e+01 1.000000000000000000e+01\n"
259264
)
260265
assert actual == expected

0 commit comments

Comments
 (0)