| 1 |
commit: f26753127955f2c9cc9706a8d74f6eb7f2926897 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Aug 16 12:21:43 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 2 15:10:27 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2675312 |
| 7 |
|
| 8 |
dev-python/astropy: remove unused patch |
| 9 |
|
| 10 |
.../files/astropy-2.0-external-python-pkgs.patch | 120 --------------------- |
| 11 |
1 file changed, 120 deletions(-) |
| 12 |
|
| 13 |
diff --git a/dev-python/astropy/files/astropy-2.0-external-python-pkgs.patch b/dev-python/astropy/files/astropy-2.0-external-python-pkgs.patch |
| 14 |
deleted file mode 100644 |
| 15 |
index 117cb8563b7..00000000000 |
| 16 |
--- a/dev-python/astropy/files/astropy-2.0-external-python-pkgs.patch |
| 17 |
+++ /dev/null |
| 18 |
@@ -1,120 +0,0 @@ |
| 19 |
-From: Ole Streicher <olebole@××××××.org> |
| 20 |
-Date: Thu, 12 Jan 2017 11:37:47 +0100 |
| 21 |
-Subject: Use external python modules instead of convenience copies |
| 22 |
-bicatali@g.o: Edit to remove jsviewer debian internals |
| 23 |
- |
| 24 |
---- |
| 25 |
- astropy/coordinates/angle_utilities.py | 2 +- |
| 26 |
- astropy/extern/configobj.py | 5 ++++- |
| 27 |
- astropy/extern/six.py | 2 +- |
| 28 |
- astropy/units/format/cds.py | 4 ++-- |
| 29 |
- astropy/units/format/generic.py | 4 ++-- |
| 30 |
- astropy/units/format/ogip.py | 4 ++-- |
| 31 |
- 8 files changed, 23 insertions(+), 18 deletions(-) |
| 32 |
- |
| 33 |
-diff --git a/astropy/coordinates/angle_utilities.py b/astropy/coordinates/angle_utilities.py |
| 34 |
-index cfa894e..bb8fb7d 100644 |
| 35 |
---- a/astropy/coordinates/angle_utilities.py |
| 36 |
-+++ b/astropy/coordinates/angle_utilities.py |
| 37 |
-@@ -64,7 +64,7 @@ class _AngleParser(object): |
| 38 |
- |
| 39 |
- @classmethod |
| 40 |
- def _make_parser(cls): |
| 41 |
-- from ..extern.ply import lex, yacc |
| 42 |
-+ from ply import lex, yacc |
| 43 |
- |
| 44 |
- # List of token names. |
| 45 |
- tokens = ( |
| 46 |
-diff --git a/astropy/extern/configobj.py b/astropy/extern/configobj.py |
| 47 |
-index 8d1bd8c..e3bb0e0 100644 |
| 48 |
---- a/astropy/extern/configobj.py |
| 49 |
-+++ b/astropy/extern/configobj.py |
| 50 |
-@@ -7,5 +7,8 @@ currently installed version of python. |
| 51 |
- Also, this should actually never actually show up as a docstring, because |
| 52 |
- it should get overwritten by the appropriate configobj docstring. |
| 53 |
- """ |
| 54 |
-+from __future__ import absolute_import |
| 55 |
-+import validate |
| 56 |
-+import configobj |
| 57 |
-+ |
| 58 |
- |
| 59 |
--from .configobj import configobj, validate, __doc__ |
| 60 |
-diff --git a/astropy/extern/six.py b/astropy/extern/six.py |
| 61 |
-index 5398fc0..fb3a30c 100644 |
| 62 |
---- a/astropy/extern/six.py |
| 63 |
-+++ b/astropy/extern/six.py |
| 64 |
-@@ -13,7 +13,7 @@ _SIX_MIN_VERSION = StrictVersion('1.10.0') |
| 65 |
- # Update this to prevent Astropy from using its bundled copy of six |
| 66 |
- # (but only if some other version of at least _SIX_MIN_VERSION can |
| 67 |
- # be provided) |
| 68 |
--_SIX_SEARCH_PATH = ['astropy.extern.bundled.six', 'six'] |
| 69 |
-+_SIX_SEARCH_PATH = ['six'] |
| 70 |
- |
| 71 |
- |
| 72 |
- def _find_module(name, path=None): |
| 73 |
-diff --git a/astropy/units/format/cds.py b/astropy/units/format/cds.py |
| 74 |
-index e40c1cf..0d5e033 100644 |
| 75 |
---- a/astropy/units/format/cds.py |
| 76 |
-+++ b/astropy/units/format/cds.py |
| 77 |
-@@ -78,7 +78,7 @@ class CDS(Base): |
| 78 |
- |
| 79 |
- @classmethod |
| 80 |
- def _make_lexer(cls): |
| 81 |
-- from ...extern.ply import lex |
| 82 |
-+ from ply import lex |
| 83 |
- |
| 84 |
- tokens = cls._tokens |
| 85 |
- |
| 86 |
-@@ -142,7 +142,7 @@ class CDS(Base): |
| 87 |
- <https://bitbucket.org/nxg/unity/>`_. |
| 88 |
- """ |
| 89 |
- |
| 90 |
-- from ...extern.ply import yacc |
| 91 |
-+ from ply import yacc |
| 92 |
- |
| 93 |
- tokens = cls._tokens |
| 94 |
- |
| 95 |
-diff --git a/astropy/units/format/generic.py b/astropy/units/format/generic.py |
| 96 |
-index 974ca25..7d40dfe 100644 |
| 97 |
---- a/astropy/units/format/generic.py |
| 98 |
-+++ b/astropy/units/format/generic.py |
| 99 |
-@@ -103,7 +103,7 @@ class Generic(Base): |
| 100 |
- |
| 101 |
- @classmethod |
| 102 |
- def _make_lexer(cls): |
| 103 |
-- from ...extern.ply import lex |
| 104 |
-+ from ply import lex |
| 105 |
- |
| 106 |
- tokens = cls._tokens |
| 107 |
- |
| 108 |
-@@ -178,7 +178,7 @@ class Generic(Base): |
| 109 |
- formats, the only difference being the set of available unit |
| 110 |
- strings. |
| 111 |
- """ |
| 112 |
-- from ...extern.ply import yacc |
| 113 |
-+ from ply import yacc |
| 114 |
- |
| 115 |
- tokens = cls._tokens |
| 116 |
- |
| 117 |
-diff --git a/astropy/units/format/ogip.py b/astropy/units/format/ogip.py |
| 118 |
-index e429407..e80e35a 100644 |
| 119 |
---- a/astropy/units/format/ogip.py |
| 120 |
-+++ b/astropy/units/format/ogip.py |
| 121 |
-@@ -110,7 +110,7 @@ class OGIP(generic.Generic): |
| 122 |
- |
| 123 |
- @classmethod |
| 124 |
- def _make_lexer(cls): |
| 125 |
-- from ...extern.ply import lex |
| 126 |
-+ from ply import lex |
| 127 |
- |
| 128 |
- tokens = cls._tokens |
| 129 |
- |
| 130 |
-@@ -180,7 +180,7 @@ class OGIP(generic.Generic): |
| 131 |
- <https://bitbucket.org/nxg/unity/>`_. |
| 132 |
- """ |
| 133 |
- |
| 134 |
-- from ...extern.ply import yacc |
| 135 |
-+ from ply import yacc |
| 136 |
- |
| 137 |
- tokens = cls._tokens |
| 138 |
- |
Archives