From f79596381b23661c0f70ddbe56daa9e192cc37cc Mon Sep 17 00:00:00 2001 From: Matěj Cepl Date: May 15 2016 21:25:13 +0000 Subject: Update patches --- diff --git a/0001-Look-for-typeshed-in-usr-share.patch b/0001-Look-for-typeshed-in-usr-share.patch index 439050d..8ed4c95 100644 --- a/0001-Look-for-typeshed-in-usr-share.patch +++ b/0001-Look-for-typeshed-in-usr-share.patch @@ -9,12 +9,10 @@ Skip installing the bundled typeshed setup.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) -diff --git a/mypy/build.py b/mypy/build.py -index 4d01c5d..9f01b23 100644 --- a/mypy/build.py +++ b/mypy/build.py -@@ -233,7 +233,7 @@ def default_data_dir(bin_dir: str) -> str: - return os.path.dirname(bin_dir) +@@ -257,7 +257,7 @@ def default_data_dir(bin_dir: str) -> st + return dir elif base == 'bin': # Installed to somewhere (can be under /usr/local or anywhere). - return os.path.join(dir, 'lib', 'mypy') @@ -22,8 +20,6 @@ index 4d01c5d..9f01b23 100644 elif base == 'python3': # Assume we installed python3 with brew on os x return os.path.join(os.path.dirname(dir), 'lib', 'mypy') -diff --git a/setup.py b/setup.py -index 89554a6..da62c0d 100644 --- a/setup.py +++ b/setup.py @@ -53,8 +53,6 @@ def find_data_files(base, globs): @@ -35,6 +31,3 @@ index 89554a6..da62c0d 100644 data_files += find_data_files('xml', ['*.xsd', '*.xslt', '*.css']) classifiers = [ --- -2.7.1 - diff --git a/0002-Canonicalize-bin_dir-when-looking-for-data_dir.patch b/0002-Canonicalize-bin_dir-when-looking-for-data_dir.patch index 937b94d..83fba9c 100644 --- a/0002-Canonicalize-bin_dir-when-looking-for-data_dir.patch +++ b/0002-Canonicalize-bin_dir-when-looking-for-data_dir.patch @@ -9,12 +9,10 @@ in /usr instead of /. mypy/build.py | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/mypy/build.py b/mypy/build.py -index 9f01b23..d79d0f5 100644 --- a/mypy/build.py +++ b/mypy/build.py -@@ -222,6 +222,10 @@ def default_data_dir(bin_dir: str) -> str: - return os.path.join(lib, 'mypy') +@@ -246,6 +246,10 @@ def default_data_dir(bin_dir: str) -> st + return subdir # Default to directory containing this file's parent. return parent + @@ -24,6 +22,3 @@ index 9f01b23..d79d0f5 100644 base = os.path.basename(bin_dir) dir = os.path.dirname(bin_dir) if (sys.platform == 'win32' and base.lower() == 'scripts' --- -2.7.1 -