Skip to content

Commit 1f32684

Browse files
authored
build(ingest): drop importlib_metadata backport in favor of stdlib (#16694)
1 parent b277048 commit 1f32684

File tree

6 files changed

+3
-26
lines changed

6 files changed

+3
-26
lines changed

metadata-ingestion/pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ dependencies = [
4949
"expandvars>=0.6.5,<2.0.0",
5050
"humanfriendly<11.0.0",
5151
"ijson<4.0.0",
52-
"importlib_metadata>=4.0.0,<9.0.0; python_version < '3.10'",
5352
"jsonref<2.0.0",
5453
"jsonschema<5.0.0",
5554
"mixpanel>=4.9.0,<6.0.0",
@@ -1610,7 +1609,6 @@ dev = [
16101609
"grpcio>=1.44.0,<2.0.0",
16111610
"humanfriendly<11.0.0",
16121611
"ijson<4.0.0",
1613-
"importlib_metadata>=4.0.0,<9.0.0; python_version < '3.10'",
16141612
"IPython!=8.22.0,<9.0.0",
16151613
"jdk4py>=21.0,<22.0",
16161614
"JPype1<2.0.0",
@@ -1803,7 +1801,6 @@ docs = [
18031801
"grpcio>=1.44.0,<2.0.0",
18041802
"humanfriendly<11.0.0",
18051803
"ijson<4.0.0",
1806-
"importlib_metadata>=4.0.0,<9.0.0; python_version < '3.10'",
18071804
"IPython!=8.22.0,<9.0.0",
18081805
"jdk4py>=21.0,<22.0",
18091806
"JPype1<2.0.0",

metadata-ingestion/scripts/custom_package_codegen.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
import json
22
import re
33
import subprocess
4-
import sys
4+
from importlib.metadata import version
55
from pathlib import Path
66

77
import avro_codegen
88
import click
99

10-
if sys.version_info < (3, 10):
11-
from importlib_metadata import version
12-
else:
13-
from importlib.metadata import version
14-
1510
_avrogen_version = version("avro-gen3")
1611

1712
autogen_header = """# Autogenerated by datahub's custom_package_codegen.py

metadata-ingestion/setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
"click-default-group<2.0.0",
4949
"PyYAML<7.0.0",
5050
"toml>=0.10.0,<=0.10.2",
51-
# In Python 3.10+, importlib_metadata is included in the standard library.
52-
"importlib_metadata>=4.0.0,<9.0.0; python_version < '3.10'",
5351
"docker<8.0.0",
5452
"expandvars>=0.6.5,<2.0.0",
5553
"avro-gen3==0.7.16",

metadata-ingestion/src/datahub/ingestion/api/registry.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import inspect
33
import sys
44
import unittest.mock
5+
from importlib.metadata import entry_points
56
from typing import (
67
Any,
78
Callable,
@@ -20,11 +21,6 @@
2021
from datahub._version import __package_name__
2122
from datahub.configuration.common import ConfigurationError
2223

23-
if sys.version_info < (3, 10):
24-
from importlib_metadata import entry_points
25-
else:
26-
from importlib.metadata import entry_points
27-
2824
T = TypeVar("T")
2925

3026

metadata-ingestion/src/datahub/utilities/_custom_package_loader.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
import sys
1+
from importlib.metadata import EntryPoint, entry_points
22
from typing import List, Optional
33

4-
if sys.version_info < (3, 10):
5-
from importlib_metadata import EntryPoint, entry_points
6-
else:
7-
from importlib.metadata import EntryPoint, entry_points
8-
9-
104
_CUSTOM_PACKAGE_GROUP_KEY = "datahub.custom_packages"
115

126
_MODELS_KEY = "models"

metadata-ingestion/uv.lock

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)