Merge pull request #838 from lorengordon/0.14.2

Releases watchmaker 0.14.2
plus3it · Mar 27, 2019 · b9d0e08 · b9d0e08
2 parents 8140226 + 5ba8e0b
commit b9d0e08
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 8 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.14.1
+current_version = 0.14.2
 commit = False
 tag = False
 tag_name = {new_version}

diff --git a/.editorconfig b/.editorconfig
@@ -11,3 +11,9 @@ charset = utf-8
 
 [.bumpversion.cfg]
 indent_style = tab
+
+[*.yml]
+indent_size = 2
+
+[*.yaml]
+indent_size = 2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 ## Changelog
 
+### 0.14.2
+
+**Commit Delta**: [Change from 0.14.1 release](https://github.com/plus3it/watchmaker/compare/0.14.1...0.14.2)
+
+**Released**: 2019.03.26
+
+**Summary**:
+
+*   join-domain-formula
+    -   Corrects regression on Windows to support adding admin groups that have
+        spaces in the name
+
 ### 0.14.1
 
 **Commit Delta**: [Change from 0.14.0 release](https://github.com/plus3it/watchmaker/compare/0.14.0...0.14.1)

diff --git a/appveyor.yml b/appveyor.yml
@@ -32,8 +32,10 @@ test_script:
   - set TOXENV=check
   - '%WITH_ENV% %PYTHON_HOME%\Scripts\tox -v'
 
-  - set TOXENV=docs
-  - '%WITH_ENV% %PYTHON_HOME%\Scripts\tox -v'
+  # Skips docs build on appveyor due to some (transient?) issue pulling pages from github
+  # Example failure: <https://ci.appveyor.com/project/plus3it/watchmaker#L273>
+  #- set TOXENV=docs
+  #- '%WITH_ENV% %PYTHON_HOME%\Scripts\tox -v'
 
   - set TOXENV=3.6-codecov
   - '%WITH_ENV% %PYTHON_HOME%\Scripts\tox -v'

diff --git a/requirements/check.txt b/requirements/check.txt
@@ -3,10 +3,10 @@ flake8==3.7.7
 flake8-bugbear==18.8.0
 flake8-builtins==1.4.1
 flake8-docstrings==1.3.0
-flake8-isort==2.6.0
+flake8-isort==2.7.0
 flake8-future-import==0.4.5
 flake8-print==3.1.0
-isort==4.3.15
+isort==4.3.16
 m2r==0.2.1
 pep8-naming==0.8.2
 pydocstyle==3.0.0

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -6,5 +6,5 @@ pytest-catchlog==1.2.2;python_version=="2.6"
 pytest-cov==2.5.1;python_version=="2.6"  # pyup: ==2.5.1
 pytest-cov==2.6.1;python_version>="2.7"
 pytest-mock==1.6.3;python_version=="2.6"  # pyup: ==1.6.3
-pytest-mock==1.10.1;python_version>="2.7"
+pytest-mock==1.10.2;python_version>="2.7"
 wheel==0.29.0;python_version<="2.6"  # pyup: ==0.29.0
diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@
 [metadata]
 name = watchmaker
 description = Applied Configuration Management
-version = 0.14.1
+version = 0.14.2
 author = Plus3IT Maintainers of Watchmaker
 author_email = [email protected]
 url = https://github.com/plus3it/watchmaker

diff --git a/src/watchmaker/static/salt/formulas/join-domain-formula b/src/watchmaker/static/salt/formulas/join-domain-formula