Skip to content

Commit 1947fb2

Browse files
committed
Address error in #260 and reorg packages in pyproject.toml
1 parent 14742e2 commit 1947fb2

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

pyproject.toml

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,42 +37,51 @@ classifiers = [
3737
]
3838
keywords = ["diffraction", "crystallography", "diffraction",
3939
"powder diffraction", "SAXS", "reflectometry","neutron diffraction", "Rietveld"]
40-
dependencies = [
40+
41+
dependencies = [ # required for scripting
4142
"numpy",
4243
"scipy",
4344
"pycifrw",
4445
]
4546

4647
[project.optional-dependencies]
47-
gui = [
48+
gui = [ # required for GUI
4849
"wxPython >=4.1",
4950
"matplotlib",
5051
"pyopengl",
5152
]
52-
misc = [
53+
54+
useful = [ # recommended but not required
55+
"requests",
5356
"pillow",
5457
"h5py",
5558
"hdf5",
5659
"imageio",
5760
"pybaselines",
61+
"xmltodict",
62+
"seekpath",
63+
"gitpython",
5864
]
59-
web = [
65+
66+
self-install = [ # for self-installation of optional software
6067
"conda",
61-
"requests",
6268
]
63-
git = [
69+
70+
git = [ # probably not needed, as likely already present
6471
"git",
65-
"gitpython",
6672
]
67-
docs = [
73+
74+
docs = [ # to build docs only
6875
"sphinx",
6976
"sphinx-rtd-theme",
7077
]
7178

79+
win = ['pywin32'] # windows only, for makeBat.py installer
80+
7281
[project.urls]
7382
Homepage = "https://advancedphotonsource.github.io/GSAS-II-tutorials"
7483
"Bug Tracker" = "https://github.com/AdvancedPhotonSource/GSAS-II/issues"
75-
#Discussions = "https://github.com/AdvancedPhotonSource/GSAS-II/discussions"
84+
Discussions = "https://github.com/AdvancedPhotonSource/GSAS-II/discussions"
7685
#Changelog = "https://github.com/AdvancedPhotonSource/GSAS-II/releases"
7786

7887
#[project.scripts]
@@ -203,4 +212,4 @@ messages_control.disable = [
203212
]
204213

205214
[project.gui-scripts]
206-
GSAS-II = 'GSASII.GSASII:main'
215+
GSAS-II = 'GSASII.GSASIIGUI:main'

0 commit comments

Comments
 (0)