Moving Python automation api from pulumi.x.automation to pulumi.autom…

…ation
pulumi · Mar 13, 2021 · e576fea · e576fea
1 parent 15cf033
commit e576fea
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 25 deletions.
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
@@ -12,6 +12,9 @@
 - [Automation/nodejs] Moving NodeJS automation API package from sdk/nodejs/x/automation -> sdk/nodejs/automation
   [#6518](https://github.com/pulumi/pulumi/pull/6518)
 
+- [Automation/python] Moving Python automation API package from pulumi.x.automation -> pulumi.automation
+  [#6518](https://github.com/pulumi/pulumi/pull/6518)
+
 
 ### Enhancements
 

diff --git a/sdk/python/lib/pulumi/__init__.py b/sdk/python/lib/pulumi/__init__.py
@@ -96,7 +96,7 @@
     set,
 )
 
-from . import runtime, dynamic, policy, x
+from . import runtime, dynamic, policy, automation
 
 __all__ = [
     # asset
@@ -169,5 +169,5 @@
     "runtime",
     "dynamic",
     "policy",
-    "x"
+    "automation"
 ]
diff --git a/...ython/lib/pulumi/x/automation/__init__.py → sdk/python/lib/pulumi/automation/__init__.py b/...ython/lib/pulumi/x/automation/__init__.py → sdk/python/lib/pulumi/automation/__init__.py
diff --git a/sdk/python/lib/pulumi/x/automation/_cmd.py → sdk/python/lib/pulumi/automation/_cmd.py b/sdk/python/lib/pulumi/x/automation/_cmd.py → sdk/python/lib/pulumi/automation/_cmd.py
diff --git a/...python/lib/pulumi/x/automation/_config.py → sdk/python/lib/pulumi/automation/_config.py b/...python/lib/pulumi/x/automation/_config.py → sdk/python/lib/pulumi/automation/_config.py
diff --git a/...b/pulumi/x/automation/_local_workspace.py → ...lib/pulumi/automation/_local_workspace.py b/...b/pulumi/x/automation/_local_workspace.py → ...lib/pulumi/automation/_local_workspace.py
diff --git a/.../pulumi/x/automation/_project_settings.py → ...ib/pulumi/automation/_project_settings.py b/.../pulumi/x/automation/_project_settings.py → ...ib/pulumi/automation/_project_settings.py
diff --git a/...python/lib/pulumi/x/automation/_server.py → sdk/python/lib/pulumi/automation/_server.py b/...python/lib/pulumi/x/automation/_server.py → sdk/python/lib/pulumi/automation/_server.py
@@ -19,10 +19,10 @@
 from contextlib import suppress
 
 from ._workspace import PulumiFn
-from ... import log
-from ...runtime.proto import language_pb2, plugin_pb2, LanguageRuntimeServicer
-from ...runtime import run_in_stack, reset_options, set_all_config
-from ...errors import RunError
+from .. import log
+from ..runtime.proto import language_pb2, plugin_pb2, LanguageRuntimeServicer
+from ..runtime import run_in_stack, reset_options, set_all_config
+from ..errors import RunError
 
 _py_version_less_than_3_7 = sys.version_info[0] == 3 and sys.version_info[1] < 7
 

diff --git a/sdk/python/lib/pulumi/x/automation/_stack.py → sdk/python/lib/pulumi/automation/_stack.py b/sdk/python/lib/pulumi/x/automation/_stack.py → sdk/python/lib/pulumi/automation/_stack.py
@@ -24,8 +24,8 @@
 from .errors import StackAlreadyExistsError
 from ._server import LanguageServer
 from ._workspace import Workspace, PulumiFn, Deployment
-from ...runtime.settings import _GRPC_CHANNEL_OPTIONS
-from ...runtime.proto import language_pb2_grpc
+from ..runtime.settings import _GRPC_CHANNEL_OPTIONS
+from ..runtime.proto import language_pb2_grpc
 
 _DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ'
 

diff --git a/...ib/pulumi/x/automation/_stack_settings.py → .../lib/pulumi/automation/_stack_settings.py b/...ib/pulumi/x/automation/_stack_settings.py → .../lib/pulumi/automation/_stack_settings.py
diff --git a/...hon/lib/pulumi/x/automation/_workspace.py → ...ython/lib/pulumi/automation/_workspace.py b/...hon/lib/pulumi/x/automation/_workspace.py → ...ython/lib/pulumi/automation/_workspace.py
diff --git a/sdk/python/lib/pulumi/x/automation/errors.py → sdk/python/lib/pulumi/automation/errors.py b/sdk/python/lib/pulumi/x/automation/errors.py → sdk/python/lib/pulumi/automation/errors.py
diff --git a/sdk/python/lib/pulumi/x/__init__.py b/sdk/python/lib/pulumi/x/__init__.py
diff --git a/sdk/python/lib/test/automation/test_errors.py b/sdk/python/lib/test/automation/test_errors.py
@@ -17,7 +17,7 @@
 import subprocess
 import unittest
 import pytest
-from pulumi.x.automation import (
+from pulumi.automation import (
     create_stack,
     InlineSourceRuntimeError,
     RuntimeError,

diff --git a/sdk/python/lib/test/automation/test_local_workspace.py b/sdk/python/lib/test/automation/test_local_workspace.py
@@ -18,7 +18,7 @@
 from typing import List, Optional
 
 from pulumi import Config, export
-from pulumi.x.automation import (
+from pulumi.automation import (
     create_stack,
     create_or_select_stack,
     CommandError,