Merge pull request #54943 from s0undt3ch/hotfix/deprecate-raet-master

[master] Remove deprecated RAET
saltstack · Oct 11, 2019 · 0e7ca21 · 0e7ca21
2 parents 5e9c2c1 + 546a951
commit 0e7ca21
Show file tree

Hide file tree

Showing 139 changed files with 104 additions and 20,402 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -48,51 +48,6 @@ repos:
           - --include=requirements/zeromq.txt
           - --include=requirements/pytest.txt
           - --remove-line=^pycrypto==(.*)$
-      - id: pip-tools-compile
-        alias: compile-linux-py2.7-raet-requirements
-        name: Linux Py2.7 RAET Requirements
-        files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(lint|cloud|docs|osx|windows)\.in$
-        args:
-          - -v
-          - --py-version=2.7
-          - --platform=linux
-          - --out-prefix=raet
-          - --include=requirements/base.txt
-          - --include=requirements/raet.txt
-          - --include=requirements/pytest.txt
-          - --remove-line=^pycrypto==(.*)$
-      - id: pip-tools-compile
-        alias: compile-osx-py2.7-raet-requirements
-        name: OSX Py2.7 RAET Requirements
-        files: ^(pkg/osx/(req|req_ext)\.txt|requirements/((base|raet|pytest)\.txt|static/osx\.in))$
-        args:
-          - -v
-          - --py-version=2.7
-          - --out-prefix=raet
-          - --platform=darwin
-          - --include=pkg/osx/req.txt
-          - --include=pkg/osx/req_ext.txt
-          - --include=requirements/base.txt
-          - --include=requirements/raet.txt
-          - --include=requirements/pytest.txt
-          - --remove-line=^pycrypto==(.*)$
-          - --passthrough-line-from-input=^pyobjc(.*)$
-      - id: pip-tools-compile
-        alias: compile-windows-py2.7-raet-requirements
-        name: Windows Py2.7 RAET Requirements
-        files: ^(pkg/windows/(req|req_win)\.txt|requirements/((base|raet|pytest)\.txt|static/windows\.in))$
-        args:
-          - -v
-          - --py-version=2.7
-          - --out-prefix=raet
-          - --platform=windows
-          - --include=pkg/windows/req.txt
-          - --include=pkg/windows/req_win.txt
-          - --include=requirements/base.txt
-          - --include=requirements/raet.txt
-          - --include=requirements/pytest.txt
-          - --remove-line=^pycrypto==(.*)$
 
       - id: pip-tools-compile
         alias: compile-lint-py2.7-requirements
@@ -126,21 +81,6 @@ repos:
           - --include=requirements/zeromq.txt
           - --include=requirements/pytest.txt
           - --remove-line=^pycrypto==(.*)$
-      - id: pip-tools-compile
-        alias: compile-linux-py3.4-raet-requirements
-        name: Linux Py3.4 RAET Requirements
-        files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|amzn-2018\.03|lint|cloud|docs|osx|windows)\.in$
-        args:
-          - -v
-          - --py-version=3.4
-          - --platform=linux
-          - --out-prefix=raet
-          - --include=requirements/base.txt
-          - --include=requirements/raet.txt
-          - --include=requirements/pytest.txt
-          - --remove-line=^pycrypto==(.*)$
-          - --remove-line=^enum34==(.*)$
 
       - id: pip-tools-compile
         alias: compile-cloud-py3.4-requirements
@@ -195,54 +135,6 @@ repos:
           - --include=requirements/zeromq.txt
           - --include=requirements/pytest.txt
           - --remove-line=^pycrypto==(.*)$
-      - id: pip-tools-compile
-        alias: compile-linux-py3.5-raet-requirements
-        name: Linux Py3.5 RAET Requirements
-        files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|amzn-2018\.03|lint|cloud|docs|osx|windows)\.in$
-        args:
-          - -v
-          - --py-version=3.5
-          - --platform=linux
-          - --out-prefix=raet
-          - --include=requirements/base.txt
-          - --include=requirements/raet.txt
-          - --include=requirements/pytest.txt
-          - --remove-line=^pycrypto==(.*)$
-          - --remove-line=^enum34==(.*)$
-      - id: pip-tools-compile
-        alias: compile-osx-py3.5-raet-requirements
-        name: OSX Py3.5 RAET Requirements
-        files: ^(pkg/osx/(req|req_ext)\.txt|requirements/((base|raet|pytest)\.txt|static/osx\.in))$
-        args:
-          - -v
-          - --py-version=3.5
-          - --platform=darwin
-          - --out-prefix=raet
-          - --include=pkg/osx/req.txt
-          - --include=pkg/osx/req_ext.txt
-          - --include=requirements/base.txt
-          - --include=requirements/raet.txt
-          - --include=requirements/pytest.txt
-          - --remove-line=^pycrypto==(.*)$
-          - --remove-line=^enum34==(.*)$
-          - --passthrough-line-from-input=^pyobjc(.*)$
-      - id: pip-tools-compile
-        alias: compile-windows-py3.5-raet-requirements
-        name: Windows Py3.5 RAET Requirements
-        files: ^(pkg/windows/(req|req_win)\.txt|requirements/((base|raet|pytest)\.txt|static/windows\.in))$
-        args:
-          - -v
-          - --py-version=3.5
-          - --platform=windows
-          - --out-prefix=raet
-          - --include=pkg/windows/req.txt
-          - --include=pkg/windows/req_win.txt
-          - --include=requirements/base.txt
-          - --include=requirements/raet.txt
-          - --include=requirements/pytest.txt
-          - --remove-line=^pycrypto==(.*)$
-          - --remove-line=^enum34==(.*)$
 
       - id: pip-tools-compile
         alias: compile-cloud-py3.5-requirements
@@ -306,54 +198,6 @@ repos:
           - --include=requirements/zeromq.txt
           - --include=requirements/pytest.txt
           - --remove-line=^pycrypto==(.*)$
-      - id: pip-tools-compile
-        alias: compile-linux-py3.6-raet-requirements
-        name: Linux Py3.6 RAET Requirements
-        files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|amzn-2018\.03|lint|cloud|docs|osx|windows)\.in$
-        args:
-          - -v
-          - --py-version=3.6
-          - --platform=linux
-          - --out-prefix=raet
-          - --include=requirements/base.txt
-          - --include=requirements/raet.txt
-          - --include=requirements/pytest.txt
-          - --remove-line=^pycrypto==(.*)$
-          - --remove-line=^enum34==(.*)$
-      - id: pip-tools-compile
-        alias: compile-osx-py3.6-raet-requirements
-        name: OSX Py3.6 RAET Requirements
-        files: ^(pkg/osx/(req|req_ext)\.txt|requirements/((base|raet|pytest)\.txt|static/osx\.in))$
-        args:
-          - -v
-          - --py-version=3.6
-          - --platform=darwin
-          - --out-prefix=raet
-          - --include=pkg/osx/req.txt
-          - --include=pkg/osx/req_ext.txt
-          - --include=requirements/base.txt
-          - --include=requirements/raet.txt
-          - --include=requirements/pytest.txt
-          - --remove-line=^pycrypto==(.*)$
-          - --remove-line=^enum34==(.*)$
-          - --passthrough-line-from-input=^pyobjc(.*)$
-      - id: pip-tools-compile
-        alias: compile-windows-py3.6-raet-requirements
-        name: Windows Py3.6 RAET Requirements
-        files: ^(pkg/windows/(req|req_win)\.txt|requirements/((base|raet|pytest)\.txt|static/windows\.in))$
-        args:
-          - -v
-          - --py-version=3.6
-          - --platform=windows
-          - --out-prefix=raet
-          - --include=pkg/windows/req.txt
-          - --include=pkg/windows/req_win.txt
-          - --include=requirements/base.txt
-          - --include=requirements/raet.txt
-          - --include=requirements/pytest.txt
-          - --remove-line=^pycrypto==(.*)$
-          - --remove-line=^enum34==(.*)$
 
       - id: pip-tools-compile
         alias: compile-cloud-py3.6-requirements
@@ -417,54 +261,6 @@ repos:
           - --include=requirements/zeromq.txt
           - --include=requirements/pytest.txt
           - --remove-line=^pycrypto==(.*)$
-      - id: pip-tools-compile
-        alias: compile-linux-py3.7-raet-requirements
-        name: Linux Py3.7 RAET Requirements
-        files: ^requirements/((base|raet|pytest)\.txt|static/(.*)\.in)$
-        exclude: ^requirements/static/(centos-6|amzn-2018\.03|lint|cloud|docs|osx|windows)\.in$
-        args:
-          - -v
-          - --py-version=3.7
-          - --platform=linux
-          - --out-prefix=raet
-          - --include=requirements/base.txt
-          - --include=requirements/raet.txt
-          - --include=requirements/pytest.txt
-          - --remove-line=^pycrypto==(.*)$
-          - --remove-line=^enum34==(.*)$
-      - id: pip-tools-compile
-        alias: compile-osx-py3.7-raet-requirements
-        name: OSX Py3.7 RAET Requirements
-        files: ^(pkg/osx/(req|req_ext)\.txt|requirements/((base|raet|pytest)\.txt|static/osx\.in))$
-        args:
-          - -v
-          - --py-version=3.7
-          - --platform=darwin
-          - --out-prefix=raet
-          - --include=pkg/osx/req.txt
-          - --include=pkg/osx/req_ext.txt
-          - --include=requirements/base.txt
-          - --include=requirements/raet.txt
-          - --include=requirements/pytest.txt
-          - --remove-line=^pycrypto==(.*)$
-          - --remove-line=^enum34==(.*)$
-          - --passthrough-line-from-input=^pyobjc(.*)$
-      - id: pip-tools-compile
-        alias: compile-windows-py3.7-raet-requirements
-        name: Windows Py3.7 RAET Requirements
-        files: ^(pkg/windows/(req|req_win)\.txt|requirements/((base|raet|pytest)\.txt|static/windows\.in))$
-        args:
-          - -v
-          - --py-version=3.7
-          - --platform=windows
-          - --out-prefix=raet
-          - --include=pkg/windows/req.txt
-          - --include=pkg/windows/req_win.txt
-          - --include=requirements/base.txt
-          - --include=requirements/raet.txt
-          - --include=requirements/pytest.txt
-          - --remove-line=^pycrypto==(.*)$
-          - --remove-line=^enum34==(.*)$
 
       - id: pip-tools-compile
         alias: compile-cloud-py3.7-requirements

diff --git a/HACKING.rst b/HACKING.rst
@@ -155,15 +155,6 @@ ZeroMQ Transport:
     pip install -e .
 
 
-RAET Transport:
-
-.. code-block:: bash
-
-    pip install -r requirements/raet.txt
-    pip install psutil
-    pip install -e .
-
-
 Running a self-contained development version
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/doc/.tx/config b/doc/.tx/config
@@ -4112,12 +4112,6 @@ source_file = _build/locale/topics/development/hacking.pot
 source_lang = en
 source_name = topics/development/hacking.rst
 
-[salt.topics--development--raet--index]
-file_filter = locale/<lang>/LC_MESSAGES/topics/development/raet/index.po
-source_file = _build/locale/topics/development/raet/index.pot
-source_lang = en
-source_name = topics/development/raet/index.rst
-
 [salt.topics--development--salt_projects]
 file_filter = locale/<lang>/LC_MESSAGES/topics/development/salt_projects.po
 source_file = _build/locale/topics/development/salt_projects.pot
@@ -4184,18 +4178,6 @@ source_file = _build/locale/topics/topology/syndic.pot
 source_lang = en
 source_name = topics/topology/syndic.rst
 
-[salt.topics--transports--raet--index]
-file_filter = locale/<lang>/LC_MESSAGES/topics/transports/raet/index.po
-source_file = _build/locale/topics/transports/raet/index.pot
-source_lang = en
-source_name = topics/transports/raet/index.rst
-
-[salt.topics--transports--raet--programming_intro]
-file_filter = locale/<lang>/LC_MESSAGES/topics/transports/raet/programming_intro.po
-source_file = _build/locale/topics/transports/raet/programming_intro.pot
-source_lang = en
-source_name = topics/transports/raet/programming_intro.rst
-
 [salt.topics--tutorials--states_pt5]
 file_filter = locale/<lang>/LC_MESSAGES/topics/tutorials/states_pt5.po
 source_file = _build/locale/topics/tutorials/states_pt5.pot
@@ -4652,12 +4634,6 @@ source_file = _build/locale/ref/modules/all/salt.modules.pyenv.pot
 source_lang = en
 source_name = ref/modules/all/salt.modules.pyenv.rst
 
-[salt.ref--modules--all--salt_modules_raet_publish]
-file_filter = locale/<lang>/LC_MESSAGES/ref/modules/all/salt.modules.raet_publish.po
-source_file = _build/locale/ref/modules/all/salt.modules.raet_publish.pot
-source_lang = en
-source_name = ref/modules/all/salt.modules.raet_publish.rst
-
 [salt.ref--modules--all--salt_modules_schedule]
 file_filter = locale/<lang>/LC_MESSAGES/ref/modules/all/salt.modules.schedule.po
 source_file = _build/locale/ref/modules/all/salt.modules.schedule.pot

diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst
@@ -866,9 +866,8 @@ Default: ``zeromq``
 
 Changes the underlying transport layer. ZeroMQ is the recommended transport
 while additional transport layers are under development. Supported values are
-``zeromq``, ``raet`` (experimental), and ``tcp`` (experimental). This setting has
-a significant impact on performance and should not be changed unless you know
-what you are doing!
+``zeromq`` and ``tcp`` (experimental). This setting has a significant impact on
+performance and should not be changed unless you know what you are doing!
 
 .. code-block:: yaml
 

diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst
@@ -1367,9 +1367,8 @@ Default: ``zeromq``
 
 Changes the underlying transport layer. ZeroMQ is the recommended transport
 while additional transport layers are under development. Supported values are
-``zeromq``, ``raet`` (experimental), and ``tcp`` (experimental). This setting has
-a significant impact on performance and should not be changed unless you know
-what you are doing!
+``zeromq`` and ``tcp`` (experimental). This setting has a significant impact
+on performance and should not be changed unless you know what you are doing!
 
 .. code-block:: yaml
 

diff --git a/doc/ref/modules/all/index.rst b/doc/ref/modules/all/index.rst
@@ -362,7 +362,6 @@ execution modules
     qemu_nbd
     quota
     rabbitmq
-    raet_publish
     rallydev
     random_org
     rbac_solaris

diff --git a/doc/ref/modules/all/salt.modules.raet_publish.rst b/doc/ref/modules/all/salt.modules.raet_publish.rst
diff --git a/doc/topics/development/index.rst b/doc/topics/development/index.rst
@@ -10,7 +10,6 @@ Developing Salt
     modules/index
     extend/index
     tests/*
-    raet/index
     git/index
     conventions/index
     ../../ref/internals/index