summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
W. Trevor King [Mon, 16 Jun 2014 23:06:11 +0000 (16:06 -0700)]
Fix 'Add' -> 'Adds' to match 'The script' lead-in
"The script adds ..." reads better.
W. Trevor King [Mon, 16 Jun 2014 17:39:27 +0000 (10:39 -0700)]
README.md: Copy the docstring into a README
And add Markdown links for all the packages we reference. This gives
folks hitting the repository a more traditional welcome.
W. Trevor King [Mon, 16 Jun 2014 17:38:38 +0000 (10:38 -0700)]
swc-windows-installer.py: Fix 'swc_windows_installer.py' -> hyphens
Match our local script name in the instruction comment.
W. Trevor King [Mon, 16 Jun 2014 17:37:12 +0000 (10:37 -0700)]
swc-windows-installer.py: Change '~/nano.rc' to 'a ~/nano.rc'
I think the comment reads more clearly with the article.
W. Trevor King [Mon, 16 Jun 2014 17:36:16 +0000 (10:36 -0700)]
swc-windows-installer.py: Canonical SQLite capitalization
We might as well match the upstream capitalization conventions.
W. Trevor King [Mon, 16 Jun 2014 17:18:01 +0000 (10:18 -0700)]
COPYING: Add the full text of the MIT license
Downloaded from http://opensource.org/licenses/mit-license.html, with
the year from our first commit and a generic author identifier. For a
full list of copyright holders, see the version control history.
W. Trevor King [Mon, 9 Jun 2014 22:54:42 +0000 (15:54 -0700)]
swc-windows-installer.py: Add logging
The more light we can shine on the process, the more accessible it
will be to the students :). And the easier it will be to debug for
the helpers ;).
W. Trevor King [Mon, 9 Jun 2014 22:21:35 +0000 (15:21 -0700)]
swc-windows-installer.py: Link to msysGit releases on GitHub
I think this is the last bit of the old Google Code infrastructure
that was left to transition.
W. Trevor King [Mon, 9 Jun 2014 22:20:18 +0000 (15:20 -0700)]
swc-windows-installer.py: Standardize on 'msysGit' capitalization
That's what the project uses for itself.
W. Trevor King [Mon, 9 Jun 2014 22:17:58 +0000 (15:17 -0700)]
swc-windows-installer.py: Look for an R bin directory
On Thu, May 15, 2014 at 08:07:19PM -0700, Ethan White wrote:
> Problem: R is not added to the Windows' path when it is
> installed. This means that any workshops that use R from the command
> line will run into problems (as we did at the first Data Carpentry
> workshop).
>
> Solution: Add R to the path using our Windows' installer.
>
> Challenges: Just to make @wking's life exciting, R's path varies
> depending on the version. The standard path is `C:\Program
> Files\R\R-x.x.x\bin\` where `x.x.x` is the version number of the
> installed version of R.
Ethan White [Sun, 4 May 2014 17:56:45 +0000 (13:56 -0400)]
Add indication that the Windows installer is running
The Windows installer opens a shell while running. This adds some
text to that shell so that it is clear that something is happening.
W. Trevor King [Fri, 4 Apr 2014 15:51:29 +0000 (08:51 -0700)]
swc-windows-installer.py: Install the sqlite3 shell
On Thu, Apr 03, 2014 at 09:38:38AM -0700, Ethan White wrote:
> Some instructors like to teach `sqlite` from the command
> line. Therefore we should have the Windows installer handle
> downloading, installing and adding sqlite3 to the path.
The novice/sql lessons currently revolve around some IPython magic,
but even they use the SQLite shell to do the initial database setup
[1]. The SQLite shell has also seen a bit more developer time than
our one-off magic [2], so it's probably more robust ;).
I've installed this in it's own directory (rather than just dumping it
into ~/.swc/bin), because zip_install uses the existence of
${INSTALL_DIRECTORY} to decide whether or not the installation has
already happened. create_nosetests_entry_point will have already
created ${BIN_DIR}, so we need to use a different target directory for
SQLite. We could also flip the order and run install_sqlite first,
but that doesn't scale well if we install more packages in the future,
and it's easier to keep the installs separate and keep adding to the
path.
[1]: https://github.com/swcarpentry/bc/blob/
1aa0799ac6a48e9815d50bf2f49171b9eb5bf6d4/novice/sql/README.txt#L8
[2]: https://github.com/swcarpentry/bc/blob/
1aa0799ac6a48e9815d50bf2f49171b9eb5bf6d4/novice/sql/sqlitemagic.py
W. Trevor King [Thu, 27 Mar 2014 17:01:01 +0000 (10:01 -0700)]
swc-windows-installer.py: Generalize msysGit download link
SWC's current setup instructions use both "Git for Windows" and "Git
Bash" [1]. They link to the Git for Windows installer [2] and not the
msysGit installer [3]. Since SWC has Make lessons [4], I think it
makes more sense to have students installing msysGit (which has Make
[5]) than to have them install Git for Windows (which does not have
Make [6]).
However, none of this matters for *this* Windows installer. Because
this script works with both the full msysGit and the minimal Git for
Windows, I'm sticking to msysGit (the more generic project name), and
generalizing the suggested link to
http://code.google.com/p/msysgit/downloads/list.
[1]: https://github.com/swcarpentry/bc/blob/
5c26313b0525e9d0b911d9558592a9e33cd03c1e/_includes/setup.html#L86
[2]: http://code.google.com/p/msysgit/downloads/list?q=full+installer+official+git
[3]: http://code.google.com/p/msysgit/downloads/list?q=installer+hack+on+git
[4]: https://github.com/swcarpentry/bc/tree/master/intermediate/make
[5]: https://github.com/msysgit/msysgit#the-build-environment
[6]: https://github.com/msysgit/msysgit#the-relationship-between-msysgit-and-git-for-windows
W. Trevor King [Thu, 13 Mar 2014 15:19:25 +0000 (08:19 -0700)]
swc-windows-installer.py: Force UNIX-style \n line endings for ~/nano.rc
On Thu, Mar 13, 2014 at 03:37:12AM -0700, Ethan White wrote [1]:
> We now have a line ending issue resulting in:
>
> Error reading /cygdrive/c/Users/...
>
> This is fixed by running `dos2unix` on the resulting nano.rc.
This is also mentioned in the nano FAQ [2]:
> Note that the nano.rc file must remain Unix formated in order for
> nano to unerstand it.
Since Python 3.0 and PEP 3116, Python's open() has taken a 'newline'
argument that allows you to override the default line separator for a
particular file [3,4]. However, Python 2.x does not support that
argument [5]. This commit adds a local 'open3' which uses a terrible
hack of a wrapper on Python 2 to fake that support. It opens the file
in binary mode, and takes advantage of Python 2's lack of distinction
between str and bytes to treat the \n-terminated strings as the raw
binary output. That's going to crash and burn if you have any
non-ASCII characters in the output content, but we explicitly set all
the components in our relative include_path, so that shouldn't be a
problem.
Another side effect of binary-mode is that we are going to get
ASCII-encoded output, not output encoded in the user's preferred
encoding (locale.getpreferredencoding [3,6]). That's unfortunate,
because nano does the right thing and uses your locale to decode input
(at least for UTF-8 locales [7], presumably including your nano.rc
file).
[1]: https://github.com/swcarpentry/bc/pull/357#issuecomment-
37518899
[2]: http://www.nano-editor.org/dist/v2.2/faq.html#3.9.1
[3]: http://docs.python.org/3/library/functions.html#open
[4]: http://legacy.python.org/dev/peps/pep-3116/
[5]: http://docs.python.org/2/library/functions.html#open
[6]: http://docs.python.org/2/library/stdtypes.html#file.encoding
[7]: http://www.nano-editor.org/dist/v2.2/faq.html#5.3
W. Trevor King [Thu, 13 Mar 2014 02:21:57 +0000 (19:21 -0700)]
swc-windows-installer.py: Use POSIX paths for ~/nano.rc
On Wed, Mar 12, 2014 at 06:34:43PM -0700, Ethan White wrote [1]:
> The bash script in #228 is now working properly, but the Python
> script is still failing. It reports errors like:
>
> Error reading ~\.swc\share\nanorc\doc\syntax\python.nanorc
>
> The obvious difference is that the nano.rc files produced by the
> bash script have `/` for paths for the includes, but the Python
> script produces includes that use `\`.
[1]: https://github.com/swcarpentry/bc/pull/357#issuecomment-
37491038
W. Trevor King [Thu, 13 Mar 2014 00:07:39 +0000 (17:07 -0700)]
swc-windows-installer.py: Use '~' in ~/nano.rc includes
On Wed, Mar 12, 2014 at 04:44:31PM -0700, Ethan White wrote [1]:
> Got it. We just need to change the `/c/Users/River/` in the include
> statements to `~/` and everything works great!
[1]: https://github.com/swcarpentry/bc/pull/357#issuecomment-
37483149
W. Trevor King [Thu, 13 Mar 2014 00:02:50 +0000 (17:02 -0700)]
swc-windows-installer.py: Rename ~/.nanorc to ~/nano.rc
The nano FAQ hints that this is the prefered path on MS Windows [1],
and Ethan White confirmed it in testing [2].
[1]: http://www.nano-editor.org/dist/v2.2/faq.html#3.9.1
[2]: https://github.com/swcarpentry/bc/pull/357#issuecomment-
37482899
W. Trevor King [Wed, 5 Mar 2014 17:40:42 +0000 (09:40 -0800)]
swc-windows-installer.py: Install nano source syntax highlighters
Make writing Python source code (and a number of other languages) a
bit more exciting for the eyes and easier on the brain by coloring
strings, comments, and such.
We need to install the source tarball because the compiled zip doesn't
include the syntax highlighting scripts. To make that easier, I've
extracted out the download / hash-check functionality into a new
download(), which I use in both the old zip_install() and the new
tar_install(). If the user doesn't have an existing ~/.nanorc, we
populate it by adding 'include' options for each of the syntax files
in the Nano tarball. If they do have an existing ~/.nanorc, I assume
they know what they're doing ;).
The default '*' compression is for transparent detection [1], but you
can override it to explicitly select the compression type if you like.
There's a bit of ugliness to work around the lack of a
--strip-components analog in TarFile.extractall [2]. Instead, we
iterate over the TarInfo members and strip leading components from
their 'name' by hand [3].
[1]: http://docs.python.org/3/library/tarfile.html#tarfile.open
[2]: http://docs.python.org/3/library/tarfile.html#tarfile.TarFile.extractall
[3]: http://docs.python.org/3/library/tarfile.html#tarfile.TarInfo.name
Neal Davis [Mon, 27 Jan 2014 20:41:04 +0000 (14:41 -0600)]
swc-windows-installer.py: Quote $PATH export to account for spaces.
Many people have spaces in their Windows user names, leading to
trouble with an unquoted $PATH export. This file now quotes the $PATH
addition accordingly.
W. Trevor King [Wed, 13 Nov 2013 16:12:58 +0000 (08:12 -0800)]
swc-windows-installer.py: Use regular expressions to POSIX-ify paths
On a Windows 7 SP1 box with Python 2.7.3:
>>> import os.path
>>> os.path.expanduser('~')
'c:/Users/JohnDoe'
That wasn't matching the previous POSIX-ification patterns, which
assumed the drive prefix would be uppercase (C:). Now we use a
regular expression to match both cases.
W. Trevor King [Tue, 12 Nov 2013 18:05:08 +0000 (10:05 -0800)]
swc-windows-installer.py: Only create the python-scripts dir if it doesn't exist
os.makedirs, unlike 'mkdir -p', errors if the target directory already
exists [1,2].
[1]: http://docs.python.org/2/library/os.html#os.makedirs
"Raises an error exception if the leaf directory already exists
or cannot be created"
[2]: http://docs.python.org/3/library/os.html#os.makedirs
"If exist_ok is False (the default), an OSError is raised if the
target directory already exists."
W. Trevor King [Tue, 12 Nov 2013 18:02:23 +0000 (10:02 -0800)]
swc-windows-installer.py: Split out zip_install into its own function
This makes it easy to install other packages besides nano. I've also
added SHA1 checks to avoid installing packages that don't match the
expected hash. This lets us trust ZipFile.extractall instead of
extracting from a hard-coded list of approved files.
W. Trevor King [Thu, 31 Oct 2013 02:47:25 +0000 (19:47 -0700)]
swc-windows-installer.py: Restore nose entry point
This restores the nose entry point which was removed in
94caead
(swc-windows-installer.py: Remove IPython and nose entry points,
2013-10-21).
On Tue, Oct 22, 2013 at 11:36:21AM -0700, Ethan White wrote:
> IPython works fine for me on Windows 7 for both Anaconda and Canopy
> with no added entry points needed.
>
> Nosetests does not appear to have an entry point on Anaconda and I
> forgot to test it with Canopy.
I used a slightly different bin path than we'd used previously, to
respect
806fedf (swc-windows-installer.py: Rework install paths to use
~/.swc, 2013-10-21).
W. Trevor King [Wed, 23 Oct 2013 19:03:07 +0000 (12:03 -0700)]
swc-windows-installer.py: Remove nesting setup/
There's no need to hard-code target directories in this repository.
Anyone consuming this material can use submodules and pick their own
target directory.
W. Trevor King [Mon, 21 Oct 2013 05:37:48 +0000 (22:37 -0700)]
swc-nano-installer.py: Remove now that changes are in swc-windows-installer.py
W. Trevor King [Mon, 21 Oct 2013 16:41:49 +0000 (09:41 -0700)]
swc-windows-installer.py: Rework install paths to use ~/.swc
Instead of cluttering the user's home directory with multiple
SWC-installed directories, reduce clutter and improve namespacing by
dumping everything inside ~/.swc. Think of it as a SWC-specific
~/.local. We avoid actually using ~/.local because users might
already be using that for other purposes.
Use os.makedirs to create the nano install directory if it does not
already exist, because ZipFile.extract uses os.mkdir internally, and
mkdir will not recursively create directories.
W. Trevor King [Mon, 21 Oct 2013 16:36:38 +0000 (09:36 -0700)]
swc-windows-installer.py: Remove IPython and nose entry points
Ethan thought these had been fixed upstream, and Aron Ahmadia pointed
to the Anaconda v1.6.2 release notes [1]:
2013-07-09: 1.6.2: (Windows only)
Fixed path being incorrectly appended on Windows during install
That means we can drop our entry point scripts and fall back to just
installing Nano and setting up EDITOR.
[1]: http://docs.continuum.io/anaconda/changelog.html
W. Trevor King [Mon, 21 Oct 2013 05:35:00 +0000 (22:35 -0700)]
swc-windows-installer.py: De-emphasize Anaconda
Bridge the gap between the original Anaconda plug and Ethan's simpler
"Install Python" from
833d0ee (Add a Nano installer for Windows,
2013-09-17). As of Anaconda 1.7.0, IPython 1.0.0 and nose 1.3.0 are
included by default [1].
[1]: http://docs.continuum.io/anaconda/pkgs.html
W. Trevor King [Mon, 21 Oct 2013 05:31:24 +0000 (22:31 -0700)]
swc-windows-installer.py: Rework paths in main()
Based on Ethan's path handling in
833d0ee (Add a Nano installer for
Windows, 2013-09-17), while still retaining the entry-point creation
for IPython and nose.
W. Trevor King [Mon, 21 Oct 2013 05:27:23 +0000 (22:27 -0700)]
swc-windows-installer.py: Generalize update_bash_profile
And rename from make_bash_profile now that we're appending instead of
creating (since
c5d5414, Append exports to end of .bash_profile
instead of overwriting, 2013-09-19).
This more general form can be used to add even more paths, for example
our IPython and nosetest entry points.
Ethan White [Mon, 21 Oct 2013 05:01:59 +0000 (22:01 -0700)]
swc-windows-installer.py: Bring in Ethan's make_bash_profile and make_posix_path
This integerates some of Ethan's nano-installer changes. In the pull
request, Ethan elaborates on the .bash_profile choice [1]:
In response to comments on the Tutors list the installer now uses
.bash_profile instead of .bashrc and appends the lines rather than
overwriting the file. I have also added comments that indicate where
the new lines in .bash_profile come from.
Once the Python version is in I'll move on to getting this compiled
into a .exe file, which should be more familiar to our students and
won't run into issues with Canopy installs opening the file in
Canopy rather than executing it.
The referenced tutors@ discussion is in the messages leading up to
[2], where Ethan top-quotes a discussion with R. David Murray about
the relative merits of .bash_profile and .bashrc. The imporant point
David made was that .bash_profile is only executed once at login,
while .bashrc is executed for each new shell. Putting PATH appends in
.bash_profile means that you don't end up adding duplicate entries to
the PATH as you spawn subshells. For example:
${ORIGINAL_PATH}:${NANO_PATH}:${NANO_PATH}:...
[1]: https://github.com/swcarpentry/bc/pull/35
[2]: http://lists.software-carpentry.org/pipermail/tutors_lists.software-carpentry.org/2013-September/000969.html
W. Trevor King [Mon, 21 Oct 2013 17:09:11 +0000 (10:09 -0700)]
Merge branch 'nano-installer' into windows-installer
* nano-installer:
Remove testing line
Append exports to end of .bash_profile instead of overwriting
Switch from using .bashrc to .bash_profile nano path and editor export
Add a Nano installer for Windows
Ethan White [Fri, 20 Sep 2013 00:35:07 +0000 (20:35 -0400)]
Remove testing line
Ethan White [Fri, 20 Sep 2013 00:33:17 +0000 (20:33 -0400)]
Append exports to end of .bash_profile instead of overwriting
In the process at an explanation of where the lines came from
so that users know they can remove the lines if desired.
Ethan White [Fri, 20 Sep 2013 00:24:21 +0000 (20:24 -0400)]
Switch from using .bashrc to .bash_profile nano path and editor export
Ethan White [Wed, 18 Sep 2013 01:29:52 +0000 (21:29 -0400)]
Add a Nano installer for Windows
1. Downloads and installs Nano into the users home directory
2. Adds Nano to the path
3. Makes Nano the default editor
W. Trevor King [Wed, 20 Mar 2013 23:30:09 +0000 (19:30 -0400)]
swc-windows-installer.py: Use the stdlib's urlopen()
This way I can test the script (on Linux, but whatever) without having
to install an additional package.
W. Trevor King [Wed, 20 Mar 2013 23:10:16 +0000 (19:10 -0400)]
swc-windows-installer.py: Use lists for file content
This allows us to keep the usual Python block indentation while still
producing the appropriate wrapper content.
W. Trevor King [Wed, 20 Mar 2013 22:58:18 +0000 (18:58 -0400)]
swc-windows-installer.py: Use `with` to write script wrappers
From PEP 343. This gives you automatic file descriptor (file handles
on Windows?) cleanup on errors. Also use os.path.join() to build the
paths.
[1]: http://www.python.org/dev/peps/pep-0343/
W. Trevor King [Wed, 20 Mar 2013 22:42:49 +0000 (18:42 -0400)]
swc-windows-installer.py: Simplify `ipython` wrapper
This matches my system's `/usr/bin/ipython-2.7`, and is the hook
defined in IPython's setupbase.py:
'ipython%s = IPython.frontend.terminal.ipapp:launch_new_instance'
This should handle the 'notebook' option internally.
W. Trevor King [Wed, 20 Mar 2013 22:21:56 +0000 (18:21 -0400)]
swc-windows-installer.py: Extract nano directly to the install directory
This is more efficient than "extract to . and then copy". I also
renamed the install_nano() argument. The function doesn't care that
we're currently passing the Python script directory; it will work
perfectly well with a different directory in the PATH.
W. Trevor King [Wed, 20 Mar 2013 22:18:05 +0000 (18:18 -0400)]
swc-windows-installer.py: Avoid writing nano.zip to disk
It's already in memory, and we're going to use it again immediately.
Avoiding the flush-to-disk is both more efficient, and easier to clean
up.
W. Trevor King [Wed, 20 Mar 2013 22:13:44 +0000 (18:13 -0400)]
swc-windows-installer.py: Separate requests import from stdlib imports
Python-requests [1] is not part of the stdlib.
[1]: http://docs.python-requests.org/en/latest/
W. Trevor King [Wed, 20 Mar 2013 22:13:05 +0000 (18:13 -0400)]
swc-windows-installer.py: Cleanup whitespace
Ethan White [Wed, 20 Mar 2013 22:08:08 +0000 (18:08 -0400)]
swc-windows-installer.py: Setup msysgit to act like *nix systems
* Install `nano` 2.2.6.
* Add `ipython` and `nosetests` command line entry points.