Skip to content

Commit b34f5b2

Browse files
committed
update generated imports to vendor
1 parent b89b03c commit b34f5b2

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

packages/python-packages/apiview-stub-generator/apistub/_generated/treestyle/parser/_model_base.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
import xml.etree.ElementTree as ET
2525
from typing_extensions import Self
2626
import isodate
27-
from azure.core.exceptions import DeserializationError
28-
from azure.core import CaseInsensitiveEnumMeta
29-
from azure.core.pipeline import PipelineResponse
30-
from azure.core.serialization import _Null
27+
from ...._vendor.core.exceptions import DeserializationError
28+
from ...._vendor.core import CaseInsensitiveEnumMeta
29+
from ...._vendor.core.pipeline import PipelineResponse
30+
from ...._vendor.core.serialization import _Null
3131

3232
if sys.version_info >= (3, 9):
3333
from collections.abc import MutableMapping

packages/python-packages/apiview-stub-generator/apistub/_generated/treestyle/parser/_serialization.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262

6363
import isodate # type: ignore
6464

65-
from azure.core.exceptions import DeserializationError, SerializationError
66-
from azure.core.serialization import NULL as CoreNull
65+
from ...._vendor.core.exceptions import DeserializationError, SerializationError
66+
from ...._vendor.core.serialization import NULL as CoreNull
6767

6868
_BOM = codecs.BOM_UTF8.decode(encoding="utf-8")
6969

packages/python-packages/apiview-stub-generator/apistub/_generated/treestyle/parser/models/_enums.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# --------------------------------------------------------------------------
88

99
from enum import Enum
10-
from azure.core import CaseInsensitiveEnumMeta
10+
from ....._vendor.core import CaseInsensitiveEnumMeta
1111

1212

1313
class CodeDiagnosticLevel(int, Enum, metaclass=CaseInsensitiveEnumMeta):

packages/python-packages/apiview-stub-generator/apistub/_generated/treestyle/parser/models/_patch.py

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
from apistub._node_index import NodeIndex
1616
from apistub._metadata_map import MetadataMap
1717

18+
### NOTE: The generated models use vendored azure-core under `_vendor`, and all azure.core imports in the
19+
### generated code must be updated to the _vendor. This was done to avoid a dependency conflict when
20+
### installing azure-core as a dependency and also parsing the azure-core package.
1821
from ._models import (
1922
CodeFile,
2023
ReviewToken as TokenImpl,

packages/python-packages/apiview-stub-generator/apistub/_stub_generator.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def _get_pkg_metadata(self):
170170
pkg_name = os.path.split(self.pkg_path)[-1]
171171
version = importlib.metadata.version(pkg_name)
172172
dist = importlib.metadata.distribution(pkg_name)
173-
self.extras_require = dist.metadata.get_all('Provides-Extra')
173+
self.extras_require = dist.metadata.get_all('Provides-Extra') or []
174174
return pkg_root_path, pkg_name, version
175175
pkg_root_path = self.wheel_path
176176
metadata = get_metadata(self.pkg_path)
@@ -241,6 +241,7 @@ def _find_modules(self, pkg_root_path):
241241
# Ignore tests, which may have an __init__.py but is not part of the package.
242242
dirs_to_skip = [x for x in subdirs if x.startswith(("_", ".", "test", "build"))]
243243
for d in dirs_to_skip:
244+
logging.debug("Dirs to skip: {}".format(dirs_to_skip))
244245
subdirs.remove(d)
245246

246247
# Add current path as module name if _init.py is present

0 commit comments

Comments
 (0)