Release watchmaker version 0.16.4

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.16.3
+current_version = 0.16.4
 commit = False
 tag = False
 tag_name = {new_version}

.gitmodules

@@ -46,3 +46,6 @@
 [submodule "src/watchmaker/static/salt/content"]
 	path = src/watchmaker/static/salt/content
 	url = https://github.com/plus3it/watchmaker-salt-content.git
+[submodule "src/watchmaker/static/salt/formulas/fup-formula"]
+	path = src/watchmaker/static/salt/formulas/fup-formula
+	url = https://github.com/plus3it/fup-formula.git

CHANGELOG.md

@@ -1,5 +1,23 @@
 ## Changelog
 
+### 0.16.4
+
+**Commit Delta**: [Change from 0.16.3 release](https://github.com/plus3it/watchmaker/compare/0.16.3...0.16.4)
+
+**Released**: 2019.08.23
+
+**Summary**:
+
+*   Updates documentation on pip usage in Linux to always use `python3 -m pip...`
+*   dotnet4-formula
+    -   Adds .NET Framework 4.8 version and associated KB to lookup tables
+*   fup-formula
+    -   New salt formula to install packages via URL
+*   scap-formula
+    -   (Windows) Adds configuration to allow scan results to be generated when using SCC v5.0.2 and higher
+*   watchmaker-salt-content
+    -   (Windows) Adds .NET Framework 4.8 info to dotnet winrepo package content
+
 ### 0.16.3
 
 **Commit Delta**: [Change from 0.16.2 release](https://github.com/plus3it/watchmaker/compare/0.16.2...0.16.3)

CONTRIBUTING.md

@@ -151,20 +151,20 @@ specify something like this for EC2 userdata:
     PYPI_URL=https://pypi.org/simple
 
     # Install pip
-    python3 -m ensurepip --upgrade --default-pip
+    python3 -m ensurepip
 
     # Install git
     yum -y install git
 
     # Upgrade pip and setuptools
-    pip install --index-url="$PYPI_URL" --upgrade pip setuptools
+    python3 -m pip install --index-url="$PYPI_URL" --upgrade pip setuptools
 
     # Clone watchmaker
     git clone "$GIT_REPO" --branch "$GIT_BRANCH" --recursive
 
     # Install watchmaker
     cd watchmaker
-    pip install --index-url "$PYPI_URL" --editable .
+    python3 -m pip install --index-url "$PYPI_URL" --editable .
 
     # Run watchmaker
     watchmaker --log-level debug --log-dir=/var/log/watchmaker

docs/installation.md

@@ -14,7 +14,7 @@ The preferred method to install `watchmaker` is from the Python Package Index
 the most recent stable release.
 
 ```bash
-pip install watchmaker
+python3 -m pip install watchmaker
 ```
 
 If you do not have Python or [pip][0], this [Python installation guide][1]
@@ -57,7 +57,7 @@ The sources for `watchmaker` are available from the [GitHub repo][2].
 3.  Then you can install Watchmaker:
 
     ```bash
-    pip install .
+    python3 -m pip install .
     ```
 
 ## From standalone executable package (Beta feature)

docs/usage.md

@@ -121,13 +121,13 @@ export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
 
 # Install pip
-python3 -m ensurepip --upgrade --default-pip
+python3 -m ensurepip
 
 # Install setup dependencies
-pip install --index-url="$PYPI_URL" --upgrade pip setuptools
+python3 -m pip install --index-url="$PYPI_URL" --upgrade pip setuptools
 
 # Install Watchmaker
-pip install --index-url="$PYPI_URL" --upgrade watchmaker
+python3 -m pip install --index-url="$PYPI_URL" --upgrade watchmaker
 
 # Run Watchmaker
 watchmaker --log-level debug --log-dir=/var/log/watchmaker
@@ -147,13 +147,13 @@ runcmd:
     export LANG=en_US.UTF-8
 
     # Install pip
-    python3 -m ensurepip --upgrade --default-pip
+    python3 -m ensurepip
 
     # Install setup dependencies
-    pip install --index-url="$PYPI_URL" --upgrade pip setuptools
+    python3 -m pip install --index-url="$PYPI_URL" --upgrade pip setuptools
 
     # Install Watchmaker
-    pip install --index-url="$PYPI_URL" --upgrade watchmaker
+    python3 -m pip install --index-url="$PYPI_URL" --upgrade watchmaker
 
     # Run Watchmaker
     watchmaker --log-level debug --log-dir=/var/log/watchmaker

requirements/check.txt

@@ -1,15 +1,15 @@
 check-manifest==0.39
 flake8==3.7.8
-flake8-bugbear==19.3.0
+flake8-bugbear==19.8.0
 flake8-builtins==1.4.1
 flake8-docstrings==1.3.1
 flake8-isort==2.7.0
-flake8-future-import==0.4.5
+flake8-future-import==0.4.6
 flake8-print==3.1.0
 isort==4.3.21
 m2r==0.2.1
 pep8-naming==0.8.2
-pydocstyle==3.0.0
+pydocstyle==4.0.1
 pygments==2.4.2
 pylint==2.3.1
 readme-renderer==24.0

requirements/docs.txt

@@ -1,4 +1,4 @@
 m2r==0.2.1
-setuptools==41.0.1
-sphinx==2.1.2
+setuptools==41.2.0
+sphinx==2.2.0
 sphinx-rtd-theme==0.4.3

requirements/pip.txt

@@ -1 +1 @@
-pip==19.2.1
+pip==19.2.2

requirements/test.txt

@@ -2,7 +2,7 @@ mock==2.0.0;python_version=="2.6"  # pyup: ==2.0.0
 mock==3.0.5;python_version>="2.7"
 pytest==3.2.5;python_version=="2.6" or python_version=="3.3"  # pyup: ==3.2.5
 pytest==4.6.3;python_version=="2.7" or python_version=="3.4"
-pytest==5.0.1;python_version>="3.5"
+pytest==5.1.1;python_version>="3.5"
 pytest-travis-fold==1.3.0
 pytest-catchlog==1.2.2;python_version=="2.6"
 pytest-cov==2.5.1;python_version=="2.6"  # pyup: ==2.5.1

setup.cfg

@@ -3,7 +3,7 @@
 [metadata]
 name = watchmaker
 description = Applied Configuration Management
-version = 0.16.3
+version = 0.16.4
 author = Plus3IT Maintainers of Watchmaker
 author_email = [email protected]
 url = https://github.com/plus3it/watchmaker
@@ -67,7 +67,7 @@ exclude =
     dist,
     htmlcov,
     */static/salt/formulas/*
-ignore = FI15,FI16,FI17,FI5,D107,W503,W504
+ignore = FI15,FI16,FI17,FI18,FI5,D107,W503,W504
 
 [tool:pytest]
 mock_use_standalone_module = true

src/watchmaker/__init__.py

@@ -163,6 +163,7 @@ class Arguments(dict):
                 # This list would be converted to the following dict and merged
                 # into the parameters passed to the worker configurations:
                 {'arg1': 'value1', 'arg2': 'value2'}
+
     """
 
     def __init__(
@@ -203,6 +204,7 @@ class Client(object):
     Keyword Arguments:
         arguments: (:obj:`Arguments`)
             A dictionary of arguments. See :class:`watchmaker.Arguments`.
+
     """
 
     def __init__(self, arguments):

src/watchmaker/logger/__init__.py

@@ -84,6 +84,7 @@ def make_log_dir(log_dir):
     Args:
         log_dir: (:obj:`str`)
         Path to a directory.
+
     """
     if not os.path.exists(log_dir):
         os.makedirs(log_dir)
@@ -123,6 +124,7 @@ def prepare_logging(log_dir, log_level):
             - ``warning``
             - ``info``
             - ``debug``
+
     """
     logformat = (
         '%(asctime)s [%(name)s][%(levelname)-5s][%(process)s]: %(message)s'

src/watchmaker/managers/platform.py

@@ -71,6 +71,7 @@ def retrieve_file(self, url, filename):
 
             filename: (:obj:`str`)
                 Path where the file will be saved.
+
         """
         # Convert a local path to a URI
         url = watchmaker.utils.uri_from_filepath(url)
@@ -268,6 +269,7 @@ def extract_contents(self, filepath, to_directory, create_dir=False):
                 Switch to control the creation of a subdirectory within
                 ``to_directory`` named for the filename of the compressed file.
                 (*Default*: ``False``)
+
         """
         if filepath.endswith('.zip'):
             self.log.debug('File Type: zip')

src/watchmaker/utils/__init__.py

@@ -77,6 +77,7 @@ def copytree(src, dst, force=False, **kwargs):
         force: (:obj:`bool`)
             Whether to delete destination prior to copy.
             (*Default*: ``False``)
+
     """
     if force and os.path.exists(dst):
         shutil.rmtree(dst)

src/watchmaker/workers/salt.py

@@ -83,6 +83,7 @@ class SaltBase(WorkerBase, PlatformManagerBase):
             computer account will be created when joining a domain.
             E.g. ``"OU=SuperCoolApp,DC=example,DC=com"``
             (*Default*: ``''``)
+
     """
 
     def __init__(self, *args, **kwargs):
@@ -319,6 +320,7 @@ def run_salt(self, command, **kwargs):
                 Watchmaker will always begin the command with the options
                 ``--local``, ``--retcode-passthrough``, and ``--no-color``, so
                 do not specify those options in the command.
+
         """
         cmd = [
             self.salt_call,
@@ -551,6 +553,7 @@ class SaltLinux(SaltBase, LinuxPlatformManager):
             A git reference present in ``git_repo``, such as a commit or a tag.
             If not specified, the HEAD of the default branch is used.
             (*Default*: ``''``)
+
     """
 
     def __init__(self, *args, **kwargs):
@@ -706,6 +709,7 @@ class SaltWindows(SaltBase, WindowsPlatformManager):
             salt formula. E.g. ``"MemberServer"``, ``"DomainController"``, or
             ``"Workstation"``
             (*Default*: ``''``)
+
     """
 
     def __init__(self, *args, **kwargs):

src/watchmaker/workers/yum.py

@@ -21,6 +21,7 @@ class Yum(WorkerBase, LinuxPlatformManager):
         repo_map: (:obj:`list`)
             List of dictionaries containing a map of yum repo files to systems.
             (*Default*: ``[]``)
+
     """
 
     SUPPORTED_DISTS = ('amazon', 'centos', 'red hat')

tests/test_saltworker.py

@@ -32,6 +32,7 @@ def test_default_valid_environments(saltworker_client):
 
     Args:
         saltworker_client: (:obj:`src.workers.SaltBase`)
+
     """
     # test that the defaults work
     assert saltworker_client.before_install() is None
@@ -43,6 +44,7 @@ def test_bogus_environment(saltworker_client):
 
     Args:
         saltworker_client: (:obj:`src.workers.SaltBase`)
+
     """
     # ensure InvalidValue is raised when a bogus environment type is selected
     with pytest.raises(InvalidValue):
@@ -57,6 +59,7 @@ def test_valid_environment(saltworker_client):
 
     Args:
         saltworker_client: (:obj:`src.workers.SaltBase`)
+
     """
     saltworker_client.ent_env = 'dev'
     saltworker_client.valid_envs = [None, 'dev', 'test', 'prod']