Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging setup #83

Merged
merged 134 commits into from
Dec 17, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
c0484a3
swc-installation-test.py: Add installation-testing script
Dec 29, 2012
51aafd3
workshop_checklist.py: Add installation-testing script
fperez Dec 29, 2012
c3f2c3a
Merge Konrad Hinsen and Fernando Perez's installation-testing scripts
wking Dec 29, 2012
c081808
swc-installation-test: Consolidate and reorganize test scripts
wking Dec 30, 2012
5318884
swc-installation-test-2.py: sort CHECKS into topics
wking Dec 30, 2012
c17a5ec
swc-installation-test-2.py: Add some editors and browsers
wking Dec 30, 2012
042b2ca
swc-installation-test-2.py: Add virtual-editor and virtual-browser
wking Dec 30, 2012
fc65b63
swc-installation-test-2.py: Add exe_extension for MS Windows compat.
wking Dec 30, 2012
60e88c1
swc-installation-test-2.py: `PythonDependency`s should depend on Python
wking Dec 30, 2012
5453afe
swc-installation-test-2.py: Cache check errors
wking Dec 30, 2012
f8008e7
swc-installation-test-2.py: Don't print duplicate exceptions
wking Dec 30, 2012
ab9d3af
swc-installation-test-2.py: Print successfully-found versions
wking Dec 30, 2012
ae70783
swc-installation-test-2.py: Don't chain exceptions (yet)
wking Dec 30, 2012
a7b6d8b
swc-installation-test-2.py: import print_function for Python 2.6
wking Dec 30, 2012
5df31aa
swc-installation-test-2.py: Don't parse missing versions
wking Dec 30, 2012
2314663
swc-installation-test-2.py: Add import_module for older Pythons
wking Dec 30, 2012
d9bf86f
swc-installation-test-2.py: Refactor PythonPackageDependency._get_ver…
wking Dec 30, 2012
4099f8b
swc-installation-test-2.py: Fix 'mercurial' version extraction
wking Dec 30, 2012
98c4d17
swc-installation-test-2.py: Fix version extraction for sqlite3-python
wking Dec 30, 2012
70f8c44
swc-installation-test-2.py: Don't require a specific Bash version
wking Jan 1, 2013
78886f4
swc-installation-test-2.py: Add a virtual-shell and non-Bash shells
wking Jan 1, 2013
d2a9618
swc-installation-test-2.py: Add EasyInstallDependency class
wking Jan 1, 2013
bcf4a24
swc-installation-test-2.py: Only require Git >= 1.7 (not >= 1.8)
wking Jan 1, 2013
16f16db
swc-installation-test-2.py: Avoid BaseException.message warning
wking Jan 1, 2013
89fbb1b
swc-installation-test-2.py: Don't say how to get a terminal
wking Jan 1, 2013
067f325
swc-installation-test-1.py: Give suggested install hints
wking Jan 1, 2013
baaaafd
swc-installation-test-2.py: Give suggested install hints
wking Jan 1, 2013
f713ede
swc-installation-test-2.py: Break after first successful or-dependency
wking Jan 1, 2013
6ab7e25
swc-installation-test-2.py: Sort shells in order of preference
wking Jan 1, 2013
c0e144c
swc-installation-test-1.py: Give instructions for 'python command not…
wking Jan 1, 2013
895429d
swc-installation-test-2.py: Isolate system-info indent in _print_info
wking Jan 1, 2013
0e54b78
swc-installation-test-2.py: Use the more portable platform.uname()
wking Jan 1, 2013
9f436c9
swc-installation-test-2.py: Add OS-version detection
wking Jan 1, 2013
56d8002
swc-installation-test-2.py: Convert .version_option to .version_options
wking Jan 1, 2013
dfa194a
swc-installation-test-2.py: Add CommandDependency.stdin
wking Jan 1, 2013
c704fec
swc-installation-test-2.py: Add MakeDependency class
wking Jan 1, 2013
c7ef943
swc-installation-test-2.py: Document command line arguments
wking Jan 1, 2013
3711412
swc-installation-test-2.py: Better error message for unknown checks
wking Jan 1, 2013
07071e7
swc-installation-test: Return 1 on failure
wking Jan 1, 2013
5934d08
swc-installation-test-2.py: Add 'virtual-pypi-installer' and 'pip'
wking Jan 1, 2013
aa425a2
swc-installation-test-2.py: Comment out 'mercurial' dependency
wking Jan 11, 2013
47b4977
setup: Move installation test scripts under setup/
wking Jan 11, 2013
8c1de67
setup/README.md: Install-testing script care and feeding
wking Jan 11, 2013
c0914cf
swc-installation-test-2.py: Add ipython (script) >= 0.13
wking Jan 26, 2013
08b42c7
swc-installation-test-2.py: Handle unparsable versions gracefully
wking Jan 26, 2013
6678fcb
swc-installation-test-2.py: Add Pandas (pandas) >= 0.8
wking Jan 27, 2013
1d9df09
swc-installation-test-2.py: Add gedit to virtual-editor
wking Jan 27, 2013
b68ea0d
swc-installation-test-2.py: Add and_dependencies to Python package setup
wking Jan 27, 2013
7ad7b23
swc-installation-test-2.py: Print full DependencyError chain
wking Jan 27, 2013
dd54fe6
swc-installation-test-2.py: Add IPython notebook dependencies
wking Jan 27, 2013
f6fe90a
swc-installation-test-2.py: List all causes for or-dependency errors
wking Jan 27, 2013
43bea67
swc-installation-test-2.py: Add long names for virtual-* packages
wking Jan 28, 2013
033dc1d
swc-installation-test-2.py: Add TornadoPythonPackage for version extr…
wking Jan 28, 2013
0a8a59e
swc-installation-test-2.py: Add PathCommandDependency
wking Jan 28, 2013
014da5e
swc-installation-test-2.py: Initial EditorTaskDependency implementation
wking Jan 28, 2013
adb3cca
swc-installation-test-2.py: Add 'EasyMercurial'
wking Feb 18, 2013
9329ca9
swc-installation-test-2.py: Add 'argparse'
wking Feb 19, 2013
7cc6a4a
swc-installation-test-1.py: Link to s-c.o's terminal.html
wking Feb 26, 2013
fd057cc
swc-installation-test-2.py: Add support for package-specific URLs
wking Feb 26, 2013
f206cd0
swc-installation-test-2.py: List supported Ubuntu install hints
wking Feb 26, 2013
11d71c9
swc-installation-test-2.py: Add --help and --verbose
wking Feb 26, 2013
1cb7745
swc-installation-test-2.py: Link directly to install docs
wking Feb 26, 2013
d4ca6e0
swc-installation-test-2.py: Add 'safari'
wking Mar 6, 2013
f8bd8f5
swc-installation-test-2.py: Don't override Popen's 'close_fds'
wking Mar 8, 2013
62ccfb0
swc-installation-test-2.py: Raise an error on empty version stream
wking Mar 8, 2013
247cbd5
swc-installation-test-2.py: Use _ROOT_PATH for MS Windows compatability
wking Mar 8, 2013
32049a5
swc-installation-test-2.py: Add CommandDependency.paths fallbacks
wking Mar 8, 2013
8abb4cc
swc-installation-test-2.py: Also look for extension-less paths
wking Mar 21, 2013
824ccec
swc-installation-test-2.py: Use ProgramFiles environment variable
wking Apr 27, 2013
5de360d
Import installation test scripts from boot-camps repo.
douglatornell Sep 3, 2013
f75dfc5
Add a Nano installer for Windows
ethanwhite Sep 18, 2013
38b1443
Switch from using .bashrc to .bash_profile nano path and editor export
ethanwhite Sep 20, 2013
d747d60
Append exports to end of .bash_profile instead of overwriting
ethanwhite Sep 20, 2013
1509bf4
Remove testing line
ethanwhite Sep 20, 2013
a765447
removed stray non-printing unicode characters
Oct 11, 2013
95f7b2e
swc-windows-installer.py: Setup msysgit to act like *nix systems
ethanwhite Mar 20, 2013
7e51492
swc-windows-installer.py: Cleanup whitespace
wking Mar 20, 2013
2870c12
swc-windows-installer.py: Separate requests import from stdlib imports
wking Mar 20, 2013
e27e7d3
swc-windows-installer.py: Avoid writing nano.zip to disk
wking Mar 20, 2013
1e43ac6
swc-windows-installer.py: Extract nano directly to the install directory
wking Mar 20, 2013
482f838
swc-windows-installer.py: Simplify `ipython` wrapper
wking Mar 20, 2013
dca9218
swc-windows-installer.py: Use `with` to write script wrappers
wking Mar 20, 2013
ca02418
swc-windows-installer.py: Use lists for file content
wking Mar 20, 2013
52a6f2a
swc-windows-installer.py: Use the stdlib's urlopen()
wking Mar 20, 2013
98bc402
swc-installation-test-2.py: added support for py.test
mikej888 Jun 25, 2013
833d0ee
Add a Nano installer for Windows
ethanwhite Sep 18, 2013
0e537f7
Switch from using .bashrc to .bash_profile nano path and editor export
ethanwhite Sep 20, 2013
c5d5414
Append exports to end of .bash_profile instead of overwriting
ethanwhite Sep 20, 2013
3a5c149
Remove testing line
ethanwhite Sep 20, 2013
3b539bd
Merge branch 'nano-installer' into windows-installer
wking Oct 21, 2013
e93aafb
swc-windows-installer.py: Bring in Ethan's make_bash_profile and make…
ethanwhite Oct 21, 2013
e3721c1
swc-windows-installer.py: Generalize update_bash_profile
wking Oct 21, 2013
7e8dc68
swc-windows-installer.py: Rework paths in main()
wking Oct 21, 2013
9b6a54a
swc-windows-installer.py: De-emphasize Anaconda
wking Oct 21, 2013
94caead
swc-windows-installer.py: Remove IPython and nose entry points
wking Oct 21, 2013
806fedf
swc-windows-installer.py: Rework install paths to use ~/.swc
wking Oct 21, 2013
9bf13b8
swc-nano-installer.py: Remove now that changes are in swc-windows-ins…
wking Oct 21, 2013
8561840
swc-windows-installer.py: Remove nesting setup/
wking Oct 23, 2013
a0a92a5
README.md: Remove nesting setup/
wking Oct 23, 2013
c8f8f56
swc-windows-installer.py: Restore nose entry point
wking Oct 31, 2013
3a127a3
Merge branch 'bc-namespaced' of git://tremily.us/swc-setup-windows-in…
wking Nov 4, 2013
1675ed9
Merge branch 'bc-namespaced' of git://tremily.us/swc-setup-installati…
wking Nov 4, 2013
bd5b4a2
setup/README.md: Add YAML front matter for Jekyll
wking Oct 22, 2013
77d83b0
setup/bin/get-my-ip.py: Remove this rarely used file
wking Nov 4, 2013
004f931
swc-windows-installer.py: Split out zip_install into its own function
wking Nov 12, 2013
36f0b22
swc-windows-installer.py: Only create the python-scripts dir if it do…
wking Nov 12, 2013
97d828d
swc-windows-installer.py: Use regular expressions to POSIX-ify paths
wking Nov 13, 2013
f885acb
Merge pull request #144 from wking/windows-installer-bc-namespaced
ethanwhite Nov 14, 2013
90450e6
Changing the word "boot camp" to "bootcamp" in all *.md and *.hmtml f…
iglpdc Nov 26, 2013
d20ec11
swc-installation-test-2.py: Prefer pip to easy_install
wking Nov 30, 2013
c37821c
Merge pull request #184 from wking/installation-test-bc-namespaced
ahmadia Dec 1, 2013
d63439b
swc-windows-installer.py: Quote $PATH export to account for spaces.
davis68 Jan 27, 2014
c5fda54
Merge branch 'bc-namespaced-python' of git://tremily.us/swc-setup-win…
wking Jan 27, 2014
65c5696
swc-windows-installer.py: Install nano source syntax highlighters
wking Mar 5, 2014
828060a
swc-windows-installer.py: Rename ~/.nanorc to ~/nano.rc
wking Mar 13, 2014
7af68bb
swc-windows-installer.py: Use '~' in ~/nano.rc includes
wking Mar 13, 2014
376ba41
swc-windows-installer.py: Use POSIX paths for ~/nano.rc
wking Mar 13, 2014
55c0047
swc-windows-installer.py: Force UNIX-style \n line endings for ~/nano.rc
wking Mar 13, 2014
2ab7c79
* replaced msysgit with Git for Windows
joonro Mar 23, 2014
60a22ab
swc-windows-installer.py: Generalize msysGit download link
wking Mar 27, 2014
6668fac
swc-windows-installer.py: Install the sqlite3 shell
wking Apr 4, 2014
19c3370
Merge branch 'bc-namespaced-python' of git://tremily.us/swc-setup-win…
wking Apr 19, 2014
52dfe3b
README.md: Convert 'boot camp' -> 'workshop'
wking Apr 21, 2014
c2d2cbe
Merge branch 'bc-namespaced' of git://tremily.us/swc-setup-installati…
wking Apr 21, 2014
dbd1365
Make separate directory for Windows installer
ethanwhite May 4, 2014
f6cbe6a
Add setup.py file for building Windows installer
ethanwhite May 4, 2014
9c947b8
Add script for building Windows installer
ethanwhite May 4, 2014
6dd223a
Add a Software Carpentry icon file for Windows installer
ethanwhite May 4, 2014
8bf14a8
Add indication that the Windows installer is running
ethanwhite May 4, 2014
1047381
Renaming Windows installer directory
ethanwhite May 5, 2014
56f5777
Merge pull request #454 from wking/installation-test-bc-namespaced
Sep 29, 2014
5148ac6
Merge history of setup/ folder from swcarpentry/bc
pipitone Nov 17, 2014
e710620
Merge branch 'pr-import-bc-setup-history' of github.com:pipitone/work…
gvwilson Dec 16, 2014
5b65a34
Pulling in setup files
gvwilson Dec 16, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,11 @@ <h3>Managing Data with SQL</h3>

<h2 id="setup">Setup</h2>

<p>
<a href="test-setup.html">This page</a> has instructions on testing
that you have the right software installed.
</p>

<div> <!-- Start of 'editor' section. -->
<h3>Text Editor</h3>

Expand Down
97 changes: 97 additions & 0 deletions test-setup.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
---
layout: page
title: Testing Setup
---
Learners
--------

This directory contains scripts for testing your machine to make sure
you have the software you'll need for your workshop installed. The
comments at the head of each script have full details, but in brief,
you should be able to:

1. Download [test-setup-minimal.py](util/test-setup-minimal.py).

2. Run it from the shell by typing:

~~~
$ python test-install-minimal.py
Passed
~~~

3. Download [test-setup-all.py](util/test-setup-all.py).

4. Run it from the shell by typing:

~~~
$ python test-install-all.py
check virtual-shell... pass
...
Successes:

virtual-shell Bourne Again Shell (bash) 4.2.37
...
~~~

If you see something like:

~~~
$ python test-install-all.py
check virtual-shell... fail
...
check for command line shell (virtual-shell) failed:
command line shell (virtual-shell) requires at least one of the following dependencies
For instructions on installing an up-to-date version, see
http://software-carpentry.org/setup/
causes:
check for Bourne Again Shell (bash) failed:
could not find 'bash' executable for Bourne Again Shell (bash)
For instructions on installing an up-to-date version, see
http://software-carpentry.org/setup/
...
~~~

follow the suggestions to try and install any missing software. For
additional troubleshooting information, you can use the `--verbose`
option:

~~~
$ python test-install-all.py --verbose
check virtual-shell... fail
...
==================
System information
==================
os.name : posix
...
~~~

Instructors
-----------

`test-install-minimal.py` is pretty simple, and just checks that the
students have a recent enough version of Python installed that they'll
be able to parse `test-install-all.py`. The latter checks for a list
of dependencies and prints error messages if a package is not
installed, or if the installed version is not current enough. By
default, the script checks for pretty much anything that has ever been
used at a Software Carpentry workshop, which is probably not what you
want for your particular workshop.

Before your workshop, you should go through `test-install-all.py` and
comment any dependencies you don't need out of the `CHECKS` list. You
might also want to skim through the minimum version numbers listed
where particular dependencies are defined (e.g. `('git', 'Git', (1, 7,
0), None)`). For the most part, fairly conservative values have been
selected, so students with modern machines should be fine. If your
workshop has stricter version requirements, feel free to bump them
accordingly.

Similarly, the virtual dependencies can be satisfied by any of several
packages. If you don't want to support a particular package (e.g. if
you have no Emacs experience and don't want to be responsible for
students who show up with Emacs as their only editor), you can comment
out that particular `or_dependency`.

Finally, don't forget to post your modified scripts somewhere where
your students can download them!
Loading