Skip to content

Commit ade46c2

Browse files
stefanvstefanv
committed
Move workshops into new dir. Add index for SciPy2018.
1 parent 5498206 commit ade46c2

32 files changed

+299
-348
lines changed

‎check_setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import sys
2+
import os
23
from distutils.version import LooseVersion
34

45
if sys.version_info.major < 3:
@@ -7,7 +8,7 @@
78

89
sys.exit(1)
910

10-
with open('requirements.txt') as f:
11+
with open(os.path.join(os.path.dirname(__file__), 'requirements.txt')) as f:
1112
reqs = f.readlines()
1213

1314
reqs = [(pkg, ver) for (pkg, _, ver) in
@@ -39,4 +40,3 @@
3940
print('[{}] {:<11} {}'.format(
4041
status, pkg.ljust(13), version_installed)
4142
)
42-

‎index.ipynb

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@
1313
"cell_type": "markdown",
1414
"metadata": {},
1515
"source": [
16-
"# Conferences\n",
16+
"# Events\n",
1717
"\n",
18-
"- [SciPy 2014](2014-scipy/000_index.ipynb)\n",
19-
"- [EuroSciPy 2014](2014-euroscipy/index.ipynb)\n",
20-
"- [SciPy 2015](2015-scipy/index.ipynb)"
18+
"[Workshop teaching schedules](workshop/)"
2119
]
2220
},
2321
{
@@ -34,23 +32,23 @@
3432
],
3533
"metadata": {
3634
"kernelspec": {
37-
"display_name": "Python 2",
35+
"display_name": "Python 3",
3836
"language": "python",
39-
"name": "python2"
37+
"name": "python3"
4038
},
4139
"language_info": {
4240
"codemirror_mode": {
4341
"name": "ipython",
44-
"version": 2
42+
"version": 3
4543
},
4644
"file_extension": ".py",
4745
"mimetype": "text/x-python",
4846
"name": "python",
4947
"nbconvert_exporter": "python",
50-
"pygments_lexer": "ipython2",
51-
"version": "2.7.9"
48+
"pygments_lexer": "ipython3",
49+
"version": "3.6.6rc1"
5250
}
5351
},
5452
"nbformat": 4,
55-
"nbformat_minor": 0
53+
"nbformat_minor": 1
5654
}

‎lectures/00_images_are_arrays.ipynb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@
88
"To participate, you'll need to git clone (or download the .zip from GitHub):\n",
99
"\n",
1010
"<p>https://github.com/scikit-image/skimage-tutorials</p>\n",
11+
"</div>\n",
1112
"\n",
13+
"<p>You can do that in git using:</p>\n",
14+
"\n",
15+
"<pre>git clone --depth=1 https://github.com/scikit-image/skimage-tutorials</pre>\n",
16+
"\n",
17+
"<div style='font-size: 200%; line-height: 1.5;'>\n",
1218
"If you have already cloned the material, please issue `git pull` now and reload the notebook to ensure that you have the latest updates.\n",
1319
"</div>"
1420
]

‎2014-euroscipy/index.ipynb renamed to ‎workshops/2014-euroscipy/index.ipynb

Lines changed: 11 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@
4949
"\n",
5050
"For convenience, we have divided this tutorial into several chapters, linked below. Throughout the tutorials, feel free to ask questions. We want you to come away confident in your image analysis skills!\n",
5151
"\n",
52-
"- [Images are just numpy arrays](../lectures/00_images_are_arrays.ipynb)\n",
53-
"- [Color and exposure](../lectures/0_color_and_exposure.ipynb) [briefly cover]\n",
54-
"- [Segmentation](../lectures/4_segmentation.ipynb)\n",
55-
"- [Real world example: panorama stitching](../lectures/example_pano.ipynb)\n",
52+
"- [Images are just numpy arrays](../../lectures/00_images_are_arrays.ipynb)\n",
53+
"- [Color and exposure](../../lectures/0_color_and_exposure.ipynb) [briefly cover]\n",
54+
"- [Segmentation](../../lectures/4_segmentation.ipynb)\n",
55+
"- [Real world example: panorama stitching](../../lectures/example_pano.ipynb)\n",
5656
"- Exercises and further demos, if there's time\n",
5757
"\n",
58-
"More lectures [here](../lectures) and [here](http://scipy-lectures.github.io).\n",
58+
"More lectures [here](../../lectures) and [here](http://scipy-lectures.github.io).\n",
5959
"\n",
6060
"## Improv time!\n",
6161
"\n",
@@ -70,152 +70,27 @@
7070
"- [Contribute!](https://github.com/scikit-image/scikit-image/blob/master/CONTRIBUTING.txt)\n",
7171
"- If you find it useful: cite [our paper](https://peerj.com/articles/453/)!"
7272
]
73-
},
74-
{
75-
"cell_type": "markdown",
76-
"metadata": {},
77-
"source": [
78-
"---\n",
79-
"\n",
80-
"<div style=\"height: 400px;\"></div>"
81-
]
82-
},
83-
{
84-
"cell_type": "code",
85-
"execution_count": 6,
86-
"metadata": {
87-
"collapsed": false
88-
},
89-
"outputs": [
90-
{
91-
"data": {
92-
"text/html": [
93-
"<style>\n",
94-
".rendered_html {\n",
95-
" font-family: Georgia, serif;\n",
96-
" font-size: 130%;\n",
97-
" line-height: 1.5;\n",
98-
"}\n",
99-
"\n",
100-
".input {\n",
101-
" width: 930px;\n",
102-
"}\n",
103-
"\n",
104-
".inner_cell {\n",
105-
" width: 800px;\n",
106-
"}\n",
107-
"\n",
108-
".code_cell {\n",
109-
" width: 800px;\n",
110-
"}\n",
111-
"\n",
112-
".CodeMirror-sizer {\n",
113-
"}\n",
114-
"\n",
115-
"hr {\n",
116-
" border: 1px solid #DDD;\n",
117-
"}\n",
118-
"\n",
119-
".rendered_html h1 {\n",
120-
" margin: 0.25em 0em 0.5em;\n",
121-
" font-family: sans-serif;\n",
122-
" color: #015C9C;\n",
123-
" text-align: center;\n",
124-
" line-height: 1.2;\n",
125-
" page-break-before: always;\n",
126-
"}\n",
127-
"\n",
128-
".rendered_html h2 {\n",
129-
" margin: 1.1em 0em 0.5em;\n",
130-
" font-family: sans-serif;\n",
131-
" color: #26465D;\n",
132-
" line-height: 1.2;\n",
133-
"}\n",
134-
"\n",
135-
".rendered_html h3 {\n",
136-
" font-family: sans-serif;\n",
137-
" margin: 1.1em 0em 0.5em;\n",
138-
" color: #002845;\n",
139-
" line-height: 1.2;\n",
140-
"}\n",
141-
"\n",
142-
".rendered_html li {\n",
143-
" line-height: 1.5;\n",
144-
"}\n",
145-
"\n",
146-
".CodeMirror-lines {\n",
147-
" font-size: 110%;\n",
148-
" line-height: 1.4em;\n",
149-
" font-family: DejaVu Sans Mono, Consolas, Ubuntu, monospace;\n",
150-
"}\n",
151-
"\n",
152-
"h1.bigtitle {\n",
153-
" margin: 4cm 1cm 4cm 1cm;\n",
154-
" font-size: 300%;\n",
155-
"}\n",
156-
"\n",
157-
"h3.point {\n",
158-
" font-size: 200%;\n",
159-
" text-align: center;\n",
160-
" margin: 2em 0em 2em 0em;\n",
161-
" #26465D\n",
162-
"}\n",
163-
"\n",
164-
".logo {\n",
165-
" margin: 20px 0 20px 0;\n",
166-
"}\n",
167-
"\n",
168-
"a.anchor-link {\n",
169-
" display: none;\n",
170-
"}\n",
171-
"\n",
172-
"h1.title {\n",
173-
" font-size: 250%;\n",
174-
"}\n",
175-
"\n",
176-
".exercize {\n",
177-
" color: #738;\n",
178-
"}\n",
179-
"\n",
180-
"h2 .exercize {\n",
181-
" font-style: italic;\n",
182-
"}\n",
183-
"\n",
184-
"</style>"
185-
],
186-
"text/plain": [
187-
"<IPython.core.display.HTML object>"
188-
]
189-
},
190-
"metadata": {},
191-
"output_type": "display_data"
192-
}
193-
],
194-
"source": [
195-
"%reload_ext load_style\n",
196-
"%load_style ../themes/tutorial.css"
197-
]
19873
}
19974
],
20075
"metadata": {
20176
"kernelspec": {
202-
"display_name": "Python 2",
77+
"display_name": "Python 3",
20378
"language": "python",
204-
"name": "python2"
79+
"name": "python3"
20580
},
20681
"language_info": {
20782
"codemirror_mode": {
20883
"name": "ipython",
209-
"version": 2
84+
"version": 3
21085
},
21186
"file_extension": ".py",
21287
"mimetype": "text/x-python",
21388
"name": "python",
21489
"nbconvert_exporter": "python",
215-
"pygments_lexer": "ipython2",
216-
"version": "2.7.9"
90+
"pygments_lexer": "ipython3",
91+
"version": "3.6.6rc1"
21792
}
21893
},
21994
"nbformat": 4,
220-
"nbformat_minor": 0
95+
"nbformat_minor": 1
22196
}

‎2014-euroscipy/load_style.py renamed to ‎workshops/2014-euroscipy/load_style.py

File renamed without changes.

‎2014-scipy/000_index.ipynb renamed to ‎workshops/2014-scipy/000_index.ipynb

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@
5656
"\n",
5757
"For convenience, we have divided this tutorial into several chapters, linked below. Throughout the tutorials, feel free to ask questions. We want you to come away confident in your image analysis skills!\n",
5858
"\n",
59-
"- [Images are just NumPy arrays](../lectures/00_images_are_arrays.ipynb)\n",
60-
"- [Color and exposure](../lectures/0_color_and_exposure.ipynb)\n",
61-
"- [Image filters](../lectures/1_image_filters.ipynb)\n",
62-
"- [Feature detection](../lectures/2_feature_detection.ipynb)\n",
63-
"- [Morphological operations](../lectures/3_morphological_operations.ipynb)\n",
64-
"- [Segmentation](../lectures/4_segmentation.ipynb)\n",
65-
"- [Advanced example: measuring fluorescence intensity on chromosomes](../lectures/adv0_chromosomes.ipynb)\n",
66-
"- [Advanced example: measuring intensity along a microscopy image](../lectures/adv1-lesion-quantification.ipynb)\n",
59+
"- [Images are just NumPy arrays](../../lectures/00_images_are_arrays.ipynb)\n",
60+
"- [Color and exposure](../../lectures/0_color_and_exposure.ipynb)\n",
61+
"- [Image filters](../../lectures/1_image_filters.ipynb)\n",
62+
"- [Feature detection](../../lectures/2_feature_detection.ipynb)\n",
63+
"- [Morphological operations](../../lectures/3_morphological_operations.ipynb)\n",
64+
"- [Segmentation](../../lectures/4_segmentation.ipynb)\n",
65+
"- [Advanced example: measuring fluorescence intensity on chromosomes](../../lectures/adv0_chromosomes.ipynb)\n",
66+
"- [Advanced example: measuring intensity along a microscopy image](../../lectures/adv1-lesion-quantification.ipynb)\n",
6767
"\n",
6868
"# Improv time!\n",
6969
"\n",
@@ -82,23 +82,23 @@
8282
],
8383
"metadata": {
8484
"kernelspec": {
85-
"display_name": "Python 2",
85+
"display_name": "Python 3",
8686
"language": "python",
87-
"name": "python2"
87+
"name": "python3"
8888
},
8989
"language_info": {
9090
"codemirror_mode": {
9191
"name": "ipython",
92-
"version": 2
92+
"version": 3
9393
},
9494
"file_extension": ".py",
9595
"mimetype": "text/x-python",
9696
"name": "python",
9797
"nbconvert_exporter": "python",
98-
"pygments_lexer": "ipython2",
99-
"version": "2.7.9"
98+
"pygments_lexer": "ipython3",
99+
"version": "3.6.6rc1"
100100
}
101101
},
102102
"nbformat": 4,
103-
"nbformat_minor": 0
103+
"nbformat_minor": 1
104104
}

‎2014-scipy/README.md renamed to ‎workshops/2014-scipy/README.md

File renamed without changes.

‎2014-scipy/check_env.py renamed to ‎workshops/2014-scipy/check_env.py

File renamed without changes.

‎2014-scipy/fabfile.py renamed to ‎workshops/2014-scipy/fabfile.py

File renamed without changes.

‎2014-scipy/images/censure_example.png renamed to ‎workshops/2014-scipy/images/censure_example.png

File renamed without changes.

0 commit comments

Comments
 (0)