Skip to content

[WIP] Fix #43 #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Apr 2, 2020
Merged

[WIP] Fix #43 #58

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bccaa4
Port from distutils to setuptools
msramalho Mar 30, 2020
59da112
Improve almost duplicate code into for-loop
msramalho Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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 = {
Expand All @@ -152,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)