|
 |
a4aba9f |
From 7cdf652eaee801639aac39527305e256dcf65515 Mon Sep 17 00:00:00 2001
|
|
|
4be7ba4 |
From: David Shea <dshea@redhat.com>
|
|
|
4be7ba4 |
Date: Tue, 15 Dec 2015 14:01:55 -0500
|
|
|
a4aba9f |
Subject: [PATCH 1/2] Look for typeshed in /usr/share
|
|
|
4be7ba4 |
|
|
|
a4aba9f |
Skip installing the bundled typeshed
|
|
|
4be7ba4 |
---
|
|
|
4be7ba4 |
mypy/build.py | 2 +-
|
|
|
a4aba9f |
setup.py | 2 --
|
|
|
a4aba9f |
2 files changed, 1 insertion(+), 3 deletions(-)
|
|
|
4be7ba4 |
|
|
|
8b13ee8 |
diff --git a/mypy/build.py b/mypy/build.py
|
|
|
8b13ee8 |
index 4d01c5d..9f01b23 100644
|
|
|
4be7ba4 |
--- a/mypy/build.py
|
|
|
4be7ba4 |
+++ b/mypy/build.py
|
|
|
8b13ee8 |
@@ -233,7 +233,7 @@ def default_data_dir(bin_dir: str) -> str:
|
|
|
8b13ee8 |
return os.path.dirname(bin_dir)
|
|
|
4be7ba4 |
elif base == 'bin':
|
|
|
4be7ba4 |
# Installed to somewhere (can be under /usr/local or anywhere).
|
|
|
4be7ba4 |
- return os.path.join(dir, 'lib', 'mypy')
|
|
|
4be7ba4 |
+ return os.path.join(dir, 'share')
|
|
|
4be7ba4 |
elif base == 'python3':
|
|
|
4be7ba4 |
# Assume we installed python3 with brew on os x
|
|
|
4be7ba4 |
return os.path.join(os.path.dirname(dir), 'lib', 'mypy')
|
|
|
8b13ee8 |
diff --git a/setup.py b/setup.py
|
|
|
8b13ee8 |
index 89554a6..da62c0d 100644
|
|
|
a4aba9f |
--- a/setup.py
|
|
|
a4aba9f |
+++ b/setup.py
|
|
|
a4aba9f |
@@ -53,8 +53,6 @@ def find_data_files(base, globs):
|
|
|
a4aba9f |
|
|
|
a4aba9f |
data_files = []
|
|
|
a4aba9f |
|
|
|
a4aba9f |
-data_files += find_data_files('typeshed', ['*.py', '*.pyi'])
|
|
|
a4aba9f |
-
|
|
|
a4aba9f |
data_files += find_data_files('xml', ['*.xsd', '*.xslt', '*.css'])
|
|
|
a4aba9f |
|
|
|
a4aba9f |
classifiers = [
|
|
|
8b13ee8 |
--
|
|
|
8b13ee8 |
2.7.1
|
|
|
8b13ee8 |
|