From 6fb5a1dbcfefd82034523a6d08119639a6cba1ae Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Thu, 1 Dec 2022 16:16:26 +0000 Subject: [PATCH 1/2] Remove mention of deprecated setuptools features: data_files, scripts, and setup.py check --- data/data_file | 1 - setup.py | 13 +------------ tox.ini | 3 --- 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 data/data_file diff --git a/data/data_file b/data/data_file deleted file mode 100644 index 7c0646bf..00000000 --- a/data/data_file +++ /dev/null @@ -1 +0,0 @@ -some data \ No newline at end of file diff --git a/setup.py b/setup.py index 217a8b21..6d76ec40 100644 --- a/setup.py +++ b/setup.py @@ -145,18 +145,7 @@ package_data={ # Optional "sample": ["package_data.dat"], }, - # Although 'package_data' is the preferred approach, in some case you may - # need to place data files outside of your packages. See: - # http://docs.python.org/distutils/setupscript.html#installing-additional-files - # - # In this case, 'data_file' will be installed into '/my_data' - data_files=[("my_data", ["data/data_file"])], # Optional - # To provide executable scripts, use entry points in preference to the - # "scripts" keyword. Entry points provide cross-platform support and allow - # `pip` to create the appropriate form of executable for the target - # platform. - # - # For example, the following would provide a command called `sample` which + # Entry points. The following would provide a command called `sample` which # executes the function `main` from this package when invoked: entry_points={ # Optional "console_scripts": [ diff --git a/tox.ini b/tox.ini index ab06581f..5c51f39b 100644 --- a/tox.ini +++ b/tox.ini @@ -5,8 +5,6 @@ # # - check-manifest # confirm items checked into vcs are in your sdist -# - python setup.py check -# confirm required package meta-data in setup.py # - readme_renderer (when using a ReStructuredText README) # confirms your long_description will render correctly on PyPI. # @@ -38,7 +36,6 @@ commands = # This repository uses a Markdown long_description, so the -r flag to # `setup.py check` is not needed. If your project contains a README.rst, # use `python setup.py check -m -r -s` instead. - python setup.py check -m -s flake8 . py.test tests {posargs} From a3a3abfed2b9c37a428cbea64365404ec64cae55 Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Thu, 1 Dec 2022 16:38:07 +0000 Subject: [PATCH 2/2] Remove leftover comment --- tox.ini | 3 --- 1 file changed, 3 deletions(-) diff --git a/tox.ini b/tox.ini index 5c51f39b..1acece95 100644 --- a/tox.ini +++ b/tox.ini @@ -33,9 +33,6 @@ deps = pytest commands = check-manifest --ignore 'tox.ini,tests/**' - # This repository uses a Markdown long_description, so the -r flag to - # `setup.py check` is not needed. If your project contains a README.rst, - # use `python setup.py check -m -r -s` instead. flake8 . py.test tests {posargs}