From 3a230f1668f94c29e4301691dd02490beceaa24d Mon Sep 17 00:00:00 2001 From: Julia Sprenger Date: Wed, 31 Jul 2019 12:39:43 +0200 Subject: [PATCH 1/2] update sphinx dependencies --- doc/environment.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/environment.yml b/doc/environment.yml index 34cd269..af1f85f 100644 --- a/doc/environment.yml +++ b/doc/environment.yml @@ -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 \ No newline at end of file + - sphinx-rtd-theme From 5c86d37e9288605ada424fc92b3a4313532c130e Mon Sep 17 00:00:00 2001 From: Julia Sprenger Date: Thu, 1 Aug 2019 16:20:11 +0200 Subject: [PATCH 2/2] Minor layout fixes in jupyter nb --- .../tutorial-1_scenarios/demo_scenarios.ipynb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tutorials/tutorial-1_scenarios/demo_scenarios.ipynb b/tutorials/tutorial-1_scenarios/demo_scenarios.ipynb index cc2cb4d..6bb730e 100644 --- a/tutorials/tutorial-1_scenarios/demo_scenarios.ipynb +++ b/tutorials/tutorial-1_scenarios/demo_scenarios.ipynb @@ -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 | | float |\n", + "| | Weight | | g | float |\n", + "| | Date | | | date |\n", + "| | Comment | | | string |" ] }, { @@ -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)" ] }, { @@ -608,7 +608,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.6.5" + "version": "3.7.2" } }, "nbformat": 4,