Importing more testing materials from THW

W. Trevor King: After hunting around for the source of the original
55bb6b2, I built this merge with:

  $ echo 55bb6b2882f32ecf9fb5bf9ff7c6258afd116522 \
  >   8d0def440ded7b9d5ee98500afd680fccc00d4a0 \
  >   3f530de51871e113922b96f87b668de4dc544cd6 \
  >   b22b30ba4415da04819e60cc20a4ff916307c9d9 > .git/info/grafts
  $ git checkout -b test-bc-thw 55bb6b2882f32ecf9fb5bf9ff7c6258afd116522
  $ git filter-branch
  $ rm .git/info/grafts

Then I removed the files we didn't want from 55bb6b2, with special
handling to avoid the shell-sensitive quote in
lessons/thw-python-debugging/conways_game_of_life/Conway's.

  $ git rm -rf lessons/thw-python-debugging/
  $ git rm -rf --ignore-unmatch $(git ls-tree -r --name-only HEAD | grep -v thw-testing)

Squash that into the original merge:

  $ git commit -a --amend

Did we miss anything?

  $ HASH=$(git rev-parse --short HEAD)
  $ for FILE in $(git ls-tree -r --name-only HEAD); do
  >   git blame -- "$FILE" | grep "$HASH";
  > done

Nope.

mean sightings as a standalone script

fix func name for get_sightings

TDD

fix mean_sightings

make_sightings -> mean_sightings

fix typos

Add capitalization to loop code

Update testing lesson

Add capitalization correction to loop function

Replace Owl with focusanimal variable

Change name of master test file so nose ignores

Fix typo in docstring

Fixing typos in material imported from THW

W. Trevor King: I dropped everything from the original e19d4dd except
for the lessons/thw-testing/tutorial.md modification.

Conflicts:
lessons/thw-git/local.md
lessons/thw-git/remote.md
lessons/thw-matplotlib/tutorial.md
lessons/thw-numpy/tutorial.md
lessons/thw-python/data-structures/data_structures.ipynb
lessons/thw-python/data-structures/tutorial.md
lessons/thw-python/flow-control/python_flow_control.ipynb
lessons/thw-shell/tutorial.md

Importing more material from The Hacker Within

W. Trevor King: I dropped everything from the original 6e7b321 except
for the lessons/thw-testing/ renames.

Conflicts:
lessons/index.html
lessons/thw-python-debugging/basic_exceptions/index_error.py
lessons/thw-python-debugging/basic_exceptions/io_error.py
lessons/thw-python-debugging/basic_exceptions/key_error.py
lessons/thw-python-debugging/basic_exceptions/name_error.py
lessons/thw-python-debugging/basic_exceptions/syntax_error.py
lessons/thw-python-debugging/basic_exceptions/type_error.py
lessons/thw-python-debugging/basic_exceptions/value_error.py
lessons/thw-python-debugging/conways_game_of_life/1_conway_pre_linted.py
lessons/thw-python-debugging/conways_game_of_life/2_conway_pre_formatted.py
lessons/thw-python-debugging/conways_game_of_life/3_conway_pre_debugged.py
lessons/thw-python-debugging/conways_game_of_life/4_conway_pre_profiled.py
lessons/thw-python-debugging/conways_game_of_life/5_conway_final.py
lessons/thw-python-debugging/conways_game_of_life/Conway's Game of Life - Debugging Example.ipynb
lessons/thw-python-debugging/examples/linting_example.py
lessons/thw-python-debugging/examples/pdb_example.py
lessons/thw-python-debugging/examples/profiler_example.py
lessons/thw-python-debugging/examples/segfault.py
lessons/thw-python-debugging/examples/style_example.py
lessons/thw-python-debugging/tutorial.md

Merge pull request #61 from benwaugh/master

Testing cheat sheet for #152

Replace partial list of Nose assertions with instructions for listing them in Python.

Tidy section on other assertions in Nose.

Move Python testing cheat sheet from testing/ to python/testing/.

Merge branch 'patch-1' of git://github.com/BernhardKonrad/boot-camps into BernhardKonrad-patch-1

Conflicts:
testing/cheat-sheet.md

Update cheat-sheet.md

minor layout changes

Update cheat-sheet.md

Fills in "Why testing", "TDD" and some "General advice".

Update cheat-sheet.md

Adds more todo's

Better title for Nose section in testing cheat sheet.

Remove outline of Unittest section since we normally just use Nose.

Add fixture examples to testing cheat sheet.

Example of using @raises to test the raising of an exception.

Add placeholder for testing exceptions in testing cheat sheet.

Add example floating point testing to cheat sheet.

Add example of another Nose assertion to cheat sheet.

Finish cheat sheet section on how Nose finds tests.

Turn testing cheat sheet into first draft of a real cheat sheet, instead of an overview of testing in Python.

Merge pull request #34 from pipitone/swc_exercises

Exercises from the Software Carpentry 4.0 website

Moved exercises into subfolders of the corresponding topics

W. Trevor King: I dropped everything from the original 39e0701 except
for the python/testing/exercises/test.markdown rename.

Conflicts:
python/data_structures/exercises/setdict.markdown
python/data_structures/exercises/setdict_dependencies.txt
python/intro/exercises/python.markdown
python/obj_orientation/exercises/oop.markdown
python/obj_orientation/exercises/oop_sushi.txt
python/regexp/exercises/regexp.markdown
python/sw_engineering/argparse_exercise.md
shell/exercises/1000gp.vcf
shell/exercises/shell.markdown
spreadsheets/exercises/spreadsheets.markdown
spreadsheets/exercises/spreadsheets_ex1.xls
spreadsheets/exercises/spreadsheets_ex2.xls
spreadsheets/exercises/spreadsheets_ex3.xls
sql/exercises/aggregation.markdown
sql/exercises/experiments.sqlite
sql/exercises/experiments_null.sqlite
sql/exercises/experiments_subqueries.sqlite
sql/exercises/filter.markdown
sql/exercises/intro.markdown
sql/exercises/join.markdown
sql/exercises/nobel_prizes.sqlite
sql/exercises/null.markdown
sql/exercises/select.markdown
sql/exercises/sort.markdown
sql/exercises/subqueries.markdown
version-control/svn/exercises/exercise_4.cgi
version-control/svn/exercises/planets.txt
version-control/svn/exercises/svn.markdown
version-control/svn/exercises/temperature.txt

Adding exercises from the Software Carpentry 4.0 website

W. Trevor King: I dropped everything from the original da170d3 except
for the exercises/test.markdown addition.  From Jon's initial pull
request [1]:

  Here are a bunch of exercises, markdown-ized, that we used to have
  as part of the website for various topics.

  I wasn't sure where to put them exactly, so I've created a new
  top-level folder for them, and placed them there, flatly. I've named
  things so that the assets for a page of exercises have the same file
  name prefix (e.g. vc.markdown, and vc_planets.txt).

[1]: https://github.com/swcarpentry/boot-camps/pull/34

Merge pull request #50 from benwaugh/master

Outline of testing section

First draft of testing and scripting lesson

Modify pop sizes

Sightings data for read/write exercises

Notebook to create animal sighting files

Script to make data_pops.csv table

Outline of contents for testing cheat sheet.

Draft outline of testing section.

removes answers accidentally added. These were flotsam/jetsam from live coding in the bootcamp.

removes answers accidentally added. These were flotsam/jetsam from live coding in the bootcamp.

removed deprecated exercises, moved recommendation answers to numpy folder, and
moved software engineering into python

W. Trevor King: I dropped everything from the original 69fa3b0 except
for the python/testing/ modification.

Conflicts:
python/numpy/engine/recommend.py
python/numpy/engine/segaran-recommend.py
python/numpy/long_exercise.rst
python/sw_engineering/README.rst
python/sw_engineering/animals.txt
python/sw_engineering/big_animals.txt
python/sw_engineering/dev_notes.rst
python/sw_engineering/dingwall_animals.txt
python/sw_engineering/fergus_animals.txt
python/sw_engineering/macguffin_animals.txt
python/sw_engineering/merida_animals.txt

removing header links

W. Trevor King: I dropped everything from the original 8fa8f85 except
for the python/testing/ modification.

Conflicts:
debugging/Readme.md

removed exercises.

added small exercise.

fixed readme where it imports assert_stuff from nose rather than nose.tools.

changes value to type error

trying to put forward and back on the same line.

first, not fist.

added some boldness.

katy is presenting

added readme from library section that @jiffyclub taught in berkeley.

moves testing into python, appropriately or not...

W. Trevor King: I dropped Readme1.md from the original 092cecd,
because I had not been cherry-picking its history.  It looked fairly
similar to the "Building a Library of Code you Trust" section of our
current README.

Conflicts:
python/testing/Readme1.md

fixed links in testing readme.

moved a lot of files to folders that will mesh with the directory structure intended for the master branch, in case we merge this in.

A bunch of things still need to be done. The software engineering
section isn't completely moved and the readmes are still in rst rather
than md.

W. Trevor King: I dropped everything from the original 00149bc except
for the testing/ rename, and some line-wrapping in the original commit
message.

Conflicts:
debugging/Readme.md
debugging/Readme.rst
debugging/cacheTest.cc
debugging/lint_example.py
debugging/pdb_example.py
debugging/profiler_example.py
debugging/segfault_handled_example.py
debugging/segfault_unhandled_example.py
debugging/simpleTest.cc
debugging/style_example.py
debugging/tb_example.py
documentation/Makefile
documentation/Readme.md
documentation/Readme.rst
documentation/_static/flash.ico
documentation/_static/thwlogo-small.png
documentation/_themes/cloud_flash/layout.html
documentation/_themes/cloud_flash/static/cloud.css_t
documentation/_themes/cloud_flash/static/icon-note.png
documentation/_themes/cloud_flash/static/icon-seealso.png
documentation/_themes/cloud_flash/static/icon-todo.png
documentation/_themes/cloud_flash/static/icon-warning.png
documentation/_themes/cloud_flash/static/jquery.cookie.js
documentation/_themes/cloud_flash/static/toggle_sections.js
documentation/_themes/cloud_flash/static/toggle_sidebar.js_t
documentation/_themes/cloud_flash/theme.conf
documentation/close_line.py
documentation/close_line.rst
documentation/conf.py
documentation/index.rst
documentation/sphinxext/LICENSE.txt
documentation/sphinxext/__init__.py
documentation/sphinxext/apigen.py
documentation/sphinxext/comment_eater.py
documentation/sphinxext/compiler_unparse.py
documentation/sphinxext/docscrape.py
documentation/sphinxext/docscrape.pyc
documentation/sphinxext/docscrape_sphinx.py
documentation/sphinxext/docscrape_sphinx.pyc
documentation/sphinxext/inheritance_diagram.py
documentation/sphinxext/ipython_console_highlighting.py
documentation/sphinxext/ipython_console_highlighting.pyc
documentation/sphinxext/ipython_directive.py
documentation/sphinxext/numpydoc.py
documentation/sphinxext/numpydoc.pyc
documentation/sphinxext/phantom_import.py
documentation/sphinxext/plot_directive.py
documentation/sphinxext/setup.py
documentation/sphinxext/traitsdoc.py
make/exoplanet.eu_catalog.csv
make/exoplanet.eu_catalog.png
make/exoplanet_figures.html
make/figure_html.mk
make/kepler_planets.csv
make/kepler_planets.png
make/make_html.py
make/make_plots.py
make/subset_by_name.py
make/template.html
python/intro/Exercises.ipynb
python/intro/MakeAnimals.ipynb
python/intro/PresenterNotes.ipynb
python/intro/README.rst
python/intro/animals.txt
python/intro/big_animals.txt
python/intro/dingwall_animals.txt
python/intro/fergus_animals.txt
python/intro/macguffin_animals.txt
python/intro/merida_animals.txt
shell/Readme.md
shell/data/Bert/audioresult-00215
shell/data/Bert/audioresult-00222
shell/data/Bert/audioresult-00223
shell/data/Bert/audioresult-00235
shell/data/Bert/audioresult-00239
shell/data/Bert/audioresult-00246
shell/data/Bert/audioresult-00265
shell/data/Bert/audioresult-00267
shell/data/Bert/audioresult-00270
shell/data/Bert/audioresult-00286
shell/data/Bert/audioresult-00304
shell/data/Bert/audioresult-00317
shell/data/Bert/audioresult-00319
shell/data/Bert/audioresult-00320
shell/data/Bert/audioresult-00321
shell/data/Bert/audioresult-00330
shell/data/Bert/audioresult-00332
shell/data/Bert/audioresult-00350
shell/data/Bert/audioresult-00353
shell/data/Bert/audioresult-00355
shell/data/Bert/audioresult-00359
shell/data/Bert/audioresult-00372
shell/data/Bert/audioresult-00377
shell/data/Bert/audioresult-00380
shell/data/Bert/audioresult-00384
shell/data/Bert/audioresult-00386
shell/data/Bert/audioresult-00393
shell/data/Bert/audioresult-00412
shell/data/Bert/audioresult-00416
shell/data/Bert/audioresult-00422
shell/data/Bert/audioresult-00443
shell/data/Bert/audioresult-00445
shell/data/Bert/audioresult-00451
shell/data/Bert/audioresult-00453
shell/data/Bert/audioresult-00460
shell/data/Bert/audioresult-00466
shell/data/Bert/audioresult-00470
shell/data/Bert/audioresult-00472
shell/data/Bert/audioresult-00490
shell/data/Bert/audioresult-00493
shell/data/Bert/audioresult-00497
shell/data/Bert/audioresult-00518
shell/data/Bert/audioresult-00521
shell/data/Bert/audioresult-00532
shell/data/Bert/audioresult-00534
shell/data/Bert/audioresult-00535
shell/data/Bert/audioresult-00557
shell/data/Frank_Richard/NOTES
shell/data/Frank_Richard/data_212
shell/data/Frank_Richard/data_221
shell/data/Frank_Richard/data_224
shell/data/Frank_Richard/data_233
shell/data/Frank_Richard/data_237
shell/data/Frank_Richard/data_247
shell/data/Frank_Richard/data_252
shell/data/Frank_Richard/data_254
shell/data/Frank_Richard/data_258
shell/data/Frank_Richard/data_259
shell/data/Frank_Richard/data_272
shell/data/Frank_Richard/data_273
shell/data/Frank_Richard/data_285
shell/data/Frank_Richard/data_291
shell/data/Frank_Richard/data_295
shell/data/Frank_Richard/data_316
shell/data/Frank_Richard/data_323
shell/data/Frank_Richard/data_327
shell/data/Frank_Richard/data_329
shell/data/Frank_Richard/data_366
shell/data/Frank_Richard/data_378
shell/data/Frank_Richard/data_381
shell/data/Frank_Richard/data_385
shell/data/Frank_Richard/data_388
shell/data/Frank_Richard/data_398
shell/data/Frank_Richard/data_404
shell/data/Frank_Richard/data_405
shell/data/Frank_Richard/data_417
shell/data/Frank_Richard/data_428
shell/data/Frank_Richard/data_429
shell/data/Frank_Richard/data_433
shell/data/Frank_Richard/data_436
shell/data/Frank_Richard/data_439
shell/data/Frank_Richard/data_444
shell/data/Frank_Richard/data_461
shell/data/Frank_Richard/data_477
shell/data/Frank_Richard/data_479
shell/data/Frank_Richard/data_491
shell/data/Frank_Richard/data_494
shell/data/Frank_Richard/data_500
shell/data/Frank_Richard/data_503
shell/data/Frank_Richard/data_504
shell/data/Frank_Richard/data_507
shell/data/Frank_Richard/data_508
shell/data/Frank_Richard/data_512
shell/data/Frank_Richard/data_519
shell/data/Frank_Richard/data_533
shell/data/Frank_Richard/data_537
shell/data/Frank_Richard/data_538
shell/data/Frank_Richard/data_540
shell/data/Frank_Richard/data_545
shell/data/Frank_Richard/data_555
shell/data/Lawrence/Data0214
shell/data/Lawrence/Data0225
shell/data/Lawrence/Data0234
shell/data/Lawrence/Data0248
shell/data/Lawrence/Data0251
shell/data/Lawrence/Data0253
shell/data/Lawrence/Data0260
shell/data/Lawrence/Data0271
shell/data/Lawrence/Data0275
shell/data/Lawrence/Data0276
shell/data/Lawrence/Data0284
shell/data/Lawrence/Data0296
shell/data/Lawrence/Data0300
shell/data/Lawrence/Data0310
shell/data/Lawrence/Data0313
shell/data/Lawrence/Data0335
shell/data/Lawrence/Data0345
shell/data/Lawrence/Data0352
shell/data/Lawrence/Data0361
shell/data/Lawrence/Data0362
shell/data/Lawrence/Data0363
shell/data/Lawrence/Data0371
shell/data/Lawrence/Data0382
shell/data/Lawrence/Data0390
shell/data/Lawrence/Data0392
shell/data/Lawrence/Data0400
shell/data/Lawrence/Data0403
shell/data/Lawrence/Data0410
shell/data/Lawrence/Data0411
shell/data/Lawrence/Data0423
shell/data/Lawrence/Data0430
shell/data/Lawrence/Data0437
shell/data/Lawrence/Data0440
shell/data/Lawrence/Data0441
shell/data/Lawrence/Data0442
shell/data/Lawrence/Data0447
shell/data/Lawrence/Data0449
shell/data/Lawrence/Data0452
shell/data/Lawrence/Data0455
shell/data/Lawrence/Data0456
shell/data/Lawrence/Data0463
shell/data/Lawrence/Data0483
shell/data/Lawrence/Data0492
shell/data/Lawrence/Data0506
shell/data/Lawrence/Data0511
shell/data/Lawrence/Data0515
shell/data/Lawrence/Data0522
shell/data/Lawrence/Data0525
shell/data/Lawrence/Data0526
shell/data/Lawrence/Data0531
shell/data/Lawrence/Data0544
shell/data/Lawrence/Data0554
shell/data/THOMAS/0213
shell/data/THOMAS/0241
shell/data/THOMAS/0244
shell/data/THOMAS/0249
shell/data/THOMAS/0274
shell/data/THOMAS/0281
shell/data/THOMAS/0287
shell/data/THOMAS/0289
shell/data/THOMAS/0298
shell/data/THOMAS/0299
shell/data/THOMAS/0301
shell/data/THOMAS/0302
shell/data/THOMAS/0303
shell/data/THOMAS/0314
shell/data/THOMAS/0315
shell/data/THOMAS/0322
shell/data/THOMAS/0328
shell/data/THOMAS/0333
shell/data/THOMAS/0334
shell/data/THOMAS/0336
shell/data/THOMAS/0340
shell/data/THOMAS/0341
shell/data/THOMAS/0348
shell/data/THOMAS/0349
shell/data/THOMAS/0351
shell/data/THOMAS/0354
shell/data/THOMAS/0358
shell/data/THOMAS/0369
shell/data/THOMAS/0373
shell/data/THOMAS/0376
shell/data/THOMAS/0391
shell/data/THOMAS/0396
shell/data/THOMAS/0399
shell/data/THOMAS/0406
shell/data/THOMAS/0425
shell/data/THOMAS/0431
shell/data/THOMAS/0432
shell/data/THOMAS/0435
shell/data/THOMAS/0438
shell/data/THOMAS/0448
shell/data/THOMAS/0450
shell/data/THOMAS/0464
shell/data/THOMAS/0465
shell/data/THOMAS/0467
shell/data/THOMAS/0481
shell/data/THOMAS/0482
shell/data/THOMAS/0484
shell/data/THOMAS/0485
shell/data/THOMAS/0488
shell/data/THOMAS/0501
shell/data/THOMAS/0513
shell/data/THOMAS/0514
shell/data/THOMAS/0539
shell/data/THOMAS/0561
shell/data/alexander/data_216.DATA
shell/data/alexander/data_242.DATA
shell/data/alexander/data_256.DATA
shell/data/alexander/data_262.DATA
shell/data/alexander/data_268.DATA
shell/data/alexander/data_277.DATA
shell/data/alexander/data_278.DATA
shell/data/alexander/data_288.DATA
shell/data/alexander/data_292.DATA
shell/data/alexander/data_297.DATA
shell/data/alexander/data_305.DATA
shell/data/alexander/data_306.DATA
shell/data/alexander/data_309.DATA
shell/data/alexander/data_318.DATA
shell/data/alexander/data_337.DATA
shell/data/alexander/data_339.DATA
shell/data/alexander/data_344.DATA
shell/data/alexander/data_346.DATA
shell/data/alexander/data_347.DATA
shell/data/alexander/data_357.DATA
shell/data/alexander/data_364.DATA
shell/data/alexander/data_379.DATA
shell/data/alexander/data_387.DATA
shell/data/alexander/data_389.DATA
shell/data/alexander/data_397.DATA
shell/data/alexander/data_402.DATA
shell/data/alexander/data_408.DATA
shell/data/alexander/data_415.DATA
shell/data/alexander/data_420.DATA
shell/data/alexander/data_421.DATA
shell/data/alexander/data_427.DATA
shell/data/alexander/data_434.DATA
shell/data/alexander/data_454.DATA
shell/data/alexander/data_462.DATA
shell/data/alexander/data_469.DATA
shell/data/alexander/data_471.DATA
shell/data/alexander/data_473.DATA
shell/data/alexander/data_498.DATA
shell/data/alexander/data_502.DATA
shell/data/alexander/data_516.DATA
shell/data/alexander/data_527.DATA
shell/data/alexander/data_530.DATA
shell/data/alexander/data_536.DATA
shell/data/alexander/data_542.DATA
shell/data/alexander/data_546.DATA
shell/data/alexander/data_547.DATA
shell/data/alexander/data_548.DATA
shell/data/alexander/data_550.DATA
shell/data/alexander/data_560.DATA
shell/data/gerdal/Data0211
shell/data/gerdal/Data0218
shell/data/gerdal/Data0220
shell/data/gerdal/Data0227
shell/data/gerdal/Data0229
shell/data/gerdal/Data0230
shell/data/gerdal/Data0232
shell/data/gerdal/Data0238
shell/data/gerdal/Data0240
shell/data/gerdal/Data0243
shell/data/gerdal/Data0245
shell/data/gerdal/Data0250
shell/data/gerdal/Data0257
shell/data/gerdal/Data0263
shell/data/gerdal/Data0269
shell/data/gerdal/Data0279
shell/data/gerdal/Data0283
shell/data/gerdal/Data0294
shell/data/gerdal/Data0307
shell/data/gerdal/Data0308
shell/data/gerdal/Data0311
shell/data/gerdal/Data0324
shell/data/gerdal/Data0331
shell/data/gerdal/Data0338
shell/data/gerdal/Data0342
shell/data/gerdal/Data0356
shell/data/gerdal/Data0365
shell/data/gerdal/Data0367
shell/data/gerdal/Data0370
shell/data/gerdal/Data0407
shell/data/gerdal/Data0409
shell/data/gerdal/Data0413
shell/data/gerdal/Data0414
shell/data/gerdal/Data0419
shell/data/gerdal/Data0424
shell/data/gerdal/Data0426
shell/data/gerdal/Data0446
shell/data/gerdal/Data0458
shell/data/gerdal/Data0459
shell/data/gerdal/Data0468
shell/data/gerdal/Data0486
shell/data/gerdal/Data0487
shell/data/gerdal/Data0495
shell/data/gerdal/Data0499
shell/data/gerdal/Data0505
shell/data/gerdal/Data0520
shell/data/gerdal/Data0523
shell/data/gerdal/Data0528
shell/data/gerdal/Data0529
shell/data/gerdal/Data0541
shell/data/gerdal/Data0543
shell/data/gerdal/Data0549
shell/data/gerdal/Data0551
shell/data/gerdal/Data0552
shell/data/gerdal/Data0556
shell/data/gerdal/Data0558
shell/data/gerdal/Data0559
shell/data/jamesm/NOTES
shell/data/jamesm/data_217.txt
shell/data/jamesm/data_219.txt
shell/data/jamesm/data_226.txt
shell/data/jamesm/data_228.txt
shell/data/jamesm/data_231.txt
shell/data/jamesm/data_236.txt
shell/data/jamesm/data_255.txt
shell/data/jamesm/data_261.txt
shell/data/jamesm/data_264.txt
shell/data/jamesm/data_266.txt
shell/data/jamesm/data_280.txt
shell/data/jamesm/data_282.txt
shell/data/jamesm/data_290.txt
shell/data/jamesm/data_293.txt
shell/data/jamesm/data_312.txt
shell/data/jamesm/data_325.txt
shell/data/jamesm/data_326.txt
shell/data/jamesm/data_343.txt
shell/data/jamesm/data_360.txt
shell/data/jamesm/data_368.txt
shell/data/jamesm/data_374.txt
shell/data/jamesm/data_375.txt
shell/data/jamesm/data_383.txt
shell/data/jamesm/data_394.txt
shell/data/jamesm/data_395.txt
shell/data/jamesm/data_401.txt
shell/data/jamesm/data_418.txt
shell/data/jamesm/data_457.txt
shell/data/jamesm/data_474.txt
shell/data/jamesm/data_475.txt
shell/data/jamesm/data_476.txt
shell/data/jamesm/data_478.txt
shell/data/jamesm/data_480.txt
shell/data/jamesm/data_489.txt
shell/data/jamesm/data_496.txt
shell/data/jamesm/data_509.txt
shell/data/jamesm/data_510.txt
shell/data/jamesm/data_517.txt
shell/data/jamesm/data_524.txt
shell/data/jamesm/data_553.txt
shell/dictionary.txt
shell/ex_data.txt
shell/generate_data.py
shell/hello
version-control/git/local/Readme.md
version-control/git/remote/Readme.md

Removing or moving old UofC directories.

W. Trevor King: I dropped everything from the original 500753d except
for the 4-SoftwareEngineering/Testing/ renaming.

Conflicts:
4-SoftwareEngineering/Debugging/Readme.md
4-SoftwareEngineering/Debugging/Readme.rst
4-SoftwareEngineering/Debugging/cacheTest.cc
4-SoftwareEngineering/Debugging/lint_example.py
4-SoftwareEngineering/Debugging/pdb_example.py
4-SoftwareEngineering/Debugging/profiler_example.py
4-SoftwareEngineering/Debugging/segfault_handled_example.py
4-SoftwareEngineering/Debugging/segfault_unhandled_example.py
4-SoftwareEngineering/Debugging/simpleTest.cc
4-SoftwareEngineering/Debugging/style_example.py
4-SoftwareEngineering/Debugging/tb_example.py
4-SoftwareEngineering/Documentation/Makefile
4-SoftwareEngineering/Documentation/Readme.md
4-SoftwareEngineering/Documentation/Readme.rst
4-SoftwareEngineering/Documentation/_static/flash.ico
4-SoftwareEngineering/Documentation/_static/thwlogo-small.png
4-SoftwareEngineering/Documentation/_themes/cloud_flash/layout.html
4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/cloud.css_t
4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/icon-note.png
4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/icon-seealso.png
4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/icon-todo.png
4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/icon-warning.png
4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/jquery.cookie.js
4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/toggle_sections.js
4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/toggle_sidebar.js_t
4-SoftwareEngineering/Documentation/_themes/cloud_flash/theme.conf
4-SoftwareEngineering/Documentation/close_line.rst
4-SoftwareEngineering/Documentation/conf.py
4-SoftwareEngineering/Documentation/index.rst
4-SoftwareEngineering/Documentation/sphinxext/LICENSE.txt
4-SoftwareEngineering/Documentation/sphinxext/__init__.py
4-SoftwareEngineering/Documentation/sphinxext/apigen.py
4-SoftwareEngineering/Documentation/sphinxext/comment_eater.py
4-SoftwareEngineering/Documentation/sphinxext/compiler_unparse.py
4-SoftwareEngineering/Documentation/sphinxext/docscrape.py
4-SoftwareEngineering/Documentation/sphinxext/docscrape.pyc
4-SoftwareEngineering/Documentation/sphinxext/docscrape_sphinx.py
4-SoftwareEngineering/Documentation/sphinxext/docscrape_sphinx.pyc
4-SoftwareEngineering/Documentation/sphinxext/inheritance_diagram.py
4-SoftwareEngineering/Documentation/sphinxext/ipython_console_highlighting.py
4-SoftwareEngineering/Documentation/sphinxext/ipython_console_highlighting.pyc
4-SoftwareEngineering/Documentation/sphinxext/ipython_directive.py
4-SoftwareEngineering/Documentation/sphinxext/numpydoc.py
4-SoftwareEngineering/Documentation/sphinxext/numpydoc.pyc
4-SoftwareEngineering/Documentation/sphinxext/phantom_import.py
4-SoftwareEngineering/Documentation/sphinxext/plot_directive.py
4-SoftwareEngineering/Documentation/sphinxext/setup.py
4-SoftwareEngineering/Documentation/sphinxext/traitsdoc.py
4-SoftwareEngineering/Testing/close_line.py

Fixed bug in close_line.py

W. Trevor King: I dropped everything from the original c7a23ca except
for the 5-Testing/ modification.

Conflicts:
.gitignore
6-Documentation/close_line.py

Bug on testing page.

W. Trevor King: I dropped everything from the 2741ea0 original except
for the 5-Testing/ modification.

Conflicts:
.gitignore

Updated docs

W. Trevor King: I dropped everything from the original 87c5ce2 except
for the 5-Testing/ modification.

Conflicts:
6-Documentation/Readme.md
6-Documentation/Readme.rst

Typo fixes for testing

Updated testing.

Trying to get image right.

Attempting images in markdown.

Fixed TTD example

W. Trevor King: I dropped everything from the original 7cacdac except
for the 5-Testing/ modification.

Conflicts:
4-Debugging/tb_example.py

Added mean tests.

Made it through test updates.

More tests

Some more testing updates.

Some testing updates.

Added associated markdown files.

W. Trevor King: I dropped everything from the original 7d32d4e except
for the 5-Testing/Readme.md addition.

copied over a bunch of Trieste tutorial files.

W. Trevor King: I dropped everything from the original 4036a39 except
for the 5-Testing/Readme.rst rename.

Conflicts:
Readme.rst

Changed name of Python10

Removed blank space.

Ready to present.

Updated Python Nose (rest)

adding example.

Uniform headings

W. Trevor King: I dropped everything from the original f7bd97a except
for the Python-10-Testing-your-program.rest modification.

Conflicts:
Python-5:-Strings-and-File-I-O.rest
Python-6:-Object-oriented-programming.rest
Python2-ListsDictsSetsTuples.rest
Python3-FlowControl.rest
Python4-FunctionsAndStandardModules.rest

Finished formatting the testing lecture.

Imported Nose lecture and started cleaning.