Added information for how to enable git-hooks (see docs/enable_githooks.md) to automatically update the build number in version.py. Also updated docs/make_release.md to reflect changes to how version.py should be updated when making a release. Redefined build variable in version.py to be the commit number since the release of major.minor.micro with the appropriate tag.

Author: jdhughes-dev

docs/enable_githooks.md

@@ -0,0 +1,15 @@
+Instructions for using git-hooks to automatically update FloPy `build` in `version.py`
+-----------------------------------------------
+
+## Update files
+
+1. Delete `pre-commit.sample` file in `.git/hooks`.
+2. Copy `pre-commit.sh` in root directory to `.git/hooks` directory.
+3. Remove `.sh` extension from `pre-commit.sh` in `.git/hooks` directory.
+4. Make sure `.git/hooks/pre-commit` is executable using `chmod +x .git/hooks/pre-commit`.
+
+## Reset SourceTree to use system git
+
+1.  SourceTree will use git-hooks if the Embedded Git is git 2.9+. SourceTree version 2.5.3 uses git 2.10.0.
+2. If your version of SourceTree is using a version earlier than 2.9 then modify the SourceTree preferences to use the system version of git. All you have to do is got to `SourceTree -> Preferences -> Git` and choose `Use System Git` which can be found at `/usr/bin/git/`. See [https://medium.com/@onmyway133/sourcetree-and-pre-commit-hook-52545f22fe10](https://medium.com/@onmyway133/sourcetree-and-pre-commit-hook-52545f22fe10) for additional information. 
+

docs/make_release.md

@@ -5,7 +5,7 @@ Instructions for making a FloPy release
 
 1.  Update information in `.\docs\USGS_release.md`
 2.  Rename version number at top of `README.md` from FloPy Version 3.2.X-dev to FloPy Version 3.2.X.
-3.  Update version number in `flopy/version.py`. Use GitHub website to determine what the next build number is for `__build__`
+3.  Update version number in `flopy/version.py`. Update the `major`, `minor`, and/or `micro` variables as appropriate. The pre-commit hook will update the `build` variable to 0 since a `tag` has not been created for the release yet.
 
 ## Build USGS release notes
 

flopy/version.py

@@ -1,9 +1,9 @@
 #flopy version file automatically created using...pre-commit.py
-#            created on......July 12, 2017 15:44:05
+#            created on......July 12, 2017 16:17:54
 
 major = 3
 minor = 2
 micro = 6
-build = 75
+build = 76
 
-__version__= '3.2.6.75'
+__version__= '{:d}.{:d}.{:d}.{:d}'.format(major, minor, micro, build)

pre-commit.py

@@ -73,7 +73,7 @@ def update_version():
         f.write('minor = {}\n'.format(vminor))
         f.write('micro = {}\n'.format(vmicro))
         f.write('build = {}\n\n'.format(vbuild))
-        f.write("__version__= '{}'\n".format(v1))
+        f.write("__version__= '{:d}.{:d}.{:d}.{:d}'.format(major, minor, micro, build)")
         f.close()
         print('Succesfully updated version.py')
     except: