Merge pull request #1556 from kumoy/0.21.5

Release watchmaker version 0.21.5

.bumpversion.cfg

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

.travis.yml

@@ -11,9 +11,9 @@ env:
     - SEGFAULT_SIGNALS=all
 python:
   - 2.7
-  - 3.5
   - 3.6
   - 3.7
+  - 3.8
 if: branch in (master, develop) OR type = pull_request OR tag is present
 before_install:
   # don't overwrite env if it's already set (otherwise check, docs won't work properly)
@@ -53,14 +53,6 @@ notifications:
     on_failure: always
 jobs:
   include:
-    - stage: test
-      python: 2.6
-      dist: trusty
-
-    - stage: test
-      python: 3.4
-      dist: xenial
-
     - stage: test
       name: lint
       python: 3.6
@@ -113,7 +105,7 @@ jobs:
     - stage: deploy
       name: deploy to pypi
       if: type != pull_request AND (branch = develop OR tag is present)
-      python: 2.7
+      python: 3.6
       install: skip
       script: skip
       before_deploy: echo Deploying "$(grep 'version = ' setup.cfg)"

CHANGELOG.md

@@ -1,5 +1,21 @@
 ## Changelog
 
+### 0.21.5
+
+**Commit Delta**: [Change from 0.21.4 release](https://github.com/plus3it/watchmaker/compare/0.21.4...0.21.5)
+
+**Released**: 2021.02.25
+
+**Summary**:
+
+*   ash-linux-formula
+    - Replace `watch` with `listen` to restart the `sshd` service a single time
+    - Make state RHEL-07-040560 more resilient when the yum group info is missing
+*   scap-formula
+    - Updates SCAP content from DISA (as of February 2021) and OpenSCAP (v0.1.54)
+*   Update watchmaker default `config.yaml` to use salt v2019.2.8
+*   Ability to browse [Watchmaker Cloudarmor repo](https://watchmaker.cloudarmor.io/list.html)
+
 ### 0.21.4
 
 **Commit Delta**: [Change from 0.21.3 release](https://github.com/plus3it/watchmaker/compare/0.21.3...0.21.4)

docs/conf.py

@@ -372,15 +372,16 @@
 autosectionlabel_prefix_document = True
 
 linkcheck_ignore = [
-    r'https://github.com/plus3it/watchmaker/compare/(\d+\.){3}\.(\.\d+){3}',
-    r'https://github.com/plus3it/watchmaker/compare/(\d+\.){3}\.(\.x){3}',
-    r'https://watchmaker.cloudarmor.io/releases/(.*)$',
-    r'https://docs\.saltstack\.com/en/latest/ref/modules/all/[a-z\.]*#[a-z\.]*'
+    r'https://github\.com/plus3it/watchmaker/compare/(\d+\.){3}\.(\.\d+){3}',
+    r'https://github\.com/plus3it/watchmaker/compare/(\d+\.){3}\.(\.x){3}',
+    r'https://watchmaker\.cloudarmor\.io/releases/.*$',
+    r'https://watchmaker\.cloudarmor\.io\/list\.html#.*',
+    r'https://docs\.saltstack\.com/en/latest/ref/modules/all/[a-z\.]*#[a-z\.]*',  # noqa: E501, pylint: disable=line-too-long
 ]
 
 
 def setup(app):  # noqa: D103
-    app.add_stylesheet("theme_overrides.css")
+    app.add_css_file("theme_overrides.css")
     app.add_config_value(
         'recommonmark_config',
         {

docs/configuration.md

@@ -209,6 +209,10 @@ Parameters supported by the Yum Worker:
 
 ## Example config.yaml
 
+This example can be used to construct your own `config.yaml` file. The
+[Cloudarmor repo][2] provides yum repo definitions and installers for a few salt
+versions.
+
 ```yaml
 watchmaker_version: "~= 0.17.0"
 all:
@@ -265,3 +269,4 @@ windows:
 
 [0]: https://yaml.org/spec/1.2/spec.html
 [1]: https://github.com/plus3it/watchmaker/blob/develop/src/watchmaker/static/config.yaml
+[2]: https://watchmaker.cloudarmor.io/list.html

docs/installation.md

@@ -32,10 +32,10 @@ can guide you through the process.
     the [FAQ](faq.html) for more details.
 ```
 
-## From sources
+## From source
 
 Watchmaker can also be built and installed from source, using `git` and `pip`.
-The sources for `watchmaker` are available from the [GitHub repo][2].
+The source for `watchmaker` are available from the [GitHub repo][2].
 
 1.  First clone the public repository to pull the code to your local machine:
 
@@ -64,60 +64,59 @@ The sources for `watchmaker` are available from the [GitHub repo][2].
     python3 -m pip install .
     ```
 
-## From standalone executable package (Beta feature)
+## From standalone executable
 
-*Standalone packages are a beta feature and may not function in all
-environments.*
+Watchmaker can also be downloaded and executed in an all-in-one package containing
+Watchmaker's dependencies, such as Python and necessary Python packages. Packages
+are available for Windows and Linux.
 
-Watchmaker can also be downloaded and executed in an all-in-one
-package containing Watchmaker's dependencies, such as Python and
-necessary Python packages.  Packages are available for Windows and
-Linux.
+1.  Retrieve the Watchmaker standalone package for your desired platform from
+    GitHub Releases or the [Cloudarmor repo][5].
 
-1.  Download the Watchmaker standalone package for your desired platform from
-    GitHub Releases or AWS S3.
+    *   [GitHub Releases][3] shows the available Watchmaker versions and includes
+        links to the Windows and Linux packages, and their SHA256 hashes.
+    *   The [latest release][4] can also be directly accessed on GitHub:
 
-    *   [GitHub Releases][3] shows the available
-        Watchmaker versions and includes links to the
-        Windows and Linux packages, and SHA256 hashes.
-        The [latest release][4] can also be directly accessed on GitHub.
-    *   The AWS S3 bucket also contains versioned Watchmaker packages
-        and corresponding SHA256 hashes. To access versions on S3, construct a
-        URL using these examples for version 0.9.7:
+        *   `https://github.com/plus3it/watchmaker/releases/latest/`
 
-        *   https://watchmaker.cloudarmor.io/releases/0.9.7/watchmaker-0.9.7-standalone-linux-x86_64
-        *   https://watchmaker.cloudarmor.io/releases/0.9.7/watchmaker-0.9.7-standalone-windows-amd64.exe
+    *   The [Cloudarmor repo][5] also contains versioned Watchmaker packages
+        and corresponding SHA256 hashes. You can [browse the repo][5], or construct
+        the URL to the files using these patterns:
 
-    *   Links to the latest versions of Watchmaker and SHA hashes on S3 are:
+        *   `https://watchmaker.cloudarmor.io/releases/${VERSION}/watchmaker-${VERSION}-standalone-linux-x86_64`
+        *   `https://watchmaker.cloudarmor.io/releases/${VERSION}/watchmaker-${VERSION}-sha256-linux-x86_64.json`
+        *   `https://watchmaker.cloudarmor.io/releases/${VERSION}/watchmaker-${VERSION}-standalone-windows-amd64.exe`
+        *   `https://watchmaker.cloudarmor.io/releases/${VERSION}/watchmaker-${VERSION}-sha256-windows-amd64.json`
 
-        *   https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-standalone-linux-x86_64
-        *   https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-sha256-linux-x86_64.json
-        *   https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-standalone-windows-amd64.exe
-        *   https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-sha256-windows-amd64.json
+    *   The [latest release][6] is always available on the Cloudarmor repo at these
+        URLs:
 
-    *   From PowerShell, the Windows package can be downloaded
-        as follows:
+        *   `https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-standalone-linux-x86_64`
+        *   `https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-sha256-linux-x86_64.json`
+        *   `https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-standalone-windows-amd64.exe`
+        *   `https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-sha256-windows-amd64.json`
+
+    *   From PowerShell, the Windows package can be downloaded as follows:
 
         ```ps1con
         PS C:\wam> $url = "https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-standalone-windows-amd64.exe"
         PS C:\wam> (New-Object System.Net.WebClient).DownloadFile($url, "watchmaker.exe")
         ```
 
-    *   From the command line, the Linux package can be downloaded
-        as follows:
+    *   From the command line, the Linux package can be downloaded as follows:
 
         ```console
         # curl -so watchmaker https://watchmaker.cloudarmor.io/releases/latest/watchmaker-latest-standalone-linux-x86_64
         ```
 
     *   For the latest package, the version of Watchmaker can be determined by
-        viewing the contents of the SHA256 hash file or by executing the
-        package with the `--version` flag.
+        viewing the contents of the SHA256 hash file or by executing the package
+        with the `--version` flag.
 
 2.  Verify the integrity of the standalone package.
 
-    Compare the SHA256 hash contained in the downloaded hash file to
-    a hash you compute for the package.
+    Compare the SHA256 hash contained in the downloaded hash file to a hash you
+    compute for the package.
 
     For Linux, execute this command to compute the SHA256 hash:
 
@@ -133,8 +132,8 @@ Linux.
 
 3.  Set executable access permission.
 
-    For Linux, you will need to set the access permissions to allow the
-    standalone executable to run. Below is an example:
+    For Linux, you will need to set the access permissions to allow the standalone
+    executable to run. Below is an example:
 
     ```console
     # chmod +x watchmaker-latest-standalone-linux-x86_64
@@ -146,3 +145,5 @@ Linux.
 [2]: https://github.com/plus3it/watchmaker
 [3]: https://github.com/plus3it/watchmaker/releases/
 [4]: https://github.com/plus3it/watchmaker/releases/latest/
+[5]: https://watchmaker.cloudarmor.io/list.html
+[6]: https://watchmaker.cloudarmor.io/list.html#releases/latest/

requirements/basics.txt

@@ -1,8 +1,5 @@
-setuptools==36.8.0;python_version<="2.6"
-setuptools==43.0.0;python_version<="3.4" and python_version>="2.7"
-setuptools==50.3.2;python_version>"3.4"
-virtualenv==15.2.0;python_version<="2.6"
-virtualenv==20.2.1;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.36.0;python_version>"3.4"
+setuptools==43.0.0;python_version<="2.7"
+setuptools==53.0.0;python_version>="3.6"
+virtualenv==20.4.2
+wheel==0.33.6;python_version<="2.7"
+wheel==0.36.2;python_version>="3.6"

requirements/build.txt

@@ -1 +1 @@
-gravitybee==0.1.63
+gravitybee==0.1.70

requirements/check.txt

@@ -1,16 +1,16 @@
 -r docs-check.txt
 
-check-manifest==0.45
+check-manifest==0.46
 flake8==3.8.4
 flake8-bugbear==20.11.1
 flake8-builtins==1.5.3
 flake8-docstrings==1.5.0
 flake8-isort==4.0.0
 flake8-future-import==0.4.6
 flake8-print==4.0.0
-isort==5.6.4
+isort==5.7.0
 m2r==0.2.1
 pep8-naming==0.11.1
 pydocstyle==5.1.1
-pylint==2.6.0
-readme-renderer==28.0
+pylint==2.7.1
+readme-renderer==29.0

requirements/deploy.txt

@@ -1 +1 @@
-satsuki==0.1.28
+satsuki==0.1.30

requirements/docs-check.txt

@@ -1 +1 @@
-pygments==2.7.2
+pygments==2.8.0

requirements/docs.txt

@@ -1,6 +1,6 @@
 -r docs-check.txt
 
-recommonmark==0.6.0
-setuptools==50.3.2
-sphinx==3.3.0
-sphinx-rtd-theme==0.5.0
+recommonmark==0.7.1
+setuptools==53.0.0
+sphinx==3.5.1
+sphinx-rtd-theme==0.5.1

requirements/pip.txt

@@ -1,3 +1,2 @@
-pip==9.0.3;python_version<="2.6"
-pip==19.1;python_version<="3.4" and python_version>="2.7"
-pip==20.3.1;python_version>"3.4"
+pip==19.1;python_version<="2.7"
+pip==21.0.1;python_version>="3.6"

requirements/report.txt

@@ -1,4 +1,3 @@
 argparse==1.4.0
 codecov<=2.0.5;platform_system=="Windows"  # pyup: ==2.0.5 # see https://github.com/codecov/support/issues/402
-codecov==2.0.15;platform_system!="Windows" and python_version<="2.6"
-codecov==2.1.10;platform_system!="Windows" and python_version>"2.6"
+codecov==2.1.11;platform_system!="Windows"

requirements/test.txt

@@ -1,15 +1,9 @@
-mock==2.0.0;python_version<"2.7"
-mock==3.0.5;python_version<"3.6" and python_version>="2.7"
-mock==4.0.2;python_version>="3.6"
-pytest==3.2.5;python_version<"2.7" or python_version=="3.3"
-pytest==4.6.3;python_version<"3.5" and python_version>="2.7"
-pytest==6.1.2;python_version>="3.5"
+mock==3.0.5;python_version<="2.7"
+mock==4.0.3;python_version>="3.6"
+pytest==4.6.3;python_version<="2.7"
+pytest==6.2.2;python_version>="3.6"
 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.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.3.1;python_version>="3.5"
-wheel==0.29.0;python_version<="2.6"
+pytest-cov==2.8.1;python_version<="2.7"
+pytest-cov==2.11.1;python_version>="3.6"
+pytest-mock==2.0.0;python_version<="2.7"
+pytest-mock==3.5.1;python_version>="3.6"

requirements/tox.txt

@@ -1,5 +1,4 @@
 -r basics.txt
 
-tox==2.9.1;python_version<="2.6"
-tox==3.14.0;python_version<="3.4" and python_version>="2.7"
-tox==3.20.1;python_version>"3.4"
+tox==3.14.0;python_version<="2.7"
+tox==3.22.0;python_version>="3.6"

setup.cfg

@@ -3,7 +3,7 @@
 [metadata]
 name = watchmaker
 description = Applied Configuration Management
-version = 0.21.4
+version = 0.21.5
 long_description = file: README.md, CHANGELOG.md
 long_description_content_type = text/markdown
 author = Plus3IT Maintainers of Watchmaker
@@ -21,31 +21,26 @@ classifiers =
     Operating System :: POSIX :: Linux
     Operating System :: Microsoft :: Windows
     Programming Language :: Python
-    Programming Language :: Python :: 2.6
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.4
-    Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
     Topic :: Utilities
 
 [options]
 install_requires =
-    backoff;python_version>"3.4"
-    backoff<=1.8.0;python_version<="3.4"
-    backoff<1.7;python_version<"2.7"
-    click;python_version>="2.7"
-    click<7;python_version<"2.7"
+    backoff;python_version>="3.6"
+    backoff<=1.8.0;python_version<="2.7"
+    click
     defusedxml;platform_system=="Windows"
     futures;python_version<"3"
     six
     pywin32;platform_system=="Windows"
-    PyYAML;python_version>="3.5"
-    PyYAML<=5.2;python_version<"3.5"
-    PyYAML<4;python_version<"2.7"
-    wheel<=0.29.0;python_version<"2.7"
+    PyYAML;python_version>="3.6"
+    PyYAML<=5.2;python_version<="2.7"
     compatibleversion>=0.1.2
     oschmod>=0.1.3
 packages = find:

src/watchmaker/static/config.yaml

@@ -27,16 +27,16 @@ linux:
             - redhat
             - centos
           el_version: 6
-          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2019.2.5/salt-reposync-el6.repo
+          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2019.2.8/salt-reposync-el6.repo
         - dist: amazon
           el_version: 6
-          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2019.2.5/salt-reposync-amzn.repo
+          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2019.2.8/salt-reposync-amzn.repo
         #SaltEL7:
         - dist:
             - redhat
             - centos
           el_version: 7
-          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2019.2.5/salt-reposync-el7.repo
+          url: https://watchmaker.cloudarmor.io/yum.defs/saltstack/salt/2019.2.8/salt-reposync-el7.repo
   - salt:
       salt_debug_log: null
       install_method: yum
@@ -47,4 +47,4 @@ linux:
 windows:
   - salt:
       salt_debug_log: null
-      installer_url: https://watchmaker.cloudarmor.io/repo/saltstack/salt/windows/Salt-Minion-2019.2.5-Py2-AMD64-Setup.exe
+      installer_url: https://watchmaker.cloudarmor.io/repo/saltstack/salt/windows/Salt-Minion-2019.2.8-Py2-AMD64-Setup.exe