From df2b1985d5cd6be1080b4000ce2eed729167a2da Mon Sep 17 00:00:00 2001 From: harupy <17039389+harupy@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:21:02 +0900 Subject: [PATCH] Lint setup.py Signed-off-by: harupy <17039389+harupy@users.noreply.github.com> --- pyproject.toml | 1 - setup.py | 19 ++++++++++++------- tests/resources/mlflow-test-plugin/setup.py | 3 +-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 010919f857029..968bacadd822c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,6 @@ target-version = "py38" force-exclude = true extend-include = ["*.ipynb"] extend-exclude = [ - "setup.py", "examples/recipes", "mlflow/protos", "mlflow/ml_package_versions.py", diff --git a/setup.py b/setup.py index 2c4713fb67bb5..3179104c699a3 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,9 @@ -import os import logging -from pathlib import Path +import os from importlib.machinery import SourceFileLoader -from setuptools import setup, find_packages, Command +from pathlib import Path + +from setuptools import find_packages, setup _MLFLOW_SKINNY_ENV_VAR = "MLFLOW_SKINNY" @@ -74,7 +75,7 @@ def remove_comments_and_empty_lines(lines): GATEWAY_REQUIREMENTS = remove_comments_and_empty_lines(f.read().splitlines()) _is_mlflow_skinny = bool(os.environ.get(_MLFLOW_SKINNY_ENV_VAR)) -logging.debug("{} env var is set: {}".format(_MLFLOW_SKINNY_ENV_VAR, _is_mlflow_skinny)) +logging.debug(f"{_MLFLOW_SKINNY_ENV_VAR} env var is set: {_is_mlflow_skinny}") MINIMUM_SUPPORTED_PYTHON_VERSION = Path("requirements", "python-version.txt").read_text().strip() @@ -87,6 +88,12 @@ def remove_comments_and_empty_lines(lines): *recipes_files, ] +with open("README_SKINNY.rst") as f: + README_SKINNY = f.read() + +with open("README.rst") as f: + README = f.read() + setup( name="mlflow" if not _is_mlflow_skinny else "mlflow-skinny", version=version, @@ -162,9 +169,7 @@ def remove_comments_and_empty_lines(lines): zip_safe=False, author="Databricks", description="MLflow: A Platform for ML Development and Productionization", - long_description=open("README.rst").read() - if not _is_mlflow_skinny - else open("README_SKINNY.rst").read() + open("README.rst").read(), + long_description=README if not _is_mlflow_skinny else README_SKINNY + README, long_description_content_type="text/x-rst", license="Apache License 2.0", classifiers=[ diff --git a/tests/resources/mlflow-test-plugin/setup.py b/tests/resources/mlflow-test-plugin/setup.py index 0c496bd12ebce..9f81d25fa8773 100644 --- a/tests/resources/mlflow-test-plugin/setup.py +++ b/tests/resources/mlflow-test-plugin/setup.py @@ -1,5 +1,4 @@ -from setuptools import setup, find_packages - +from setuptools import find_packages, setup setup( name="mlflow-test-plugin",