From 33c589ba98dd01aa2ba6d868b31b5f07483cfb1f Mon Sep 17 00:00:00 2001 From: Kaxil Naik Date: Fri, 18 Feb 2022 21:36:07 +0000 Subject: [PATCH] Remove `setup.py` in favor of `pyproject.toml` setuptools doesn't work without `setup.cfg`/`setup.py`. flint had some minor issues - https://github.com/pypa/flit/issues/525 / https://github.com/pypa/flit/issues/488 poetry does not support namespace packages --- dev/Dockerfile | 8 ++++---- pyproject.toml | 3 +++ setup.cfg | 11 ++++++++--- setup.py | 3 --- 4 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 pyproject.toml delete mode 100644 setup.py diff --git a/dev/Dockerfile b/dev/Dockerfile index 72dc300a8..cb5396618 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -2,9 +2,9 @@ ARG IMAGE_NAME="quay.io/astronomer/ap-airflow:2.2.3" FROM ${IMAGE_NAME} USER root -COPY astronomer/ ${AIRFLOW_HOME}/astronomer_operators/astronomer/ -COPY setup.cfg ${AIRFLOW_HOME}/astronomer_operators/setup.cfg -COPY setup.py ${AIRFLOW_HOME}/astronomer_operators/setup.py +COPY astronomer/ ${AIRFLOW_HOME}/astronomer_providers/astronomer/ +COPY setup.cfg ${AIRFLOW_HOME}/astronomer_providers/setup.cfg +COPY pyproject.toml ${AIRFLOW_HOME}/astronomer_providers/pyproject.toml -RUN pip install -e ${AIRFLOW_HOME}/astronomer_operators +RUN pip install -e ${AIRFLOW_HOME}/astronomer_providers USER astro diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..9787c3bdf --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools", "wheel"] +build-backend = "setuptools.build_meta" diff --git a/setup.cfg b/setup.cfg index 4472e534a..16c43c4d8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] -name = astronomer-operators +name = astronomer-providers version = 1.1.0 -url = https://github.com/astronomer/astronomer-operators/ +url = https://github.com/astronomer/astronomer-providers/ author = Astronomer author_email = humans@astronomer.io description = Airflow Providers containing Deferrable Operators & Sensors from Astronomer @@ -9,7 +9,9 @@ long_description = file: README.rst license = Apache License 2.0 license_files = LICENSE.txt classifiers = + Development Status :: 4 - Beta Environment :: Web Environment + Intended Audience :: Developers License :: OSI Approved :: Apache Software License Operating System :: OS Independent Programming Language :: Python @@ -17,12 +19,15 @@ classifiers = Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 +project_urls = + Source Code=https://github.com/astronomer/astronomer-providers/ + Homepage=https://astronomer.io/ [options] python_requires = >=3.7 packages = find_namespace: include_package_data = true -namespace_packages = astronomer,astronomer.operators +namespace_packages = astronomer,astronomer.providers install_requires = aiohttp aiofiles diff --git a/setup.py b/setup.py deleted file mode 100644 index 606849326..000000000 --- a/setup.py +++ /dev/null @@ -1,3 +0,0 @@ -from setuptools import setup - -setup()