Fix warn_until calls for the Sodium release

salt/modules/keystone.py

@@ -175,7 +175,7 @@ def auth(profile=None, **connection_args):
         salt '*' keystone.auth
     """
     __utils__["versions.warn_until"](
-        "3001",
+        "Sodium",
         (
             "The keystone module has been deprecated and will be removed in {version}.  "
             "Please update to using the keystoneng module"

salt/modules/kubernetesmod.py

@@ -218,7 +218,7 @@ def _setup_conn(**kwargs):
     if not (kubeconfig and context):
         if kwargs.get("api_url") or __salt__["config.option"]("kubernetes.api_url"):
             salt.utils.versions.warn_until(
-                "3001",
+                "Sodium",
                 "Kubernetes configuration via url, certificate, username and password will be removed in Sodiom. "
                 "Use 'kubeconfig' and 'context' instead.",
             )

salt/modules/mac_brew_pkg.py

@@ -627,7 +627,7 @@ def _fix_cask_namespace(name=None, pkgs=None):
 
     if show_warning:
         salt.utils.versions.warn_until(
-            "3001",
+            "Sodium",
             "The 'caskroom/cask/' namespace for brew-cask packages "
             "is deprecated. Use 'homebrew/cask/' instead.",
         )

salt/modules/mandrill.py

@@ -222,7 +222,7 @@ def send(
     """
     if "async" in kwargs:  # Remove this in 3001
         salt.utils.versions.warn_until(
-            "3001",
+            "Sodium",
             'Parameter "async" is renamed to "asynchronous" '
             "and will be removed in version {version}.",
         )

salt/modules/zfs.py

@@ -437,7 +437,7 @@ def mount(name=None, **kwargs):
         #       to ```if not name:```
         if name == "-a":
             salt.utils.versions.warn_until(
-                "3001",
+                "Sodium",
                 "Passing '-a' as name is deprecated as of Salt 2019.2.0. This "
                 "warning will be removed in Salt 3001. Please pass name as "
                 "'None' instead to mount all filesystems.",
@@ -911,7 +911,7 @@ def hold(tag, *snapshot, **kwargs):
     ## warn about tag change
     if "," in tag:
         salt.utils.versions.warn_until(
-            "3001",
+            "Sodium",
             "A comma-separated tag is no support as of Salt 2018.3.1 "
             "This warning will be removed in Salt 3001.",
         )
@@ -976,7 +976,7 @@ def release(tag, *snapshot, **kwargs):
     ## warn about tag change
     if "," in tag:
         salt.utils.versions.warn_until(
-            "3001",
+            "Sodium",
             "A comma-separated tag is no support as of Salt 2018.3.1 "
             "This warning will be removed in Salt 3001.",
         )

salt/runners/manage.py

@@ -222,7 +222,7 @@ def up(
 def _show_ip_migration(show_ip, show_ipv4):
     if show_ipv4 is not None:
         salt.utils.versions.warn_until(
-            "3001",
+            "Sodium",
             "The 'show_ipv4' argument has been renamed to 'show_ip' as"
             "it now also includes IPv6 addresses for IPv6-connected"
             "minions.",

salt/scripts.py

@@ -109,7 +109,7 @@ def salt_master():
 
         # Message borrowed from pip's deprecation warning
         warn_until(
-            "3001",
+            "Sodium",
             "Python 2.7 will reach the end of its life on January 1st,"
             " 2020. Please upgrade your Python as Python 2.7 won't be"
             " maintained after that date.  Salt will drop support for"
@@ -218,7 +218,7 @@ def salt_minion():
 
         # Message borrowed from pip's deprecation warning
         warn_until(
-            "3001",
+            "Sodium",
             "Python 2.7 will reach the end of its life on January 1st,"
             " 2020. Please upgrade your Python as Python 2.7 won't be"
             " maintained after that date.  Salt will drop support for"

salt/utils/jid.py

@@ -28,7 +28,7 @@ def gen_jid(opts=None):
     """
     if opts is None:
         salt.utils.versions.warn_until(
-            "3001",
+            "Sodium",
             "The `opts` argument was not passed into salt.utils.jid.gen_jid(). "
             "This will be required starting in {version}.",
         )

salt/utils/minions.py

@@ -645,7 +645,7 @@ class CkMinions(object):
         """
         if include_localhost is not None:
             salt.utils.versions.warn_until(
-                "3001",
+                "Sodium",
                 "The 'include_localhost' argument is no longer required; any"
                 "connected localhost minion will always be included.",
             )

tests/filename_map.yml

@@ -1,8 +1,9 @@
 '*':
-  - unit.test_module_names
-  - unit.utils.test_doc
-  - unit.test_virtualname
   - integration.modules.test_sysmod
+  - unit.test_module_names
+  - unit.test_virtualname
+  - unit.utils.test_doc
+  - unit.utils.test_versions
 
 setup.py:
   - unit.setup.test_man