Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ingestion/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,11 @@ ENV PIP_NO_CACHE_DIR=1
# Make pip silent
ENV PIP_QUIET=1
ARG RI_VERSION="1.12.0.0.dev0"
RUN pip install --upgrade pip
# Pin setuptools<81 as pkg_resources was removed in setuptools 81.0.0+
# cx-Oracle's setup.py still uses pkg_resources
RUN pip install --upgrade pip "setuptools<81"
# Pre-install cx-Oracle without build isolation to use the pinned setuptools
RUN pip install --no-build-isolation "cx_Oracle>=8.3.0,<9"
RUN pip install "openmetadata-managed-apis~=${RI_VERSION}" --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-3.1.5/constraints-3.10.txt"
RUN pip install "openmetadata-ingestion[${INGESTION_DEPENDENCY}]~=${RI_VERSION}"

Expand Down
7 changes: 6 additions & 1 deletion ingestion/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,12 @@ ENV PIP_NO_CACHE_DIR=1
# Make pip silent
ENV PIP_QUIET=1

RUN pip install --upgrade pip
# Pin setuptools<81 as pkg_resources was removed in setuptools 81.0.0+
# cx-Oracle's setup.py still uses pkg_resources
RUN pip install --upgrade pip "setuptools<81"

# Pre-install cx-Oracle without build isolation to use the pinned setuptools
RUN pip install --no-build-isolation "cx_Oracle>=8.3.0,<9"

# Install FAB provider for Airflow 3.x Flask Blueprint compatibility
RUN pip install "apache-airflow-providers-fab>=1.0.0" --constraint "/home/airflow/airflow-constraints-3.1.5.txt" || true
Expand Down
7 changes: 6 additions & 1 deletion ingestion/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ install: ## Install the ingestion module to the current environment

.PHONY: install_dev_env
install_dev_env: ## Install all dependencies for development (in edit mode)
pip install --upgrade pip
pip install --upgrade pip "setuptools<81"
pip install nox
pip install --no-build-isolation "cx_Oracle>=8.3.0,<9"
python -m pip install -e "$(INGESTION_DIR)[all-dev-env, dev, test-unit]"

.PHONY: install_dev
Expand All @@ -25,10 +26,14 @@ install_dev: ## Install the ingestion module with dev dependencies

.PHONY: install_test
install_test: ## Install the ingestion module with test dependencies
python -m pip install --upgrade pip "setuptools<81"
python -m pip install --no-build-isolation "cx_Oracle>=8.3.0,<9"
python -m pip install "$(INGESTION_DIR)[test]/"

.PHONY: install_all
install_all: ## Install the ingestion module with all dependencies
python -m pip install --upgrade pip "setuptools<81"
python -m pip install --no-build-isolation "cx_Oracle>=8.3.0,<9"
python -m pip install "$(INGESTION_DIR)[all]/"

.PHONY: install_apis
Expand Down
7 changes: 5 additions & 2 deletions ingestion/operators/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,14 @@ ENV PIP_NO_CACHE_DIR=1
# Make pip silent
ENV PIP_QUIET=1

RUN pip install --upgrade pip
# Pin setuptools<81 as pkg_resources was removed in setuptools 81.0.0+
# cx-Oracle's setup.py still uses pkg_resources
RUN pip install --upgrade pip "setuptools<81"
# Pre-install cx-Oracle without build isolation to use the pinned setuptools
RUN pip install --no-build-isolation "cx_Oracle>=8.3.0,<9"

ARG INGESTION_DEPENDENCY="all"
ARG RI_VERSION="1.12.0.0.dev0"
RUN pip install --upgrade pip
RUN pip install "openmetadata-ingestion[airflow]~=${RI_VERSION}"
RUN pip install "openmetadata-ingestion[${INGESTION_DEPENDENCY}]~=${RI_VERSION}"

Expand Down
6 changes: 5 additions & 1 deletion ingestion/operators/docker/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,11 @@ ENV PIP_NO_CACHE_DIR=1
# Make pip silent
ENV PIP_QUIET=1

RUN pip install --upgrade pip setuptools~=70.3.0
# Pin setuptools<81 as pkg_resources was removed in setuptools 81.0.0+
# cx-Oracle's setup.py still uses pkg_resources
RUN pip install --upgrade pip "setuptools<81"
# Pre-install cx-Oracle without build isolation to use the pinned setuptools
RUN pip install --no-build-isolation "cx_Oracle>=8.3.0,<9"

ARG INGESTION_DEPENDENCY="all"
RUN pip install ".[airflow]"
Expand Down
2 changes: 1 addition & 1 deletion ingestion/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
"tabulate==0.9.0",
"typing-inspect",
"packaging", # For version parsing
"setuptools~=78.1.1",
"setuptools>=78.1.1,<81", # <81 required: pkg_resources removed in setuptools 81+
"shapely",
"collate-data-diff>=0.11.9",
"jaraco.functools<4.2.0", # above 4.2 breaks the build
Expand Down
Loading