Skip to content

Commit

Permalink
Merge pull request #106 from JuliaSprenger/fix/doc_v1
Browse files Browse the repository at this point in the history
same as #105
  • Loading branch information
JuliaSprenger authored Aug 1, 2019
2 parents c5e4a4f + 5c86d37 commit 2a68e88
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
13 changes: 7 additions & 6 deletions doc/environment.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name: odmltables
dependencies:
- python=3.5.1=0
- setuptools=20.3=py35_0
- snowballstemmer=1.2.1=py35_0
- sphinx=1.3.5=py35_0
- sphinx_rtd_theme=0.1.9=py35_0
- python=3.7
- setuptools
- snowballstemmer
- sphinx
- sphinx_rtd_theme
- pip
- pip:
- odml
- sphinx-rtd-theme
- sphinx-rtd-theme
16 changes: 8 additions & 8 deletions tutorials/tutorial-1_scenarios/demo_scenarios.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"| Section | Measure | Value | Unit | Type |\n",
"|----------------------------|--------------|-------|------|--------|\n",
"| /Subject/Scores_YYYY-MM-DD | Experimenter | Alice | | float |\n",
"| | Weight | | g | float |\n",
"| | Date | | | date |\n",
"| | Comment | | | string |"
"| Section | Measure | Value | Unit | Type |\n",
"|----------------------------|--------------|---------|---------|--------|\n",
"| /Subject/Scores_YYYY-MM-DD | Experimenter | Alice | <i></i> | float |\n",
"| <i></i> | Weight | <i></i> | g | float |\n",
"| <i></i> | Date | <i></i> | <i></i> | date |\n",
"| <i></i> | Comment | <i></i> | <i></i> | string |"
]
},
{
Expand All @@ -53,7 +53,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"![Screenshot%20from%202018-11-05%2013-47-44.png](attachment:Screenshot%20from%202018-11-05%2013-47-44.png)"
"![Screenshot%20from%202018-11-05%2013-47-44.png](pictures/Screenshot%20from%202018-11-05%2013-47-44.png)"
]
},
{
Expand Down Expand Up @@ -608,7 +608,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.5"
"version": "3.7.2"
}
},
"nbformat": 4,
Expand Down

0 comments on commit 2a68e88

Please sign in to comment.