Skip to content

Commit

Permalink
Merge pull request #1389 from eemperor/0.21.1
Browse files Browse the repository at this point in the history
Releases watchmaker version 0.21.1
  • Loading branch information
eemperor authored Aug 20, 2020
2 parents 2c35b8b + 1ce0ae6 commit a2ee360
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.21.0
current_version = 0.21.1
commit = False
tag = False
tag_name = {new_version}
Expand Down
17 changes: 9 additions & 8 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ disable=
too-many-instance-attributes,
too-many-statements,
unnecessary-pass,
useless-object-inheritance
useless-object-inheritance,
imports,

[REPORTS]

Expand Down Expand Up @@ -383,31 +384,31 @@ max-bool-expr=5
[IMPORTS]

# Deprecated modules which should not be used, separated by a comma
deprecated-modules=optparse
#deprecated-modules=optparse

# Create a graph of every (i.e. internal and external) dependencies in the
# given file (report RP0402 must not be disabled)
import-graph=
#import-graph=

# Create a graph of external dependencies in the given file (report RP0402 must
# not be disabled)
ext-import-graph=
#ext-import-graph=

# Create a graph of internal dependencies in the given file (report RP0402 must
# not be disabled)
int-import-graph=
#int-import-graph=

# Force import order to recognize a module as part of the standard
# compatibility libraries.
known-standard-library=
#known-standard-library=

# Force import order to recognize a module as part of a third party library.
known-third-party=enchant
#known-third-party=enchant

# Analyse import fallback blocks. This can be used to support both Python 2 and
# 3 compatible code, which means that the block might have code that exists
# only in one or another interpreter, leading to false positives when analysed.
analyse-fallback-blocks=no
#analyse-fallback-blocks=no


[EXCEPTIONS]
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
## Changelog

### 0.21.1

**Commit Delta**: [Change from 0.21.0 release](https://github.com/plus3it/watchmaker/compare/0.21.0...0.21.1)

**Released**: 2020.08.20

**Summary**:

* splunkforwarder-formula
- (Linux) Patches splunkforwarder state to work with Splunk Universal Forwarder v7.3.6

### 0.21.0

**Commit Delta**: [Change from 0.20.5 release](https://github.com/plus3it/watchmaker/compare/0.20.5...0.21.0)
Expand Down
6 changes: 3 additions & 3 deletions requirements/basics.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
setuptools==36.8.0;python_version<="2.6"
setuptools==43.0.0;python_version<="3.4" and python_version>="2.7"
setuptools==49.3.1;python_version>"3.4"
setuptools==49.6.0;python_version>"3.4"
virtualenv==15.2.0;python_version<="2.6"
virtualenv==20.0.30;python_version>="2.7"
virtualenv==20.0.31;python_version>="2.7"
wheel==0.29.0;python_version<="2.6"
wheel==0.33.6;python_version<="3.4" and python_version>="2.7"
wheel==0.34.2;python_version>"3.4"
wheel==0.35.1;python_version>"3.4"
2 changes: 1 addition & 1 deletion requirements/build.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
gravitybee==0.1.53
gravitybee==0.1.54
2 changes: 1 addition & 1 deletion requirements/check.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ flake8-docstrings==1.5.0
flake8-isort==4.0.0
flake8-future-import==0.4.6
flake8-print==3.1.4
isort==4.3.21
isort==5.4.2
m2r==0.2.1
pep8-naming==0.11.1
pydocstyle==5.0.2
Expand Down
4 changes: 2 additions & 2 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-r docs-check.txt

recommonmark==0.6.0
setuptools==49.3.1
sphinx==3.2.0
setuptools==49.6.0
sphinx==3.2.1
sphinx-rtd-theme==0.5.0
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pytest-travis-fold==1.3.0
pytest-catchlog==1.2.2;python_version<"2.7"
pytest-cov==2.5.1;python_version<"2.7"
pytest-cov==2.8.1;python_version<"3.5" and python_version>="2.7"
pytest-cov==2.10.0;python_version>="3.5"
pytest-cov==2.10.1;python_version>="3.5"
pytest-mock==1.6.3;python_version<"2.7"
pytest-mock==2.0.0;python_version<"3.5" and python_version>="2.7"
pytest-mock==3.2.0;python_version>="3.5"
Expand Down
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[metadata]
name = watchmaker
description = Applied Configuration Management
version = 0.21.0
version = 0.21.1
long_description = file: README.md, CHANGELOG.md
long_description_content_type = text/markdown
author = Plus3IT Maintainers of Watchmaker
Expand Down Expand Up @@ -103,7 +103,6 @@ line_length=79
known_first_party=watchmaker
default_section=THIRDPARTY
forced_separate=test_watchmaker
not_skip = __init__.py
skip =
.tox
build
Expand Down
2 changes: 1 addition & 1 deletion src/watchmaker/static/salt/formulas/ash-linux-formula

0 comments on commit a2ee360

Please sign in to comment.