|
 |
9878e9d |
From acb21f10d34135171035cdde696fa28c9b81336d 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
|
|
|
9878e9d |
index c4b9459..6195b7d 100644
|
|
|
4be7ba4 |
--- a/mypy/build.py
|
|
|
4be7ba4 |
+++ b/mypy/build.py
|
|
|
9878e9d |
@@ -225,7 +225,7 @@ def default_data_dir(bin_dir: Optional[str]) -> str:
|
|
|
fbd8101 |
return 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
|
|
|
9878e9d |
index 10da829..a35837c 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 |
--
|
|
|
9878e9d |
2.9.2
|
|
|
8b13ee8 |
|