Skip to content

Commit 47b966c

Browse files
cadenmyers13cadenmyers13
committed
cookiecutter fixes and cleanups
1 parent 1521c33 commit 47b966c

File tree

8 files changed

+13
-55
lines changed

8 files changed

+13
-55
lines changed

‎.flake8‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
# As of now, flake8 does not natively support configuration via pyproject.toml
2+
# https://github.com/microsoft/vscode-flake8/issues/135
13
[flake8]
24
exclude =
35
.git,
46
__pycache__,
57
build,
68
dist,
79
doc/source/conf.py
8-
max-line-length = 115
10+
max-line-length = 79
911
# Ignore some style 'errors' produced while formatting by 'black'
1012
# https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#labels-why-pycodestyle-warnings
1113
extend-ignore = E203

‎.gitignore‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,3 @@ target/
9090

9191
# Ipython Notebook
9292
.ipynb_checkpoints
93-
94-
# version information
95-
setup.cfg
96-
/src/diffpy/*/version.cfg
97-
98-
# Rever
99-
rever/

‎.isort.cfg‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[settings]
2-
line_length = 115
2+
# Keep import statement below line_length character limit
3+
line_length = 79
34
multi_line_output = 3
45
include_trailing_comma = True

‎AUTHORS.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Authors
22
=======
33

4-
Billinge Group and community contributors.
4+
Billinge Group members and community contributors
55

66
Contributors
77
------------

‎CHANGELOG.rst‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,3 @@ Release Notes
33
=============
44

55
.. current developments
6-
7-
0.2.0
8-
=====
9-
10-
**Added:**
11-
12-
* tutorial added to documentation
13-
* Add tutorial to documentation
14-
* Added api documentation
15-
* Add GitHub release workflow
16-
* add docstrings to functions without docstrings
17-
* Added `codespell` for spell check on all files.
18-
* Added longer description to README along with proper citation for `diffpy.fourigui`
19-
20-
**Changed:**
21-
22-
* support for python < 3.13
23-
24-
**Fixed:**
25-
26-
* test warning applycutoff test
27-
* added [project.scripts] to pyproject.toml
28-
* Fixed deprecation warning presented by numpy2
29-
* Suppress the `RuntimeWarning` in tests for the `applycutoff` function
30-
* cookiecut to group's Python package standard
31-
* add pip packages under pip.txt
32-
* Recut to group's package standard, fix installation
33-
* remove time dependency in pip, conda.txt
34-
* qmin/qmax limits in reciprocal space grid so qmin and qmax are not excluded
35-
36-
**Removed:**
37-
38-
* debug.py file for running tests
39-
* Removed support for python `<3.11`

‎LICENSE.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2024, The Trustees of Columbia University
4-
in the City of New York.
3+
Copyright (c) 2025, The Trustees of Columbia University in the City of New York.
54
All rights reserved.
65

76
Redistribution and use in source and binary forms, with or without

‎README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
.. |Tracking| image:: https://img.shields.io/badge/issue_tracking-github-blue
3636
:target: https://github.com/diffpy/diffpy.fourigui/issues
3737

38-
Tool for visualizing 3D diffraction and PDF Images.
38+
Tool for visualizing 3D diffraction and PDF images.
3939

4040
Diffpy.fourigui is a tool to visualize and process 3D data sets written with the Python programming language.
4141
Diffpy.fourigui always displays one slice perpendicular to one axis and allows scrolling through the 3D data set along

‎pyproject.toml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ build-backend = "setuptools.build_meta"
66
name = "diffpy.fourigui"
77
dynamic=['version', 'dependencies']
88
authors = [
9-
{ name="Simon J.L. Billinge group", email="[email protected]" },
9+
{ name="Simon Billinge", email="[email protected]" },
1010
]
1111
maintainers = [
12-
{ name="Simon J.L. Billinge group", email="[email protected]" },
12+
{ name="Simon Billinge", email="[email protected]" },
1313
]
14-
description = "Tool for visualizing 3D diffraction and PDF Images."
15-
keywords = ['diffraction', 'pdf', 'pair distribution function', 'gui']
14+
description = "Tool for visualizing 3D diffraction and PDF images."
15+
keywords = ['diffraction', 'PDF', 'pair distribution function', 'gui']
1616
readme = "README.rst"
1717
requires-python = ">=3.11, <3.14"
1818
classifiers = [
@@ -32,9 +32,6 @@ classifiers = [
3232
'Topic :: Scientific/Engineering :: Chemistry',
3333
]
3434

35-
[project.scripts]
36-
fourigui = "diffpy.fourigui.fourigui:main"
37-
3835
[project.urls]
3936
Homepage = "https://github.com/diffpy/diffpy.fourigui/"
4037
Issues = "https://github.com/diffpy/diffpy.fourigui/issues/"
@@ -60,7 +57,7 @@ ignore-words = ".codespell/ignore_words.txt"
6057
skip = "*.cif,*.dat"
6158

6259
[tool.black]
63-
line-length = 115
60+
line-length = 79
6461
include = '\.pyi?$'
6562
exclude = '''
6663
/(

0 commit comments

Comments
 (0)