summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
W. Trevor King [Thu, 21 Mar 2013 16:18:23 +0000 (12:18 -0400)]
swc-installation-test-2.py: Also look for extension-less paths
Before this commit, CommandDependency checked self.command (with an
optional extension determined by distutils). If that check failed to
produce a version stream, we cycled through a list of additional
hard-coded paths. For example: Notepad++ used:
self.command = 'notepad++'
self.paths = [
_os.path.join(
_ROOT_PATH, 'Program Files', 'Notepad++', 'notepad++.exe'),
]
Because some MS Windows commands lack the expected '.exe' extension,
but are still present and detected by a number of shells, we should
also look for the extension-less version of the command.
I consolidated the _get_version_stream() logic to build a single list
of paths and loop through it looking for success (and accumulating
errors). This makes the handling of self.paths less of a special
case, and sets us up for any additional path mangling we may need to
support other poorly standardized OSes ;).
W. Trevor King [Fri, 8 Mar 2013 19:22:28 +0000 (14:22 -0500)]
swc-installation-test-2.py: Add CommandDependency.paths fallbacks
The old CommandDependency implementation assumed that commands would
exist in one of the directories listed in PATH. This assumption is,
unfortunately, often not satisfied on MS Windows or OS X. In order to
work around this problem, you can now store a list of fallback paths
that will be tried if there is an error extracting the version stream
from the bare CommandDependency.command.
I've added fallback paths for Notepad++, Firefox, and Google Chrome,
as reported by Ethan White for Windows 7.
W. Trevor King [Fri, 8 Mar 2013 19:19:19 +0000 (14:19 -0500)]
swc-installation-test-2.py: Use _ROOT_PATH for MS Windows compatability
I don't think starting a path with os.sep gives you a root path on
Windows. We need the backslash in _ROOT_PATH, because:
os.path.join('c:', 'foo')
gives 'c:foo', a path relative to the current directory on drive C: [1].
[1]: http://docs.python.org/3/library/os.path.html#os.path.join
W. Trevor King [Fri, 8 Mar 2013 19:17:56 +0000 (14:17 -0500)]
swc-installation-test-2.py: Raise an error on empty version stream
This makes the upcoming mult-path checking easier to implement.
W. Trevor King [Fri, 8 Mar 2013 15:57:20 +0000 (10:57 -0500)]
swc-installation-test-2.py: Don't override Popen's 'close_fds'
Or 'shell'. The support for these options can be flaky, and the
defaults change with Python version depending on what is best
supported [1].
[1]: http://docs.python.org/2/library/subprocess.html#subprocess.Popen
Reported-by: Ethan White <ethan@weecology.org>
W. Trevor King [Wed, 6 Mar 2013 03:37:50 +0000 (22:37 -0500)]
swc-installation-test-2.py: Add 'safari'
This works adds support for virtual-browser on OS X. Matt Davis
reports the locations of Firefox and Chrome as:
/Applications/Firefox.app
/Applications/Google\ Chrome.app
but I'm not sure where the executables live underneath those
directories, which we'd probably need if we wanted to extract version
numbers.
W. Trevor King [Tue, 26 Feb 2013 05:26:48 +0000 (00:26 -0500)]
swc-installation-test-2.py: Link directly to install docs
Expecting the Software Carpentry maintainers to keep up-to-date
documentation for each system/package pair is not realistic. Instead,
link to each package's installation instructions (as best I can find
them). The system/version/package globbing (using fnmatch, see
glob(7)) makes it easy to setup per-system and per-version URLs if you
want to fine-tune the instructions.
W. Trevor King [Tue, 26 Feb 2013 03:51:32 +0000 (22:51 -0500)]
swc-installation-test-2.py: Add --help and --verbose
The system information is useful for troubleshooting a student's
installation problems, but it is probably less useful for the student
themselves. Turn off this troubleshooting information by default and
require the --verbose option to re-enable it.
If we didn't have to maintain support for Python 2.6, we could use
argparse instead of optparse. The optparse module is deprecated for
2.7, 3.2, and later, but it is still part of the stdandard library.
Also update the README to point out --verbose.
W. Trevor King [Tue, 26 Feb 2013 03:01:43 +0000 (22:01 -0500)]
swc-installation-test-2.py: List supported Ubuntu install hints
From http://software-carpentry.org/setup/ubuntu.html, in the order
that they are currently listed. The page sections don't have the
appropriate anchor IDs yet, but it's still better to link to the
Ubuntu page than to the root setup/ page.
W. Trevor King [Tue, 26 Feb 2013 02:51:19 +0000 (21:51 -0500)]
swc-installation-test-2.py: Add support for package-specific URLs
To give users more targeted advice for fixing their installation
problems, we should link them to somewhere more specific than the root
SWC setup page. The two knobs in the specific URL are system/OS
(Gentoo, Debian, OS X, MS Windows, ...) and package (the dependency
name: emacs, git, virtual-browser, ...). We don't have consistent
URLs upstream yet [1], but maybe this commit will help motivate them
;).
[1]: https://github.com/swcarpentry/website/issues/2
W. Trevor King [Tue, 26 Feb 2013 02:43:54 +0000 (21:43 -0500)]
swc-installation-test-1.py: Link to s-c.o's terminal.html
For screen shots and additional platform support.
W. Trevor King [Tue, 19 Feb 2013 03:00:18 +0000 (22:00 -0500)]
swc-installation-test-2.py: Add 'argparse'
I use this module (which entered the stdlib in 2.7/3.2) in my
get-my-ip.py script (in a different branch at the moment). Users with
older Python implementations will have to install an external module
(e.g. from PyPI).
W. Trevor King [Mon, 18 Feb 2013 12:41:07 +0000 (07:41 -0500)]
swc-installation-test-2.py: Add 'EasyMercurial'
Chris Cannam just released v1.3.0 which adds a --version option for
easy version testing [1].
[1]: https://bitbucket.org/cannam/easyhg/issue/1/teach-easymercurial-the-version-option
W. Trevor King [Mon, 28 Jan 2013 23:21:00 +0000 (18:21 -0500)]
swc-installation-test-2.py: Initial EditorTaskDependency implementation
I'm not sold on this idea...
W. Trevor King [Mon, 28 Jan 2013 18:09:38 +0000 (13:09 -0500)]
swc-installation-test-2.py: Add PathCommandDependency
OS X doesn't believe in $PATH ;). Work around this heresy by simply
checking for the existence of a characteristic file or directory
(e.g. /Applications/SomeApp.app). I use the new class to add 'xcode',
'sublime-text', 'textmate', and 'textwrangler' installations.
The location of the Xcode installation depends on your version of OS
X, and the 'xcode' comments show which path is expected for which
version.
W. Trevor King [Mon, 28 Jan 2013 15:31:18 +0000 (10:31 -0500)]
swc-installation-test-2.py: Add TornadoPythonPackage for version extraction
Tornado follows Python's example with tornado.version and
tornado.version_info instead of using tornado.__version__. While we
could parse tornado.version with our usual machinery, take advantage
of the pre-parsed version_info by defining a new class.
W. Trevor King [Mon, 28 Jan 2013 15:24:31 +0000 (10:24 -0500)]
swc-installation-test-2.py: Add long names for virtual-* packages
Give a more user-friendly description of what we're checking for.
W. Trevor King [Sun, 27 Jan 2013 22:03:42 +0000 (17:03 -0500)]
swc-installation-test-2.py: List all causes for or-dependency errors
Also make the and-dependency and or-dependency messages more friendly.
W. Trevor King [Sun, 27 Jan 2013 19:37:09 +0000 (14:37 -0500)]
swc-installation-test-2.py: Add IPython notebook dependencies
You can get a successful IPython import even if you haven't installed
the dependencies you need for viewing notebooks. This adds explicit
dependencies based on the current listings in IPython's setup.py.
W. Trevor King [Sun, 27 Jan 2013 19:33:46 +0000 (14:33 -0500)]
swc-installation-test-2.py: Print full DependencyError chain
If a requirement is not satisfied due to an and_dependency or
or_dependency failure, raise a new DependencyError and attach the
original error as its cause (this would be easier if we didn't have to
preserve Python 2.x support). This way we can print the whole chain
(e.g. virtual-shell failed because sh is not installed), instead of
just the lowest level error.
Also indent the messages, because:
check for virtual-editor failed:
or-dependency not satisfied for virtual-editor
For instructions on installing an up-to-date version, see
http://software-carpentry.org/setup/
cause:
check for Notepad++ (notepad++) failed:
could not find 'notepad++' executable
For instructions on installing an up-to-date version, see
http://software-carpentry.org/setup/
is more readable than:
check for virtual-editor failed:
or-dependency not satisfied for virtual-editor
For instructions on installing an up-to-date version, see
http://software-carpentry.org/setup/
cause:
check for Notepad++ (notepad++) failed:
could not find 'notepad++' executable
For instructions on installing an up-to-date version, see
http://software-carpentry.org/setup/
W. Trevor King [Sun, 27 Jan 2013 19:09:52 +0000 (14:09 -0500)]
swc-installation-test-2.py: Add and_dependencies to Python package setup
Not used by any packages yet, but I'm about to use it for IPython.
W. Trevor King [Sun, 27 Jan 2013 14:15:21 +0000 (09:15 -0500)]
swc-installation-test-2.py: Add gedit to virtual-editor
For Gnome users.
W. Trevor King [Sun, 27 Jan 2013 14:11:51 +0000 (09:11 -0500)]
swc-installation-test-2.py: Add Pandas (pandas) >= 0.8
It's being used in 2013-01-columbia.
W. Trevor King [Sat, 26 Jan 2013 22:46:55 +0000 (17:46 -0500)]
swc-installation-test-2.py: Handle unparsable versions gracefully
This avoids raising NotImplementedError from my IPython 0.14.dev. We
don't want to have to start ranking alpha, beta, dev, r6, etc., so
just print the unparsable version and minimum version, and leave it to
the student to decide if their version satisfies the condition. It's
unlikely that students have such pre-/post-release software installed
anyway.
W. Trevor King [Sat, 26 Jan 2013 22:43:48 +0000 (17:43 -0500)]
swc-installation-test-2.py: Add ipython (script) >= 0.13
And make sure the IPython package has the same minimum version.
IPython 0.12 can't display more recent notebooks.
W. Trevor King [Fri, 11 Jan 2013 18:32:58 +0000 (13:32 -0500)]
setup/README.md: Install-testing script care and feeding
W. Trevor King [Fri, 11 Jan 2013 18:13:27 +0000 (13:13 -0500)]
setup: Move installation test scripts under setup/
There will be a lot of other stuff in the boot camp repository. Stay
organized by keeping "how to set up and test your machine" stuff in a
subdirectory.
W. Trevor King [Fri, 11 Jan 2013 18:09:31 +0000 (13:09 -0500)]
swc-installation-test-2.py: Comment out 'mercurial' dependency
There can be trouble detecting the Python package, especially on MS
Windows where the installed version of Python used to run the script
may not know about installed version of Mercurial. Because nobody is
likely to use Mercurial's Python interface in a SWC class (they'll
probably stick to the command line interface), comment out this
dependency.
W. Trevor King [Tue, 1 Jan 2013 15:15:39 +0000 (10:15 -0500)]
swc-installation-test-2.py: Add 'virtual-pypi-installer' and 'pip'
Students who need a Python Package Index (PyPI) installer should be
fine with either easy_install or pip [1].
[1]: http://pypi.python.org/pypi/pip
http://www.pip-installer.org/
W. Trevor King [Tue, 1 Jan 2013 15:07:12 +0000 (10:07 -0500)]
swc-installation-test: Return 1 on failure
I doubt anyone will check the exit status for these scripts, but it's
still good to follow conventions.
W. Trevor King [Tue, 1 Jan 2013 15:07:05 +0000 (10:07 -0500)]
swc-installation-test-2.py: Better error message for unknown checks
W. Trevor King [Tue, 1 Jan 2013 14:56:35 +0000 (09:56 -0500)]
swc-installation-test-2.py: Document command line arguments
W. Trevor King [Tue, 1 Jan 2013 14:32:46 +0000 (09:32 -0500)]
swc-installation-test-2.py: Add MakeDependency class
On the fairly ancient SunOS 5.10 (January 2005), `make` doesn't
support `--version`. Looking into the POSIX.2 specs [1], it doesn't
have to. On FreeBSD [2] and in GNU Make [3], there is a MAKE_VERSION
variable, and the Sun executable has something similar:
$ strings make | grep MAKE_VERSION
.MAKE_VERSION
but it just expands to an empty string.
Since reading a makefile from stdin *is* in POSIX [1], we can use that
to test `make` if `make --version` fails. If we get something for
MAKE_VERSION, use that. If we get something for MAKE (required by
POSIX [2]), then call that a valid, but unkown, version.
[1]: http://pubs.opengroup.org/onlinepubs/
009695399/utilities/make.html#tag_04_84_04
[2]: http://lists.freebsd.org/pipermail/freebsd-questions/2010-October/222214.html
[3]: http://www.gnu.org/software/make/manual/html_node/Features.html#index-MAKE_005fVERSION-1021
[4]: http://pubs.opengroup.org/onlinepubs/
009695399/utilities/make.html#tag_04_84_13_08
W. Trevor King [Tue, 1 Jan 2013 14:31:56 +0000 (09:31 -0500)]
swc-installation-test-2.py: Add CommandDependency.stdin
I'm about to implement a version check for 'make' where I want to pass
a test Makefile in via stdin.
W. Trevor King [Tue, 1 Jan 2013 14:13:18 +0000 (09:13 -0500)]
swc-installation-test-2.py: Convert .version_option to .version_options
I'm about to implement a version check for 'make' where a single
option doesn't cut it. For version of Python before 3.3,
shlex.quote() doesn't exist [1], so use pipes.quote() instead [2].
[1]: http://docs.python.org/3/library/shlex.html#shlex.quote
[2]: http://bugs.python.org/issue9723
W. Trevor King [Tue, 1 Jan 2013 13:27:15 +0000 (08:27 -0500)]
swc-installation-test-2.py: Add OS-version detection
Using assorted functions from the `platform` module. On my Linux box:
$ python2.7
Python 2.7.3 (default, Dec 5 2012, 10:56:01)
[GCC 4.5.4] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import platform
>>> platform.linux_distribution()
('Gentoo Base System', '2.1', '')
>>> platform.mac_ver()
('', ('', '', ''), '')
>>> platform.win32_ver()
('', '', '', '')
On an OS X box:
$ python2.6
Python 2.6.1 (r261:67515, Aug 2 2010, 20:10:18)
[GCC 4.2.1 (Apple Inc. build 5646)] on darwin
Type "help", "copyright", "credits" or "license" for more information.
>>> import platform
>>> platform.linux_distribution()
('', '', '')
>>> platform.mac_ver()
('10.6.8', ('', '', ''), 'i386')
>>> platform.win32_ver()
('', '', '', '')
I don't have access to an MS Windows box, but presumably it returns
something like:
>>> platform.linux_distribution()
('', '', '')
>>> platform.mac_ver()
('', ('', '', ''), '')
>>> platform.win32_ver()
('XP', '5.1.2600', 'SP2', 'Multiprocessor Free')
We only want to print the one that applies (e.g. don't print a
'linux_distribution' entry on OS X), so we skip entries where value[0]
is an empty string.
W. Trevor King [Tue, 1 Jan 2013 13:26:02 +0000 (08:26 -0500)]
swc-installation-test-2.py: Use the more portable platform.uname()
From the docs [1,2]:
platform.uname():
Fairly portable uname interface... Entries which cannot be
determined are set to ''.
os.uname():
... Availability: recent flavors of Unix.
[1]: http://docs.python.org/2/library/platform.html#platform.uname
[2]: http://docs.python.org/2/library/os.html#os.uname
W. Trevor King [Tue, 1 Jan 2013 13:16:48 +0000 (08:16 -0500)]
swc-installation-test-2.py: Isolate system-info indent in _print_info
This way shifting the indents if you add a longer key is a single-line
operation.
W. Trevor King [Tue, 1 Jan 2013 13:01:45 +0000 (08:01 -0500)]
swc-installation-test-1.py: Give instructions for 'python command not found'
W. Trevor King [Tue, 1 Jan 2013 12:46:48 +0000 (07:46 -0500)]
swc-installation-test-2.py: Sort shells in order of preference
Placing the often-symlinked `sh` at the end of the list. This way if
a user has Bash installed, it doesn't show up as plain old Bourne.
W. Trevor King [Tue, 1 Jan 2013 12:45:03 +0000 (07:45 -0500)]
swc-installation-test-2.py: Break after first successful or-dependency
No need to test the other dependencies once you find one that matches.
W. Trevor King [Tue, 1 Jan 2013 12:41:28 +0000 (07:41 -0500)]
swc-installation-test-2.py: Give suggested install hints
I can't give package-specific links yet, but they will hopefully be in
place soon. I made the "email your instructor" suggestion optional,
because it is easy for me to imagine a course large enough that the
instructor could not field all requests. To disable, change
print_suggestions(instructor_fallback=True)
to
print_suggestions(instructor_fallback=False)
W. Trevor King [Tue, 1 Jan 2013 12:16:57 +0000 (07:16 -0500)]
swc-installation-test-1.py: Give suggested install hints
This can link to the "howto setup Python" notes from SWC once those
get a more precise link than:
http://software-carpentry.org/setup/
W. Trevor King [Tue, 1 Jan 2013 12:10:09 +0000 (07:10 -0500)]
swc-installation-test-2.py: Don't say how to get a terminal
We already told them how to do this in swc-installation-test-1.py,
hopefully they remember ;).
W. Trevor King [Tue, 1 Jan 2013 02:14:12 +0000 (21:14 -0500)]
swc-installation-test-2.py: Avoid BaseException.message warning
Dodge the logic which (at least in Python 2.6.1) raises:
DeprecationWarning: BaseException.message has been deprecated as of Python 2.6
We're setting the .message attribute explicitly, so the deprecation
warning does not apply to us. The fix was suggested by Brett Cannon:
On Sun Jul 8 02:42:18 CEST 2007, Brett Cannon wrote [1]:
> You can get around this easily enough with a subclass that uses a
> property for message::
>
> class gerror(Exception):
> def _get_message(self, message): return self._message
> def _set_message(self, message): self._message = message
> message = property(_get_message, _set_message)
[1]: http://mail.python.org/pipermail/python-dev/2007-July/073777.html
W. Trevor King [Tue, 1 Jan 2013 02:11:01 +0000 (21:11 -0500)]
swc-installation-test-2.py: Only require Git >= 1.7 (not >= 1.8)
Xcode 4.0.2 for OS X 10.6.8 shipped with Git 1.7.3.4.
W. Trevor King [Tue, 1 Jan 2013 02:04:52 +0000 (21:04 -0500)]
swc-installation-test-2.py: Add EasyInstallDependency class
Distribute's easy_install supports --version (at least since 0.6.21),
but Setuptool's original version does not (at least as of 0.6c9).
Assume that if we get some kind of reasonable output from
`easy_install --version` we're dealing with the Setuptools version.
W. Trevor King [Tue, 1 Jan 2013 01:34:52 +0000 (20:34 -0500)]
swc-installation-test-2.py: Add a virtual-shell and non-Bash shells
Commit to POSIX.2 [1] compatibility by allowing additional shells. If
anyone has something besides sh, bash, or dash installed, they
probably know how to use it ;).
[1]: http://pubs.opengroup.org/onlinepubs/
009695399/utilities/xcu_chap02.html
IEEE Std 1003.2-1992
W. Trevor King [Tue, 1 Jan 2013 01:28:25 +0000 (20:28 -0500)]
swc-installation-test-2.py: Don't require a specific Bash version
I have access to a machine running OS X 10.6.8, which has:
$ bash --version
GNU bash, version 3.2.48(1)-release (x86_64-apple-darwin10.0)
Copyright (C) 2007 Free Software Foundation, Inc.
That means no associative arrays, but for SWC purposes, it should
still get the job done. All we really need is POSIX.2.
W. Trevor King [Sun, 30 Dec 2012 18:24:51 +0000 (13:24 -0500)]
swc-installation-test-2.py: Fix version extraction for sqlite3-python
The 'sqlite3' package has the same version as the standard library.
We only check for it because sometimes (e.g. on Gentoo) Python may be
compiled without this package.
W. Trevor King [Sun, 30 Dec 2012 18:15:28 +0000 (13:15 -0500)]
swc-installation-test-2.py: Fix 'mercurial' version extraction
The Mercurial Python package stores its version in strange places.
W. Trevor King [Sun, 30 Dec 2012 18:14:37 +0000 (13:14 -0500)]
swc-installation-test-2.py: Refactor PythonPackageDependency._get_version
Split it into pieces for easier subclassing.
W. Trevor King [Sun, 30 Dec 2012 17:57:49 +0000 (12:57 -0500)]
swc-installation-test-2.py: Add import_module for older Pythons
importlib is new in Python 2.7 / 3.1. Add a minimal workaround for
earlier versions.
W. Trevor King [Sun, 30 Dec 2012 17:54:24 +0000 (12:54 -0500)]
swc-installation-test-2.py: Don't parse missing versions
W. Trevor King [Sun, 30 Dec 2012 17:51:49 +0000 (12:51 -0500)]
swc-installation-test-2.py: import print_function for Python 2.6
Otherwise `print()` actually prints `()`, where we want it to print a
blank line.
W. Trevor King [Sun, 30 Dec 2012 17:36:44 +0000 (12:36 -0500)]
swc-installation-test-2.py: Don't chain exceptions (yet)
Exception chaining (PEP 3134, 'raise ... from') raises SyntaxErros in
Python 2.x. Comment the chaining out until SWC starts teaching only
Python 3.x.
W. Trevor King [Sun, 30 Dec 2012 17:25:29 +0000 (12:25 -0500)]
swc-installation-test-2.py: Print successfully-found versions
This makes it easy to see what a user has installed.
W. Trevor King [Sun, 30 Dec 2012 16:43:47 +0000 (11:43 -0500)]
swc-installation-test-2.py: Don't print duplicate exceptions
For example, if you have an outdated 'python', you only want to hear
about that once, not once for each PythonPackageDependency.
W. Trevor King [Sun, 30 Dec 2012 16:41:25 +0000 (11:41 -0500)]
swc-installation-test-2.py: Cache check errors
Avoid running the same check (e.g. 'python') over and over.
W. Trevor King [Sun, 30 Dec 2012 16:37:10 +0000 (11:37 -0500)]
swc-installation-test-2.py: `PythonDependency`s should depend on Python
W. Trevor King [Sun, 30 Dec 2012 16:35:03 +0000 (11:35 -0500)]
swc-installation-test-2.py: Add exe_extension for MS Windows compat.
Use distutils' new_compiler() to get the appropriate exe_extension for
the user's system. This way command names can always be specified in
their bare form, and we'll automatically add the right executable
extension for other platforms.
W. Trevor King [Sun, 30 Dec 2012 15:31:55 +0000 (10:31 -0500)]
swc-installation-test-2.py: Add virtual-editor and virtual-browser
Often we don't care which editor is installed, so long as at least one
is installed. This commit tweaks Dependency and adds a
VirtualDependency class to support such virtual dependencies. You
can't get very fancy with boolean logic, but an all-and and all-or
lists will probably be sufficient for our needs.
W. Trevor King [Sun, 30 Dec 2012 15:07:54 +0000 (10:07 -0500)]
swc-installation-test-2.py: Add some editors and browsers
Based on a list of possibilities mentioned by Cait Pickens in an
internal email.
W. Trevor King [Sun, 30 Dec 2012 14:55:23 +0000 (09:55 -0500)]
swc-installation-test-2.py: sort CHECKS into topics
W. Trevor King [Sun, 30 Dec 2012 12:19:15 +0000 (07:19 -0500)]
swc-installation-test: Consolidate and reorganize test scripts
W. Trevor King [Sat, 29 Dec 2012 19:48:04 +0000 (14:48 -0500)]
Merge Konrad Hinsen and Fernando Perez's installation-testing scripts
Fernando Perez [Sat, 29 Dec 2012 19:43:59 +0000 (14:43 -0500)]
workshop_checklist.py: Add installation-testing script
This script was linked to by Eric Bray [1] and hosted on Fernando
Perez's website [2].
[1]: https://github.com/swcarpentry/website/issues/38#issuecomment-
11386945
[2]: http://fperez.org/py4science/workshop_checklist.py
Konrad Hinsen [Sat, 29 Dec 2012 19:41:13 +0000 (14:41 -0500)]
swc-installation-test.py: Add installation-testing script
The content of this script was posted by Greg Wilson and attributed to
Konrad Hinsen [1].
[1]: https://github.com/swcarpentry/website/issues/38#issuecomment-
11189525