summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Ethan White [Sun, 14 Apr 2013 19:25:10 +0000 (12:25 -0700)]
Merge pull request #34 from pipitone/swc_exercises
Exercises from the Software Carpentry 4.0 website
Jon Pipitone [Mon, 4 Mar 2013 19:31:26 +0000 (14:31 -0500)]
Moved exercises into subfolders of the corresponding topics
W. Trevor King: I dropped everything from the original
39e0701 except
for the python/sw_engineering/argparse_exercise.md 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/testing/exercises/test.markdown
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
Jon Pipitone [Fri, 1 Mar 2013 23:17:30 +0000 (18:17 -0500)]
Adding exercises from the Software Carpentry 4.0 website
W. Trevor King: I dropped everything from the original
da170d3 except
for the exercises/invperc.markdown addition.
Katy Huff [Tue, 5 Feb 2013 14:28:06 +0000 (06:28 -0800)]
Merge pull request #1 from pipitone/chicago_cleaned_md
Converted reStructured text to Git-flavoured Markdown
Jon Pipitone [Fri, 1 Feb 2013 18:08:26 +0000 (13:08 -0500)]
Conversion of all rst to corresponding markdown files
We use git-flavoured markdown
W. Trevor King: I dropped everything from the original
4ba1cf2 except
for the python/sw_engineering/ modifications.
Conflicts:
LICENSE.md
python/data_structures/Readme.md
python/documentation/Readme.md
python/documentation/close_line.md
python/flow_control/Readme.md
python/functions_and_modules/Readme.md
python/scipy/Readme.md
shell/Readme.md
version-control/git/remote/Readme.md
Katy Huff [Wed, 30 Jan 2013 03:21:37 +0000 (21:21 -0600)]
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/sw_engineering/ rename.
Conflicts:
python/numpy/engine/recommend.py
python/numpy/engine/segaran-recommend.py
python/numpy/long_exercise.rst
python/testing/Readme.md
Katy Huff [Fri, 11 Jan 2013 22:35:17 +0000 (16:35 -0600)]
added readme from library section that @jiffyclub taught in berkeley.
W. Trevor King: I dropped everything from the original
092cecd except
for the python/testing/Readme1.md removal. This brushes up against
f734840 (my other
092cecd cherry-pick) in the test-thw series. I
don't think there is enough cross-pollination in
092cecd to warrent
converting
f734840 into a merge.
Conflicts:
python/testing/Readme.md
Katy Huff [Fri, 11 Jan 2013 22:18:08 +0000 (16:18 -0600)]
moves testing into python, appropriately or not...
W. Trevor King: I dropped everything from the original
092cecd except
for the testing/Readme1.md rename.
Conflicts:
python/testing/Readme.md
python/testing/close_line.py
python/testing/evo_sol1.png
python/testing/mean.py
python/testing/test_mean.py
python/testing/test_prod.jpg
Katy Huff [Fri, 11 Jan 2013 22:04:41 +0000 (16:04 -0600)]
moved readme from software engineering.
Katy Huff [Sun, 16 Dec 2012 18:24:38 +0000 (12:24 -0600)]
added back rst file, for future compatibility
Katy Huff [Sun, 16 Dec 2012 18:24:20 +0000 (12:24 -0600)]
added back rst file, for future compatibility
Katy Huff [Sun, 16 Dec 2012 18:21:04 +0000 (12:21 -0600)]
converted rst to md with pandoc.
Matt Davis [Tue, 19 Jun 2012 02:13:11 +0000 (22:13 -0400)]
Small changes to the software engineering presenter notes.
Matt Davis [Mon, 18 Jun 2012 01:51:38 +0000 (21:51 -0400)]
Minor changes to SoftwareEngineering README.
Matt Davis [Mon, 18 Jun 2012 01:37:26 +0000 (21:37 -0400)]
Copying animal.txt files to software engineering directory for use there.
Expanded lesson plan in dev_notes.rst and added exercises to README.rst
W. Trevor King: I reformatted the commit message from the original
3a1b378 so it fits better into --oneline logs. I also turned this
commit into a merge so we can trace the copy, using:
$ echo
081da9ef5959c5abdb8fefbdc8efc701d6a957c3 \
>
d3bcf0219b92c2cfdd19239d2bf75de4ff26e579 \
>
6bc0a0bef5d364b59a3927492f025a6c3676656d \
> > .git/info/grafts
$ git filter-branch
$ rm .git/info/grafts
Matt Davis [Sun, 17 Jun 2012 02:22:25 +0000 (22:22 -0400)]
Added file reading section to Python and added animal data files.
Michael Droettboom [Thu, 14 Jun 2012 16:51:39 +0000 (12:51 -0400)]
Add if, for loop, def
Matt Davis [Thu, 14 Jun 2012 02:48:09 +0000 (22:48 -0400)]
Started a presenter notebook for introductory Python.
Matt Davis [Sun, 17 Jun 2012 18:00:40 +0000 (14:00 -0400)]
Split SoftwareEngineering notes into a README for the students and a notes file for the presenters.
Added Exercises notebook for Intro lesson.
W. Trevor King: I dropped everything from the original
2992452 except
for the 4-SoftwareEngineering modifications. I also reformatted the
original commit message so it fits better into --oneline logs.
Conflicts:
2-PythonIntro/README.rst
Matt Davis [Sun, 17 Jun 2012 04:15:55 +0000 (00:15 -0400)]
Added a 4-SoftwareEngineering directory for the Tuesday afternoon material.
With initial notes in the README. Need to finish this up tomorrow.
W. Trevor King: I reformatted the commit message from the original
237de06 so it fits better into --oneline logs.