Skip to content

Commit 86d91e2

Browse files
knc6tavazzaknc6
authored
Develop (#188)
* Image augmentation. * Augment images. * Augment images. * Specie update. * Add Latt2D, STM image (b-1) fix, image augmentation fix. * Add Latt2D, STM image (b-1) fix, image augmentation fix. * Update conf.py * Update conf.py * Multi-output graph bacthing. * Add EDOS dataset. * Temp. * Add circuit maker. * Add circuit maker. * NELECT update. * Version update, more DBs added. * Fix CHGCAR vasp. * Added volumetric reshape for CHGCAR. * Tmp * Tershoff Hamman update, specie update. * Add crop from center in STM. * Add Fourier transfor in STM. * Update STM pytest. * Add DPI to STM. * Zeo++ added, Atoms cif update, STM update, random vacancy maker added. * Atoms tempfile fix, Potcar from atoms module added. * Test for docs. * C2DB link update, docs Atoms update. * C2DB link update, docs Atoms update. * Version update, COD DB, QM9 JCTC DB added. * Compostion bug fix, elemental descriptor added. * Develop (#186) * Update outputs.py I added the calculation of the Raman intensities inside parse_raman_dat * Update outputs.py * Update outputs.py * Update outputs.py * Update cfid.py * Delete __init__.py * stylecss added. * stylecss added. * Adding extra Makefile/ * Remove examples from docs. * Docs update. * Docs update. * Docs update. * Docs update. * Docs update. * Docs update. * Docs update. * Docs update. * Docs update. * Docs update. * Tutorials update. * Tutorials docs update. * Docs update,pdb reader updated. * Update action_build.yml * Update action_build.yml * Remove pytraj strong dependencies. * Update docs, Added PDBBind and HPOV datasets. * Docs update. Co-authored-by: tavazza <[email protected]> Co-authored-by: knc6 <[email protected]>
1 parent d2dfe56 commit 86d91e2

File tree

25 files changed

+1616
-324
lines changed

25 files changed

+1616
-324
lines changed

.github/workflows/action_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: |
2525
python setup.py develop
2626
pip install --upgrade --upgrade-strategy eager -r dev-requirements.txt -e .
27-
27+
#conda install -c ambermd pytraj
2828
echo 'CONDA LIST'
2929
conda list
3030

dev-requirements.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ase>=3.21.1
44
numpy>=1.18.5
55
scipy>=1.4.1
66
matplotlib>=3.0.0
7-
phonopy>=2.8.1
7+
phonopy==2.10.0
88
coverage>=5.5
99
lightgbm>=2.1.0
1010
flask >=1.1.2
@@ -28,3 +28,5 @@ bokeh>=2.3.0
2828
opencv-python>=4.5.2.52
2929
scikit-image>=0.16.2
3030
Pillow>=7.1.2
31+
sphinx_rtd_theme>=0.5.1
32+
sphinx>=4.0.3

docs/_static/css/mystyle.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@import "theme.css";
2+
3+
table.docutils div.line-block {
4+
margin-left: 0;
5+
}

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ase>=3.21.1
44
numpy>=1.18.5
55
scipy>=1.4.1
66
matplotlib>=3.0.0
7-
phonopy>=2.8.1
7+
phonopy==2.10.0
88
coverage>=5.5
99
lightgbm>=2.1.0
1010
flask >=1.1.2

docs/source/Makefile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Minimal makefile for Sphinx documentation
2+
#
3+
4+
# You can set these variables from the command line.
5+
SPHINXOPTS =
6+
SPHINXBUILD = sphinx-build
7+
SPHINXPROJ = jarvis-tools
8+
SOURCEDIR = .
9+
BUILDDIR = _build
10+
11+
# Has to be explicit, otherwise we don't get "make" without targets right.
12+
help:
13+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
14+
15+
# You can add custom targets here.
16+
17+
# Catch-all target: route all unknown targets to Sphinx using the new
18+
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
19+
%:
20+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/source/conf.py

Lines changed: 68 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,94 @@
11
import os
22
import sys
3-
sys.path.insert(0, os.path.abspath('../..')) # Source code dir relative to this file
3+
4+
sys.path.insert(
5+
0, os.path.abspath("../..")
6+
) # Source code dir relative to this file
47

58
extensions = [
6-
'sphinx.ext.autodoc','autoapi.extension','sphinx.ext.doctest' # Core library for html generation from docstrings
9+
"sphinx.ext.autodoc",
10+
"autoapi.extension",
11+
"sphinx.ext.viewcode",
12+
"sphinx.ext.doctest", # Core library for html generation from docstrings
13+
#"releases",
714
]
815

9-
autoapi_type = 'python'
10-
autoapi_dirs = ['../../jarvis']
11-
autoapi_ignore = ['*test*']
16+
autoapi_type = "python"
17+
autoapi_dirs = ["../../jarvis"]
18+
autoapi_ignore = ["*test*", "*examples*","*vasp_to_xml*"]
19+
#exclude_patterns = ["*vasp_to_xml*"]
1220

21+
# 'releases' (changelog) settings
22+
#releases_issue_uri = "https://github.com/usnistgov/jarvis/issues/%s"
23+
#releases_release_uri = "https://github.com/usnistgov/jarvis/tree/%s"
1324

1425
# sys.path.append(os.path.dirname(__file__))
1526
# -- General configuration -----------------------------------------------------
1627

1728

18-
1929
# Add any paths that contain templates here, relative to this directory.
20-
templates_path = ['_templates']
30+
templates_path = ["_templates"]
2131

2232
# The suffix of source filenames.
23-
source_suffix = '.rst'
33+
source_suffix = ".rst"
2434

2535
# The encoding of source files.
26-
#source_encoding = 'utf-8'
36+
# source_encoding = 'utf-8'
2737

2838
# The master toctree document.
29-
master_doc = 'index'
39+
master_doc = "index"
3040

3141
# General information about the project.
32-
project = u'JARVIS-Tools'
33-
copyright = u'2021, Kamal Choudhary'
42+
project = u"JARVIS-Tools"
43+
copyright = u"2021, Kamal Choudhary"
3444

3545
# The version info for the project you're documenting, acts as replacement for
3646
# |version| and |release|, also used in various other places throughout the
3747
# built documents.
3848
#
3949
# The short X.Y version.
4050
import jarvis
51+
4152
version = jarvis.__version__
4253
# The full version, including alpha/beta/rc tags.
4354
# release = '0.9'
4455

4556
# The language for content autogenerated by Sphinx. Refer to documentation
4657
# for a list of supported languages.
47-
#language = None
58+
# language = None
4859

4960
# There are two options for replacing |today|: either, you set today to some
5061
# non-false value, then it is used:
51-
#today = ''
62+
# today = ''
5263
# Else, today_fmt is used as the format for a strftime call.
53-
#today_fmt = '%B %d, %Y'
64+
# today_fmt = '%B %d, %Y'
5465

5566
# List of documents that shouldn't be included in the build.
56-
#unused_docs = []
67+
# unused_docs = []
5768

5869
# List of directories, relative to source directory, that shouldn't be searched
5970
# for source files.
6071
exclude_trees = []
6172

6273
# The reST default role (used for this markup: `text`) to use for all documents.
63-
#default_role = None
74+
# default_role = None
6475

6576
# If true, '()' will be appended to :func: etc. cross-reference text.
66-
#add_function_parentheses = True
77+
# add_function_parentheses = True
6778

6879
# If true, the current module name will be prepended to all description
6980
# unit titles (such as .. function::).
70-
#add_module_names = True
81+
# add_module_names = True
7182

7283
# If true, sectionauthor and moduleauthor directives will be shown in the
7384
# output. They are ignored by default.
74-
#show_authors = False
85+
# show_authors = False
7586

7687
# The name of the Pygments (syntax highlighting) style to use.
77-
pygments_style = 'sphinx'
88+
pygments_style = "sphinx"
7889

7990
# A list of ignored prefixes for module index sorting.
80-
#modindex_common_prefix = []
91+
# modindex_common_prefix = []
8192

8293

8394
# -- Options for HTML output ---------------------------------------------------
@@ -94,106 +105,110 @@
94105
# further. For a list of options available for each theme, see the
95106
# documentation.
96107
html_theme_options = {
97-
'collapse_navigation': False,
98-
108+
"collapse_navigation": False,
99109
}
100110

101111
# Add any paths that contain custom themes here, relative to this directory.
102-
#html_theme_path = []
112+
# html_theme_path = []
103113

104114
# The name for this set of Sphinx documents. If None, it defaults to
105115
# "<project> v<release> documentation".
106-
#html_title = None
116+
# html_title = None
107117

108118
# A shorter title for the navigation bar. Default is the same as html_title.
109-
#html_short_title = None
119+
# html_short_title = None
110120

111121
# The name of an image file (relative to this directory) to place at the top
112122
# of the sidebar.
113-
#html_logo = None
123+
# html_logo = None
114124

115125
# The name of an image file (within the static path) to use as favicon of the
116126
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
117127
# pixels large.
118-
#html_favicon = None
128+
# html_favicon = None
119129

120130
# Add any paths that contain custom static files (such as style sheets) here,
121131
# relative to this directory. They are copied after the builtin static files,
122132
# so a file named "default.css" will overwrite the builtin "default.css".
123-
html_static_path = ['_static']
133+
html_static_path = ["_static"]
124134

125135
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
126136
# using the given strftime format.
127-
#html_last_updated_fmt = '%b %d, %Y'
137+
# html_last_updated_fmt = '%b %d, %Y'
128138

129139
# If true, SmartyPants will be used to convert quotes and dashes to
130140
# typographically correct entities.
131-
#html_use_smartypants = True
141+
# html_use_smartypants = True
132142

133143
# Custom sidebar templates, maps document names to template names.
134-
#html_sidebars = {}
144+
# html_sidebars = {}
135145

136146
# Additional templates that should be rendered to pages, maps page names to
137147
# template names.
138-
#html_additional_pages = {}
148+
# html_additional_pages = {}
139149

140150
# If false, no module index is generated.
141-
#html_use_modindex = True
151+
# html_use_modindex = True
142152

143153
# If false, no index is generated.
144-
#html_use_index = True
154+
# html_use_index = True
145155

146156
# If true, the index is split into individual pages for each letter.
147-
#html_split_index = False
157+
# html_split_index = False
148158

149159
# If true, links to the reST sources are added to the pages.
150-
#html_show_sourcelink = True
160+
# html_show_sourcelink = True
151161

152162
# If true, an OpenSearch description file will be output, and all pages will
153163
# contain a <link> tag referring to it. The value of this option must be the
154164
# base URL from which the finished HTML is served.
155-
#html_use_opensearch = ''
165+
# html_use_opensearch = ''
156166

157167
# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
158-
#html_file_suffix = ''
168+
# html_file_suffix = ''
159169

160170
# Output file base name for HTML help builder.
161-
htmlhelp_basename = 'jarvis-tools'
162-
171+
htmlhelp_basename = "jarvis-tools"
172+
# html_style = "css/mystyle.css"
163173

164174
# -- Options for LaTeX output --------------------------------------------------
165175

166176
# The paper size ('letter' or 'a4').
167-
#latex_paper_size = 'letter'
177+
# latex_paper_size = 'letter'
168178

169179
# The font size ('10pt', '11pt' or '12pt').
170-
#latex_font_size = '10pt'
180+
# latex_font_size = '10pt'
171181

172182
# Grouping the document tree into LaTeX files. List of tuples
173183
# (source start file, target name, title, author, documentclass [howto/manual]).
174184
latex_documents = [
175-
('index', 'jarvis-tools.tex', u'JARVIS-Tools Documentation',
176-
u'Kamal Choudhary', 'manual'),
185+
(
186+
"index",
187+
"jarvis-tools.tex",
188+
u"JARVIS-Tools Documentation",
189+
u"Kamal Choudhary",
190+
"manual",
191+
),
177192
]
178193

179194
# The name of an image file (relative to this directory) to place at the top of
180195
# the title page.
181-
#latex_logo = None
196+
# latex_logo = None
182197

183198
# For "manual" documents, if this is true, then toplevel headings are parts,
184199
# not chapters.
185-
#latex_use_parts = False
200+
# latex_use_parts = False
186201

187202
# Additional stuff for the LaTeX preamble.
188-
#latex_preamble = ''
203+
# latex_preamble = ''
189204

190205
# Documents to append as an appendix to all manuals.
191-
#latex_appendices = []
206+
# latex_appendices = []
192207

193208
# If false, no module index is generated.
194-
#latex_use_modindex = True
209+
# latex_use_modindex = True
195210

196211

197212
# Example configuration for intersphinx: refer to the Python standard library.
198-
intersphinx_mapping = {'http://docs.python.org/': None}
199-
language = 'en'
213+
intersphinx_mapping = {"http://docs.python.org/": None}
214+
language = "en"

0 commit comments

Comments
 (0)