Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doc update and switch to pip #8

Merged
merged 77 commits into from
May 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
9ad1d95
DOCS: Introduce autosummary
Mar 9, 2019
b695b33
Test removing _autosumm folder
Mar 13, 2019
4985710
DOC: Move autosummary to init
Mar 13, 2019
e5e0faa
DOC: Try to add path
Mar 13, 2019
056702f
DOCS: Show path
Mar 13, 2019
e4cb99e
Also add spaudiopy folder
Mar 13, 2019
b4b8109
Comment out more
Mar 13, 2019
5304266
Docs: Use automodule
Mar 13, 2019
e921a69
Does this help?
Mar 13, 2019
4cfc150
Minimal
Mar 13, 2019
692fddc
Add toctree
Mar 13, 2019
e75b23f
Try this
Mar 13, 2019
dddc4a8
Try Conda
Mar 13, 2019
f256f6a
Fix conda
Mar 13, 2019
a047b85
Add requirements file
Mar 13, 2019
eddcb45
Remove plotly
Mar 13, 2019
b235095
Try without conda
Mar 13, 2019
ff6bdd7
RM environment
Mar 13, 2019
41081be
Add paths again
Mar 13, 2019
3edaa95
More paths
Mar 13, 2019
36d9673
Try this
Mar 13, 2019
ccb28dc
Bump Sphinx
Mar 13, 2019
2ad7349
Try conda again
Mar 13, 2019
feb27ba
Try latest image
Mar 13, 2019
ec859d6
Cleanup
Mar 13, 2019
b997a40
Merge branch 'master' into doc_update
Jun 26, 2019
7b6065d
Update to conf V2
Jun 26, 2019
e513ea9
Fix conda rtd environment
Jun 26, 2019
3308659
Include matplotlib plot to doc
Jul 1, 2019
fcc98b6
Fix mpl
Jul 1, 2019
e58976e
Include precode explicitly
Jul 1, 2019
8266464
Add doc to decoders.
Jul 3, 2019
a3e36b0
Try to fix mpl
Jul 3, 2019
09ba70b
Restrict matplotlib to <3.1
Jul 3, 2019
5f8622b
Also restrict mpl in setup.py
Jul 3, 2019
2371deb
Also exclude subversions
Jul 3, 2019
71df073
Update default hrir handling and docs
Jul 3, 2019
6cd8934
Fix typo
Jul 3, 2019
3acc700
Use conext and plot grids
Jul 3, 2019
46d169a
Restrict quadpy
Jul 3, 2019
25d3a30
Add SH plot
Jul 3, 2019
14c3269
Show decorated functions
Jul 3, 2019
62f1d18
Merge branch 'master' into doc_update
chris-hld Feb 21, 2020
f08aa3e
ignore data folder
chris-hld Feb 21, 2020
9b9146d
rm from docs deps
chris-hld Feb 21, 2020
10d232a
Update reqs
chris-hld Feb 21, 2020
68fda8b
Use conda defaults
chris-hld Feb 21, 2020
44b3c91
Use only defaults
chris-hld Feb 21, 2020
65cb1a8
Remove backup lebedev
chris-hld Feb 21, 2020
7e54240
Update conf.py
chris-hld Apr 30, 2020
2b64b78
Merge branch 'master' into doc_update
chris-hld Apr 30, 2020
a55ae50
Create plot3d.py
chris-hld Apr 30, 2020
4f01654
Update readthedocs-environment.yml
chris-hld Apr 30, 2020
97f61db
Update readthedocs-environment.yml
chris-hld Apr 30, 2020
c594bcb
Update readthedocs-environment.yml
chris-hld May 4, 2020
6db3a4b
Update .readthedocs.yml
chris-hld May 4, 2020
b93be52
Use sphinx < 3.0
chris-hld May 4, 2020
3c7521a
Update readthedocs-environment.yml
chris-hld May 5, 2020
86a362b
Update .gitignore
chris-hld May 5, 2020
e3ba8d1
Switch to pip
chris-hld May 5, 2020
3b8e481
Update requirements.txt
chris-hld May 5, 2020
272339f
Update conf.py
chris-hld May 5, 2020
e679748
Update conf.py
chris-hld May 5, 2020
36d37c9
Update conf.py
chris-hld May 5, 2020
787dd59
Delete plot3d.py
chris-hld May 5, 2020
77833cb
Delete readthedocs-environment.yml
chris-hld May 5, 2020
124e000
Revert "DOC: Use (experimental) contrained_layout in plots"
chris-hld May 5, 2020
56cc84c
Update conf.py
chris-hld May 5, 2020
384aec7
Update conf.py
chris-hld May 6, 2020
0d3afae
Update plots.py
chris-hld May 6, 2020
04a0c88
Doc plot updates
chris-hld May 6, 2020
887b096
Update process.py
chris-hld May 6, 2020
78ee959
Update conf.py
chris-hld May 6, 2020
4b91cc3
Update grids.py
chris-hld May 6, 2020
f047267
Update grids.py
chris-hld May 6, 2020
4cee6e0
Update sph.py
chris-hld May 6, 2020
e7dd9e6
Update conf.py
chris-hld May 6, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,6 @@ venv.bak/

# mypy
.mypy_cache/

# editor configs
.vscode/
13 changes: 8 additions & 5 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ build:
# Optionally build your docs in additional formats such as PDF and ePub
formats: all

conda:
environment: docs/readthedocs-environment.yml
#conda:
# environment: docs/readthedocs-environment.yml

# Optionally set the version of Python and requirements required to build your docs
python:
install:
- method: pip
path: .
version: 3.6
install:
- requirements: docs/requirements.txt
- method: pip
path: .
9 changes: 0 additions & 9 deletions docs/readthedocs-environment.yml

This file was deleted.

5 changes: 5 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Sphinx>=2.4,<3.0
Sphinx-RTD-Theme

NumPy
matplotlib<3.1.0
31 changes: 16 additions & 15 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@


sys.path.insert(0, os.path.abspath('../../'))
#print('\n'.join(sys.path))
# print('\n'.join(sys.path))

# -- Project information -----------------------------------------------------

Expand All @@ -27,7 +27,7 @@
author = 'Chris Hold'

# The short X.Y version.
#version = '0.0.0'
# version = '0.0.0'
# The full version, including alpha/beta/rc tags.
try:
release = check_output(['git', 'describe', '--tags', '--always'])
Expand All @@ -39,7 +39,7 @@
# -- General configuration ---------------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
needs_sphinx = '1.3' # for sphinx.ext.napoleon
needs_sphinx = '1.3' # for sphinx.ext.napoleon

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
Expand All @@ -55,7 +55,7 @@

# autodoc
autodoc_default_options = {
'members' : None,
'members': None,
'undoc-members': None,
'member-order': 'bysource',
'special-members': '__init__',
Expand Down Expand Up @@ -85,10 +85,11 @@
# matplotlib inline plots
plot_include_source = True
plot_html_show_source_link = False
plot_html_show_formats = False
plot_pre_code = ''
plot_rcparams = {'figure.figsize': (8, 4.5), }
plot_formats = ['svg', 'pdf', ('png', 96)]
# plot_html_show_formats = False
# plot_pre_code = ''
# plot_rcparams = {'figure.figsize': (8, 4.5),
# }
# plot_formats = ['svg', 'pdf', ('png', 96)]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
Expand All @@ -107,7 +108,7 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
#language = None
# language = None

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand All @@ -134,7 +135,7 @@
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
#html_static_path = ['_static']
# html_static_path = ['_static']

# Custom sidebar templates, must be a dictionary that maps document names
# to template names.
Expand Down Expand Up @@ -197,11 +198,11 @@
# Grouping the document tree into Texinfo files. List of tuples
# (source start file, target name, title, author,
# dir menu entry, description, category)
#texinfo_documents = [
# (master_doc, 'spaudiopy', 'spaudiopy Documentation',
# author, 'spaudiopy', 'One line description of project.',
# 'Miscellaneous'),
#]
# texinfo_documents = [
# (master_doc, 'spaudiopy', 'spaudiopy Documentation',
# author, 'spaudiopy', 'One line description of project.',
# 'Miscellaneous'),
# ]


# -- Options for Epub output -------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion spaudiopy/IO.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import numpy as np
import matplotlib.pyplot as plt
plt.rcParams['figure.constrained_layout.use'] = True
plt.rcParams['axes.grid'] = True

import spaudiopy as spa
Expand Down
1 change: 0 additions & 1 deletion spaudiopy/decoder.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import numpy as np
import matplotlib.pyplot as plt
plt.rcParams['figure.constrained_layout.use'] = True
plt.rcParams['axes.grid'] = True

import spaudiopy as spa
Expand Down
1 change: 0 additions & 1 deletion spaudiopy/grids.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import numpy as np
import matplotlib.pyplot as plt
plt.rcParams['figure.constrained_layout.use'] = True
plt.rcParams['axes.grid'] = True

import spaudiopy as spa
Expand Down
5 changes: 2 additions & 3 deletions spaudiopy/plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import numpy as np
import matplotlib.pyplot as plt
plt.rcParams['figure.constrained_layout.use'] = True
plt.rcParams['axes.grid'] = True

import spaudiopy as spa
Expand Down Expand Up @@ -373,7 +372,7 @@ def hull(hull, simplices=None, mark_invalid=True, title=None, lim_m=1,
y = hull.points[:, 1]
z = hull.points[:, 2]

fig = plt.figure()
fig = plt.figure(constrained_layout=True)
ax = fig.gca(projection='3d', aspect='equal')

# valid
Expand Down Expand Up @@ -415,7 +414,7 @@ def hull_normals(hull, plot_face_normals=True, plot_vertex_normals=True):
y = hull.points[:, 1]
z = hull.points[:, 2]

fig = plt.figure()
fig = plt.figure(constrained_layout=True)
ax = fig.gca(projection='3d', aspect='equal')
ax.plot_trisurf(x, y, z,
triangles=hull.simplices,
Expand Down
6 changes: 3 additions & 3 deletions spaudiopy/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import numpy as np
import matplotlib.pyplot as plt
plt.rcParams['figure.constrained_layout.use'] = True
plt.rcParams['axes.grid'] = True

import spaudiopy as spa
Expand Down Expand Up @@ -259,9 +258,10 @@ def frac_octave_filterbank(n, N_out, fs, f_low, f_high=None, mode='energy',

fs = 44100
N = 2**16
gs, ff = spa.process.frac_octave_filterbank(n=1, N_out=N, fs=fs, f_low=100, f_high=8000)
gs, ff = spa.process.frac_octave_filterbank(n=1, N_out=N, fs=fs,
f_low=100, f_high=8000)
f = np.linspace(0, fs//2, N)
fig, ax = plt.subplots(2, 1)
fig, ax = plt.subplots(2, 1, constrained_layout=True)
ax[0].semilogx(f, gs.T)
ax[0].set_title('Band gains')
ax[1].semilogx(f, np.sum(np.abs(gs)**2, axis=0))
Expand Down
1 change: 0 additions & 1 deletion spaudiopy/sdm.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import numpy as np
import matplotlib.pyplot as plt
plt.rcParams['figure.constrained_layout.use'] = True
plt.rcParams['axes.grid'] = True

import spaudiopy as spa
Expand Down
1 change: 0 additions & 1 deletion spaudiopy/sig.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import numpy as np
import matplotlib.pyplot as plt
plt.rcParams['figure.constrained_layout.use'] = True
plt.rcParams['axes.grid'] = True

import spaudiopy as spa
Expand Down
7 changes: 5 additions & 2 deletions spaudiopy/sph.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import numpy as np
import matplotlib.pyplot as plt
plt.rcParams['figure.constrained_layout.use'] = True
plt.rcParams['axes.grid'] = True

import spaudiopy as spa
Expand Down Expand Up @@ -576,7 +575,11 @@ def binaural_coloration_compensation(N, f, r_0=0.0875, w_taper=None):
Returns
-------
gain : array_like
Filter gain(kr). See also 'process.gain_clipping'.
Filter gain(kr).

See Also
--------
process.gain_clipping : Limit maximum gain

References
----------
Expand Down
1 change: 0 additions & 1 deletion spaudiopy/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import numpy as np
import matplotlib.pyplot as plt
plt.rcParams['figure.constrained_layout.use'] = True
plt.rcParams['axes.grid'] = True

import spaudiopy as spa
Expand Down