Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 184e850

Browse files
author
Michael J Fadem
committedSep 21, 2021
Merge branch 'hotfix/tutorial_module' into 'main'
Hotfix/Tutorial Module See merge request trajectory/tracktable!252
2 parents c135a25 + 4e89795 commit 184e850

File tree

6 files changed

+106
-25
lines changed

6 files changed

+106
-25
lines changed
 

‎Documentation/conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
7676
'sphinx.ext.napoleon',
7777
'sphinx.ext.todo',
7878
'sphinx.ext.viewcode',
79+
'sphinx.ext.graphviz',
80+
# 'sphinxcontrib.video',
7981
'breathe',
8082
'nbsphinx',
8183
'nbsphinx_link'

‎environment.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,12 @@ channels:
44
- defaults
55
dependencies:
66
- python=3.8
7-
- cartopy
8-
- folium
7+
- pip
8+
- tracktable
99
- ipykernel
10-
- matplotlib
11-
- numpy
1210
- pandoc
13-
- pip
14-
- pykdtree
15-
- pyshp
16-
- pytz
17-
- scipy
18-
- sphinx
11+
- sphinx<4.1.0 # Issues with C++ and templates with newer versions
1912
- pip:
2013
- breathe
2114
- nbsphinx
22-
- nbsphinx-link
23-
- tracktable
15+
- nbsphinx-link

‎tracktable/Python/tracktable/CMakeLists.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,25 +104,25 @@ file(GLOB tutorial_notebooks "examples/tutorials/*.ipynb")
104104
install(
105105
FILES ${tutorial_notebooks}
106106
DESTINATION ${PYTHON_INSTALL_PREFIX}/examples/tutorials
107-
)
107+
)
108108

109109
file(GLOB tutorial_helpers "examples/tutorials/*.py")
110-
install(
111-
FILES ${tutorial_helpers}
112-
DESTINATION ${PYTHON_INSTALL_PREFIX}/examples/tutorials
113-
)
110+
install(
111+
FILES ${tutorial_helpers}
112+
DESTINATION ${PYTHON_INSTALL_PREFIX}/examples/tutorials
113+
)
114114

115115
file(GLOB analytic_demo_notebooks "examples/analytic_demos/*.ipynb")
116-
install(
117-
FILES ${analytic_demo_notebooks}
118-
DESTINATION ${PYTHON_INSTALL_PREFIX}/examples/analytic_demos
119-
)
116+
install(
117+
FILES ${analytic_demo_notebooks}
118+
DESTINATION ${PYTHON_INSTALL_PREFIX}/examples/analytic_demos
119+
)
120120

121121
file(GLOB analytic_demo_images "examples/analytic_demos/demo_images/*.*")
122-
install(
123-
FILES ${analytic_demo_images}
124-
DESTINATION ${PYTHON_INSTALL_PREFIX}/examples/analytic_demos/demo_images
125-
)
122+
install(
123+
FILES ${analytic_demo_images}
124+
DESTINATION ${PYTHON_INSTALL_PREFIX}/examples/analytic_demos/demo_images
125+
)
126126

127127
file(GLOB example_data_files "examples/data/*.*")
128128
install(
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Copyright (c) 2017-2020, National Technology & Engineering Solutions of
2+
# Sandia, LLC (NTESS).
3+
# All rights reserved.
4+
#
5+
# Redistribution and use in source and binary forms, with or without
6+
# modification, are permitted provided that the following conditions
7+
# are met:
8+
#
9+
# 1. Redistributions of source code must retain the above copyright
10+
# notice, this list of conditions and the following disclaimer.
11+
#
12+
# 2. Redistributions in binary form must reproduce the above copyright
13+
# notice, this list of conditions and the following disclaimer in the
14+
# documentation and/or other materials provided with the distribution.
15+
#
16+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
17+
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
18+
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
19+
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
20+
# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
21+
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
22+
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23+
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
24+
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25+
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
26+
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27+
# POSSIBILITY OF SUCH DAMAGE.
28+
29+
pass
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Copyright (c) 2017-2020, National Technology & Engineering Solutions of
2+
# Sandia, LLC (NTESS).
3+
# All rights reserved.
4+
#
5+
# Redistribution and use in source and binary forms, with or without
6+
# modification, are permitted provided that the following conditions
7+
# are met:
8+
#
9+
# 1. Redistributions of source code must retain the above copyright
10+
# notice, this list of conditions and the following disclaimer.
11+
#
12+
# 2. Redistributions in binary form must reproduce the above copyright
13+
# notice, this list of conditions and the following disclaimer in the
14+
# documentation and/or other materials provided with the distribution.
15+
#
16+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
17+
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
18+
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
19+
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
20+
# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
21+
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
22+
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23+
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
24+
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25+
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
26+
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27+
# POSSIBILITY OF SUCH DAMAGE.
28+
29+
pass
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Copyright (c) 2017-2020, National Technology & Engineering Solutions of
2+
# Sandia, LLC (NTESS).
3+
# All rights reserved.
4+
#
5+
# Redistribution and use in source and binary forms, with or without
6+
# modification, are permitted provided that the following conditions
7+
# are met:
8+
#
9+
# 1. Redistributions of source code must retain the above copyright
10+
# notice, this list of conditions and the following disclaimer.
11+
#
12+
# 2. Redistributions in binary form must reproduce the above copyright
13+
# notice, this list of conditions and the following disclaimer in the
14+
# documentation and/or other materials provided with the distribution.
15+
#
16+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
17+
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
18+
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
19+
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
20+
# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
21+
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
22+
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23+
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
24+
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25+
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
26+
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27+
# POSSIBILITY OF SUCH DAMAGE.
28+
29+
pass

0 commit comments

Comments
 (0)
Please sign in to comment.