Fix compatibility issue with get_args (#5012)

This commit is contained in:
Ayush Shah 2022-05-18 10:55:39 +05:30 committed by GitHub
parent 346fc82e76
commit b6fc33cda2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 11 deletions

View File

@ -46,7 +46,7 @@ jobs:
- name: Install Ubuntu dependencies - name: Install Ubuntu dependencies
run: | run: |
sudo apt-get install -y unixodbc-dev python3-venv librdkafka-dev gcc libsasl2-dev build-essential libssl-dev libffi-dev \ sudo apt-get install -y unixodbc-dev python3-venv librdkafka-dev gcc libsasl2-dev build-essential libssl-dev libffi-dev \
librdkafka-dev unixodbc-dev libevent-dev unixodbc-dev libevent-dev python3-dev
- name: Install open-metadata dependencies - name: Install open-metadata dependencies
run: | run: |

View File

@ -25,7 +25,7 @@ def get_long_description():
base_requirements = { base_requirements = {
"commonregex", "commonregex",
"idna<3,>=2.5", "idna<3,>=2.5",
"click>=7.1.1,<8", "click>=7.1.1",
"typing_extensions>=3.7.4", "typing_extensions>=3.7.4",
"mypy_extensions>=0.4.3", "mypy_extensions>=0.4.3",
"typing-inspect", "typing-inspect",
@ -45,6 +45,9 @@ base_requirements = {
"PyYAML", "PyYAML",
"jsonschema", "jsonschema",
"sqllineage==1.3.3", "sqllineage==1.3.3",
# compatibility requirements for 3.7
"typing-compat~=0.1.0",
"importlib-metadata~=4.11.3",
} }
report_requirements = { report_requirements = {
@ -138,9 +141,9 @@ plugins: Dict[str, Set[str]] = {
dev = { dev = {
"boto3==1.20.14", "boto3==1.20.14",
"botocore==1.23.14", "botocore==1.23.14",
"datamodel-code-generator==0.11.14", "datamodel-code-generator==0.12.0",
"black==21.12b0", # required for datamodel-code-generator==0.11.14 "black==22.3.0",
"pycln", "pycln==1.3.2",
"docker", "docker",
"google-cloud-storage==1.43.0", "google-cloud-storage==1.43.0",
"twine", "twine",

View File

@ -14,7 +14,11 @@ Mixin class containing Server and client specific methods
To be used by OpenMetadata class To be used by OpenMetadata class
""" """
import re import re
try:
from importlib.metadata import version from importlib.metadata import version
except ImportError:
from importlib_metadata import version
from metadata.ingestion.ometa.client import REST from metadata.ingestion.ometa.client import REST
from metadata.utils.logger import ometa_logger from metadata.utils.logger import ometa_logger

View File

@ -16,7 +16,12 @@ working with OpenMetadata entities.
""" """
import urllib import urllib
from typing import Dict, Generic, List, Optional, Type, TypeVar, Union, get_args from typing import Dict, Generic, List, Optional, Type, TypeVar, Union
try:
from typing import get_args
except ImportError as err:
from typing_compat import get_args
from pydantic import BaseModel from pydantic import BaseModel

View File

@ -57,9 +57,9 @@ def _filter(filter_pattern: Optional[FilterPattern], name: str) -> bool:
validate_regex(filter_pattern.includes) validate_regex(filter_pattern.includes)
return not any( return not any(
[ [
matched name
for regex in filter_pattern.includes for regex in filter_pattern.includes
if (matched := re.match(regex, name, re.IGNORECASE)) if (re.match(regex, name, re.IGNORECASE))
] ]
) )
@ -67,9 +67,9 @@ def _filter(filter_pattern: Optional[FilterPattern], name: str) -> bool:
validate_regex(filter_pattern.excludes) validate_regex(filter_pattern.excludes)
return any( return any(
[ [
matched name
for regex in filter_pattern.excludes for regex in filter_pattern.excludes
if (matched := re.match(regex, name, re.IGNORECASE)) if (re.match(regex, name, re.IGNORECASE))
] ]
) )