From e363ec338d0dbb5d967371169782d27a88683ed2 Mon Sep 17 00:00:00 2001 From: Yonggang Liu Date: Tue, 15 Oct 2024 14:09:36 -0400 Subject: [PATCH] HARMONY-1909: Remove setup.py. --- MANIFEST.in | 1 - docs/user/notebook.html | 34 ++++++++++++++++------------------ examples/helper.py | 2 +- setup.py | 15 --------------- tests/test_request.py | 4 ++-- 5 files changed, 19 insertions(+), 37 deletions(-) delete mode 100644 setup.py diff --git a/MANIFEST.in b/MANIFEST.in index bbba1a5..3eca393 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,6 +3,5 @@ include *.md # Include license and setup files include LICENSE -include setup.py include pyproject.toml diff --git a/docs/user/notebook.html b/docs/user/notebook.html index 0e2ba88..d2960a4 100644 --- a/docs/user/notebook.html +++ b/docs/user/notebook.html @@ -7496,7 +7496,6 @@

Harmony Py Tutorial 
import helper
-
 # Install the project and 'examples' dependencies
 helper.install_project_and_dependencies('..', libs=['examples'])
 
@@ -7509,7 +7508,6 @@ 
Harmony Py Tutorialfrom matplotlib import pyplot as plt
 import numpy as np
 
-
 from harmony import BBox, WKT, Client, Collection, Request, Environment
@@ -7719,7 +7717,7 @@

Harmony Py Tutorial @@ -7732,7 +7730,7 @@

Harmony Py Tutorial @@ -7745,7 +7743,7 @@

Harmony Py Tutorial @@ -7758,7 +7756,7 @@

Harmony Py Tutorial @@ -7771,7 +7769,7 @@

Harmony Py Tutorial @@ -7784,20 +7782,20 @@

Harmony Py Tutorial @@ -7810,20 +7808,20 @@

Harmony Py Tutorial @@ -7836,7 +7834,7 @@

Harmony Py Tutorial @@ -8009,7 +8007,7 @@

Harmony Py Tutorial @@ -8192,7 +8190,7 @@

Harmony Py Tutorial @@ -8232,7 +8230,7 @@

Harmony Py Tutorial diff --git a/examples/helper.py b/examples/helper.py index 6b20d02..c5c898a 100644 --- a/examples/helper.py +++ b/examples/helper.py @@ -19,7 +19,7 @@ def install_project_and_dependencies(project_root, libs=None): Change to the project root, install the project and its optional dependencies, then switch back to the original directory. - :param project_root: Path to the project root directory where pyproject.toml or setup.py is located. + :param project_root: Path to the project root directory where pyproject.toml is located. :param libs: List of optional pip extra dependencies (e.g., ['examples', 'dev']). """ # Save the current working directory diff --git a/setup.py b/setup.py deleted file mode 100644 index cc98792..0000000 --- a/setup.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# For a fully annotated version of this file and what it does, see -# https://github.com/pypa/sampleproject/blob/master/setup.py - -# To upload this file to PyPI you must build it then upload it: -# python setup.py sdist bdist_wheel # build in 'dist' folder -# python-m twine upload dist/* # 'twine' must be installed: 'pip install twine' -# -# 2024-10-09 - Updated to use pyproject.toml. - -from setuptools import setup - -setup() diff --git a/tests/test_request.py b/tests/test_request.py index 7ad08f0..8a1a9bb 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -208,8 +208,8 @@ def test_request_valid_shape(): @pytest.mark.parametrize('key, value, messages', [ ('shape', './tests/', ['The provided shape path "./tests/" is not a file']), - ('shape', './setup.py', - ['The provided shape path "./setup.py" has extension "py" which is not recognized. ' + ('shape', './pyproject.toml', + ['The provided shape path "./pyproject.toml" has extension "toml" which is not recognized. ' + 'Valid file extensions: [json, geojson, kml, shz, zip]']), ]) def test_request_shape_file_error_message(key, value, messages):