From 7bccaa48b564f7eacb292fcb9029131a8d2e48d7 Mon Sep 17 00:00:00 2001 From: msramalho Date: Mon, 30 Mar 2020 21:53:57 +0100 Subject: [PATCH 1/2] Port from distutils to setuptools --- setup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 52b62dca4..8e738a202 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,7 @@ # * Contact package maintainers # * Announce the release (example: https://blog.torproject.org/blog/stem-release-11) -import distutils.core +import setuptools import os import sys import stem @@ -126,8 +126,9 @@ with open('MANIFEST.in', 'w') as manifest_file: manifest_file.write(MANIFEST) + try: - distutils.core.setup( + setuptools.setup( name = 'stem-dry-run' if DRY_RUN else 'stem', version = stem.__version__, description = DRY_RUN_SUMMARY if DRY_RUN else SUMMARY, @@ -136,7 +137,7 @@ author = stem.__author__, author_email = stem.__contact__, url = stem.__url__, - packages = ['stem', 'stem.client', 'stem.descriptor', 'stem.interpreter', 'stem.response', 'stem.util'], + packages = setuptools.find_packages(exclude=["test*"]), keywords = 'tor onion controller', scripts = ['tor-prompt'], package_data = { From 59da1120f234b9c7c8f7a92e339693105da25fe7 Mon Sep 17 00:00:00 2001 From: msramalho Date: Mon, 30 Mar 2020 21:54:47 +0100 Subject: [PATCH 2/2] Improve almost duplicate code into for-loop --- setup.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 8e738a202..968e42c04 100644 --- a/setup.py +++ b/setup.py @@ -153,8 +153,6 @@ ], ) finally: - if os.path.exists('MANIFEST.in'): - os.remove('MANIFEST.in') - - if os.path.exists('MANIFEST'): - os.remove('MANIFEST') + for filename in ['MANIFEST.in', 'MANIFEST']: + if os.path.exists(filename): + os.remove(filename)