Merge pull request #139 from jacebrowning/release/v1.1

Release v1.1

.appveyor.yml

@@ -0,0 +1,19 @@
+cache:
+  - env
+
+install:
+  # Export build paths
+  - copy C:\MinGW\bin\mingw32-make.exe C:\MinGW\bin\make.exe
+  - set PATH=%PATH%;C:\MinGW\bin
+  - make --version
+  # Check system dependencies
+  - make doctor
+  # Install project dependencies
+  - make install
+
+build: off
+
+test_script:
+  - make test
+  - make check
+  - make demo

.gitignore

@@ -1,3 +1,4 @@
+/demo
 */tests/files/gitman_sources
 
 # Temporary Python files
@@ -37,10 +38,12 @@ Icon*
 .coverage
 .coverage.*
 /htmlcov
+/xmlreport
 /pyunit.xml
 *.tmp
 
 # Build and release directories
+*.spec
 /build
 /dist
 

.pep8rc

@@ -1,6 +1,8 @@
 [pep8]
 
+# E401 multiple imports on one line (checked by PyLint)
+# E402 module level import not at top of file (checked by PyLint)
 # E501: line too long (checked by PyLint)
 # E711: comparison to None (used to improve test style)
 # E712: comparison to True (used to improve test style)
-ignore = E501,E711,E712
+ignore = E401,E402,E501,E711,E712

.pylintrc

@@ -8,6 +8,12 @@ max-line-length=80
 
 ignore-long-lines=^.*((https?:)|(pragma:)|(TODO:)).*$
 
+[SIMILARITIES]
+
+min-similarity-lines=4
+
+ignore-imports=yes
+
 [REPORTS]
 
 reports=no

.travis.yml

@@ -1,32 +1,31 @@
-sudo: false
-
 language: python
 python:
-- 3.5
+  - 3.5
 
 cache:
   pip: true
   directories:
-  - env
+    - ~/virtualenv/python3.5.*
 
 env:
   global:
-  - RANDOM_SEED=12345
+    - RANDOM_SEED=0
 
-install:
-- pip install coveralls scrutinizer-ocular
+before_install:
+  - make doctor
 
-before_script:
-- make env
-- make depends
+install:
+  - make install
 
 script:
-- make check
-- make test
+  - make check
+  - make test
+  - make demo
 
 after_success:
-- coveralls
-- ocular
+  - pip install coveralls scrutinizer-ocular
+  - coveralls
+  - ocular
 
 notifications:
   email:

.verchew

@@ -0,0 +1,41 @@
+[Make]
+
+cli = make
+
+version = GNU Make
+
+
+[Python]
+
+cli = python
+
+version = Python 3.5.
+
+
+[Git]
+
+cli = git
+
+version = 2.
+
+
+[virtualenv]
+
+cli = virtualenv
+
+version = 15.
+
+
+[pandoc]
+
+cli = pandoc
+
+version = 1.
+
+
+[Graphviz]
+
+cli = dot
+cli_version_arg = -V
+
+version = 2.

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Revision History
 
+## 1.1 (2017/01/06)
+
+- Added coloring to the command-line output.
+- Added preliminary Windows support.
+- Fixed issue where `<dirty>` could be saved as a locked revision.
+
 ## 1.0.2 (2016/07/28)
 
 - Moved documentation to http://gitman.readthedocs.io/.

CONTRIBUTING.md

@@ -5,18 +5,24 @@
 ### Requirements
 
 * Make:
-    * Windows: http://cygwin.com/install.html
+    * Windows: https://cygwin.com/install.html
     * Mac: https://developer.apple.com/xcode
-    * Linux: http://www.gnu.org/software/make (likely already installed)
+    * Linux: https://www.gnu.org/software/make (likely already installed)
 * Pandoc: http://johnmacfarlane.net/pandoc/installing.html
 * Graphviz: http://www.graphviz.org/Download.php
 
+To confirm these system dependencies are configured correctly:
+
+```sh
+$ make doctor
+```
+
 ### Installation
 
-Create a virtual environment:
+Install project dependencies into a virtual environment:
 
-```
-$ make env
+```sh
+$ make install
 ```
 
 ## Development Tasks
@@ -25,14 +31,14 @@ $ make env
 
 Manually run the tests:
 
-```
+```sh
 $ make test
 $ make tests  # includes integration tests
 ```
 
 or keep them running on change:
 
-```
+```sh
 $ make watch
 ```
 
@@ -42,15 +48,15 @@ $ make watch
 
 Build the documentation:
 
-```
+```sh
 $ make doc
 ```
 
 ### Static Analysis
 
 Run linters and static analyzers:
 
-```
+```sh
 $ make pep8
 $ make pep257
 $ make pylint
@@ -61,15 +67,15 @@ $ make check  # includes all checks
 
 The CI server will report overall build status:
 
-```
+```sh
 $ make ci
 ```
 
 ## Release Tasks
 
 Release to PyPI:
 
-```
+```sh
 $ make upload-test  # dry run upload to a test server
 $ make upload
 ```