Merge pull request #143 from jacebrowning/release/v1.2

Release v1.2

Author: jacebrowning

.appveyor.yml

@@ -1,3 +1,10 @@
+environment:
+  global:
+    RANDOM_SEED: 0
+  matrix:
+    - PYTHON_MAJOR: 3
+      PYTHON_MINOR: 5
+
 cache:
   - env
 
@@ -14,6 +21,6 @@ install:
 build: off
 
 test_script:
-  - make test
   - make check
+  - make test
   - make demo

.gitignore

@@ -1,4 +1,5 @@
 /demo
+/tmp
 */tests/files/gitman_sources
 
 # Temporary Python files

.pep8rc .pycodestyle.ini.pep8rc renamed to .pycodestyle.ini

@@ -1,4 +1,4 @@
-[pep8]
+[pycodestyle]
 
 # E401 multiple imports on one line (checked by PyLint)
 # E402 module level import not at top of file (checked by PyLint)

.pep257 .pydocstyle.pep257 renamed to .pydocstyle

@@ -1,4 +1,4 @@
-[pep257]
+[pydocstyle]
 
 # D211: No blank lines allowed before class docstring
 add_select = D211

.pylintrc .pylint.ini.pylintrc renamed to .pylint.ini

@@ -1,6 +1,6 @@
 [MESSAGES CONTROL]
 
-disable=locally-disabled,fixme,too-few-public-methods,too-many-public-methods,invalid-name,global-statement,too-many-ancestors,missing-docstring
+disable=locally-disabled,fixme,too-few-public-methods,too-many-public-methods,invalid-name,global-statement,too-many-ancestors,missing-docstring,no-member
 
 [FORMAT]
 

.scrutinizer.yml

@@ -1,9 +1,12 @@
 checks:
-    python:
-        code_rating: true
-        duplicate_code: true
+  python:
+    code_rating: true
+    duplicate_code: true
 tools:
-    external_code_coverage: true
-    pylint:
-        python_version: 3
-        config_file: '.pylintrc'
+  external_code_coverage: true
+  pylint:
+    python_version: 3
+    config_file: '.pylintrc'
+filter:
+  excluded_paths:
+    - "*/tests/*"

.travis.yml

@@ -30,4 +30,4 @@ after_success:
 notifications:
   email:
     on_success: never
-    on_failure: change
+    on_failure: never

.verchew .verchew.ini.verchew renamed to .verchew.ini

@@ -1,9 +1,12 @@
 # Revision History
 
+## 1.2 (2017/01/08)
+
+- Added preliminary Windows support (@StudioEtrange).
+
 ## 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)

CHANGELOG.md

@@ -2,9 +2,11 @@
 PROJECT := GitMan
 PACKAGE := gitman
 REPOSITORY := jacebrowning/gitman
+
+# Project paths
 PACKAGES := $(PACKAGE) tests
-CONFIG := $(shell ls *.py)
-MODULES := $(shell find $(PACKAGES) -name '*.py') $(CONFIG)
+CONFIG := $(wildcard *.py)
+MODULES := $(wildcard $(PACKAGE)/*.py)
 
 # Python settings
 ifndef TRAVIS
@@ -62,7 +64,7 @@ HONCHO := $(ACTIVATE) && $(BIN)/honcho
 # MAIN TASKS ###################################################################
 
 .PHONY: all
-all: doc
+all: install
 
 .PHONY: ci
 ci: check test demo ## Run all tasks that determine CI status
@@ -78,8 +80,6 @@ demo: install
 	$(BIN)/gitman list
 	$(BIN)/gitman lock
 	$(BIN)/gitman uninstall
-	$(BIN)/gitman show
-	- $(BIN)/gitman edit
 
 # SYSTEM DEPENDENCIES ##########################################################
 
@@ -124,29 +124,24 @@ $(PYTHON):
 
 # CHECKS #######################################################################
 
-PEP8 := $(BIN)/pep8
-PEP8RADIUS := $(BIN)/pep8radius
-PEP257 := $(BIN)/pep257
 PYLINT := $(BIN)/pylint
+PYCODESTYLE := $(BIN)/pycodestyle
+PYDOCSTYLE := $(BIN)/pydocstyle
 
 .PHONY: check
-check: pep8 pep257 pylint ## Run linters and static analysis
-
-.PHONY: pep8
-pep8: install ## Check for convention issues
-	$(PEP8) $(PACKAGES) $(CONFIG) --config=.pep8rc
-
-.PHONY: pep257
-pep257: install ## Check for docstring issues
-	$(PEP257) $(PACKAGES) $(CONFIG)
+check: pylint pycodestyle pydocstyle ## Run linters and static analysis
 
 .PHONY: pylint
 pylint: install ## Check for code issues
-	$(PYLINT) $(PACKAGES) $(CONFIG) --rcfile=.pylintrc
+	$(PYLINT) $(PACKAGES) $(CONFIG) --rcfile=.pylint.ini
+
+.PHONY: pycodestyle
+pycodestyle: install ## Check for code conventions
+	$(PYCODESTYLE) $(PACKAGES) $(CONFIG) --config=.pycodestyle.ini
 
-.PHONY: fix
-fix: install
-	$(PEP8RADIUS) --docformatter --in-place
+.PHONY: pydocstyle
+pydocstyle: install ## Check for docstring conventions
+	$(PYDOCSTYLE) $(PACKAGES) $(CONFIG)
 
 # TESTS ########################################################################
 
@@ -179,12 +174,14 @@ test-unit: install ## Run the unit tests
 .PHONY: test-int
 test-int: install ## Run the integration tests
 	@ if test -e $(FAILURES); then TEST_INTEGRATION=true $(PYTEST) $(PYTEST_OPTS_FAILFAST) tests; fi
-	$(PYTEST) $(PYTEST_OPTS) tests --junitxml=$(REPORTS)/integration.xml
+	@ rm -rf $(FAILURES)
+	TEST_INTEGRATION=true $(PYTEST) $(PYTEST_OPTS) tests --junitxml=$(REPORTS)/integration.xml
 	$(COVERAGE_SPACE) $(REPOSITORY) integration
 
 .PHONY: test-all
 test-all: install ## Run all the tests
 	@ if test -e $(FAILURES); then TEST_INTEGRATION=true $(PYTEST) $(PYTEST_OPTS_FAILFAST) $(PACKAGES); fi
+	@ rm -rf $(FAILURES)
 	TEST_INTEGRATION=true $(PYTEST) $(PYTEST_OPTS) $(PACKAGES) --junitxml=$(REPORTS)/overall.xml
 	$(COVERAGE_SPACE) $(REPOSITORY) overall