Merge branch '2019.2.1' into aix_docs

.ci/docs

@@ -27,8 +27,8 @@ pipeline {
                 sh '''
                 eval "$(pyenv init -)"
                 pyenv --version
-                pyenv install --skip-existing 2.7.15
+                pyenv install --skip-existing 3.6.8
-                pyenv shell 2.7.15
+                pyenv shell 3.6.8
                 python --version
                 pip install -U https://github.com/s0undt3ch/nox/archive/hotfix/py2.zip#egg=Nox==2018.10.17
                 nox --version
@@ -39,7 +39,7 @@ pipeline {
             steps {
                 sh '''
                 eval "$(pyenv init -)"
-                pyenv shell 2.7.15
+                pyenv shell 3.6.8
                 nox -e docs
                 '''
                 archiveArtifacts artifacts: 'doc/doc-archive.tar.gz'

.pre-commit-config.yaml

@@ -127,15 +127,6 @@ repos:
           - --py-version=2.7
           - --platform=linux
 
-      - id: pip-tools-compile
-        alias: compile-doc-requirements
-        name: Docs Py2.7 Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/docs\.in)$
-        args:
-          - -v
-          - --py-version=2.7
-          - --platform=linux
-
       - id: pip-tools-compile
         alias: compile-cloud-py2.7-requirements
         name: Cloud Py2.7 Requirements
@@ -321,6 +312,15 @@ repos:
           - -v
           - --py-version=3.5
 
+      - id: pip-tools-compile
+        alias: compile-doc-requirements
+        name: Docs Py3.5 Requirements
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/docs\.in)$
+        args:
+          - -v
+          - --py-version=3.5
+          - --platform=linux
+
       - id: pip-tools-compile
         alias: compile-linux-py3.6-tcp-requirements
         name: Linux Py3.6 TCP Requirements
@@ -436,6 +436,15 @@ repos:
           - -v
           - --py-version=3.6
 
+      - id: pip-tools-compile
+        alias: compile-doc-requirements
+        name: Docs Py3.6 Requirements
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/docs\.in)$
+        args:
+          - -v
+          - --py-version=3.6
+          - --platform=linux
+
       - id: pip-tools-compile
         alias: compile-linux-py3.7-tcp-requirements
         name: Linux Py3.7 TCP Requirements
@@ -550,3 +559,12 @@ repos:
         args:
           - -v
           - --py-version=3.7
+
+      - id: pip-tools-compile
+        alias: compile-doc-requirements
+        name: Docs Py3.7 Requirements
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/docs\.in)$
+        args:
+          - -v
+          - --py-version=3.7
+          - --platform=linux

noxfile.py

@@ -892,14 +892,20 @@ def lint_tests(session):
     _lint(session, '.testing.pylintrc', flags, paths)
 
 
-@nox.session(python='2.7')
+@nox.session(python='3')
 def docs(session):
     '''
     Build Salt's Documentation
     '''
-    session.install('--progress-bar=off', '-r', 'requirements/static/py2.7/docs.txt', silent=PIP_INSTALL_SILENT)
+    pydir = _get_pydir(session)
+    if pydir == 'py3.4':
+        session.error('Sphinx only runs on Python >= 3.5')
+    session.install(
+        '--progress-bar=off',
+        '-r', 'requirements/static/{}/docs.txt'.format(pydir),
+        silent=PIP_INSTALL_SILENT)
     os.chdir('doc/')
     session.run('make', 'clean', external=True)
-    session.run('make', 'html', external=True)
+    session.run('make', 'html', 'SPHINXOPTS=-W', external=True)
     session.run('tar', '-czvf', 'doc-archive.tar.gz', '_build/html')
     os.chdir('..')

requirements/static/docs.in

@@ -1 +1 @@
-sphinx
+sphinx>=2.0.1

requirements/static/py3.5/docs.txt

@@ -2,10 +2,10 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements/static/py2.7/docs.txt -v requirements/static/docs.in
+#    pip-compile -o requirements/static/py3.5/docs.txt -v requirements/static/docs.in
 #
 alabaster==0.7.12         # via sphinx
-babel==2.6.0              # via sphinx
+babel==2.7.0              # via sphinx
 certifi==2019.3.9         # via requests
 chardet==3.0.4            # via requests
 docutils==0.14            # via sphinx
@@ -14,13 +14,17 @@ imagesize==1.1.0          # via sphinx
 jinja2==2.10.1            # via sphinx
 markupsafe==1.1.1         # via jinja2
 packaging==19.0           # via sphinx
-pygments==2.3.1           # via sphinx
+pygments==2.4.2           # via sphinx
 pyparsing==2.4.0          # via packaging
 pytz==2019.1              # via babel
-requests==2.21.0          # via sphinx
+requests==2.22.0          # via sphinx
-six==1.12.0               # via packaging, sphinx
+six==1.12.0               # via packaging
 snowballstemmer==1.2.1    # via sphinx
-sphinx==1.8.5
+sphinx==2.0.1
-sphinxcontrib-websupport==1.1.0  # via sphinx
+sphinxcontrib-applehelp==1.0.1  # via sphinx
-typing==3.6.6             # via sphinx
+sphinxcontrib-devhelp==1.0.1  # via sphinx
-urllib3==1.24.2           # via requests
+sphinxcontrib-htmlhelp==1.0.2  # via sphinx
+sphinxcontrib-jsmath==1.0.1  # via sphinx
+sphinxcontrib-qthelp==1.0.2  # via sphinx
+sphinxcontrib-serializinghtml==1.1.3  # via sphinx
+urllib3==1.25.3           # via requests

requirements/static/py3.6/docs.txt

@@ -0,0 +1,30 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile -o requirements/static/py3.6/docs.txt -v requirements/static/docs.in
+#
+alabaster==0.7.12         # via sphinx
+babel==2.7.0              # via sphinx
+certifi==2019.3.9         # via requests
+chardet==3.0.4            # via requests
+docutils==0.14            # via sphinx
+idna==2.8                 # via requests
+imagesize==1.1.0          # via sphinx
+jinja2==2.10.1            # via sphinx
+markupsafe==1.1.1         # via jinja2
+packaging==19.0           # via sphinx
+pygments==2.4.2           # via sphinx
+pyparsing==2.4.0          # via packaging
+pytz==2019.1              # via babel
+requests==2.22.0          # via sphinx
+six==1.12.0               # via packaging
+snowballstemmer==1.2.1    # via sphinx
+sphinx==2.0.1
+sphinxcontrib-applehelp==1.0.1  # via sphinx
+sphinxcontrib-devhelp==1.0.1  # via sphinx
+sphinxcontrib-htmlhelp==1.0.2  # via sphinx
+sphinxcontrib-jsmath==1.0.1  # via sphinx
+sphinxcontrib-qthelp==1.0.2  # via sphinx
+sphinxcontrib-serializinghtml==1.1.3  # via sphinx
+urllib3==1.25.3           # via requests

requirements/static/py3.7/docs.txt

@@ -0,0 +1,30 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile -o requirements/static/py3.7/docs.txt -v requirements/static/docs.in
+#
+alabaster==0.7.12         # via sphinx
+babel==2.7.0              # via sphinx
+certifi==2019.3.9         # via requests
+chardet==3.0.4            # via requests
+docutils==0.14            # via sphinx
+idna==2.8                 # via requests
+imagesize==1.1.0          # via sphinx
+jinja2==2.10.1            # via sphinx
+markupsafe==1.1.1         # via jinja2
+packaging==19.0           # via sphinx
+pygments==2.4.2           # via sphinx
+pyparsing==2.4.0          # via packaging
+pytz==2019.1              # via babel
+requests==2.22.0          # via sphinx
+six==1.12.0               # via packaging
+snowballstemmer==1.2.1    # via sphinx
+sphinx==2.0.1
+sphinxcontrib-applehelp==1.0.1  # via sphinx
+sphinxcontrib-devhelp==1.0.1  # via sphinx
+sphinxcontrib-htmlhelp==1.0.2  # via sphinx
+sphinxcontrib-jsmath==1.0.1  # via sphinx
+sphinxcontrib-qthelp==1.0.2  # via sphinx
+sphinxcontrib-serializinghtml==1.1.3  # via sphinx
+urllib3==1.25.3           # via requests

salt/log/setup.py

@@ -1118,13 +1118,12 @@ def __process_multiprocessing_logging_queue(opts, queue):
         setup_extended_logging(opts)
     while True:
         try:
-            record_dict = queue.get()
+            record = queue.get()
-            if record_dict is None:
+            if record is None:
                 # A sentinel to stop processing the queue
                 break
             # Just log everything, filtering will happen on the main process
             # logging handlers
-            record = logging.makeLogRecord(record_dict)
             logger = logging.getLogger(record.name)
             logger.handle(record)
         except (EOFError, KeyboardInterrupt, SystemExit):