diff --git a/.gitignore b/.gitignore index c749e1d..bb07712 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /astroid-version-1.0.1.tar.bz2 /astroid-1.1.tar.bz2 /astroid-1.2.1.tar.bz2 +/astroid-1.3.4.tar.bz2 diff --git a/0001-brain-gi-fix-glib-detection-1141440.patch b/0001-brain-gi-fix-glib-detection-1141440.patch deleted file mode 100644 index 547e4ca..0000000 --- a/0001-brain-gi-fix-glib-detection-1141440.patch +++ /dev/null @@ -1,58 +0,0 @@ -From c6d5b3e4cda0d7b803a50652503405087860737e Mon Sep 17 00:00:00 2001 -Message-Id: -From: Cole Robinson -Date: Sat, 13 Sep 2014 07:56:42 -0400 -Subject: [PATCH] brain: gi: fix glib detection - -pygobject has some special hidden modules that we need to inspect -for glib and gobject. However, on latest pygobject, the hidden glib -module has been removed, which caused pylint to fail to detect -glib whatsoever. - -Tread errors in processing these hidden modules as non-fatal. - -Closes astroid issue #49 ---- - brain/py2gi.py | 23 ++++++++++++++++------- - 1 file changed, 16 insertions(+), 7 deletions(-) - -diff --git a/brain/py2gi.py b/brain/py2gi.py -index dd9868d..3b74cb2 100644 ---- a/brain/py2gi.py -+++ b/brain/py2gi.py -@@ -134,17 +134,26 @@ def _new_import_module(self, modname, relative_only=False, level=None): - # build astroid representation unless we already tried so - if modname not in _inspected_modules: - modnames = [modname] -- # GLib and GObject have some special case handling -- # in pygobject that we need to cope with -+ optional_modnames = [] -+ -+ # GLib and GObject may have some special case handling -+ # in pygobject that we need to cope with. However at -+ # least as of pygobject3-3.13.91 the _glib module doesn't -+ # exist anymore, so if treat these modules as optional. - if modname == 'gi.repository.GLib': -- modnames.append('gi._glib') -+ optional_modnames.append('gi._glib') - elif modname == 'gi.repository.GObject': -- modnames.append('gi._gobject') -+ optional_modnames.append('gi._gobject') -+ - try: - modcode = '' -- for m in modnames: -- __import__(m) -- modcode += _gi_build_stub(sys.modules[m]) -+ for m in modnames + optional_modnames: -+ try: -+ __import__(m) -+ modcode += _gi_build_stub(sys.modules[m]) -+ except ImportError: -+ if m not in optional_modnames: -+ raise - except ImportError: - astng = _inspected_modules[modname] = None - else: --- -2.1.0 diff --git a/python-astroid.spec b/python-astroid.spec index 9e20a10..eb68d02 100644 --- a/python-astroid.spec +++ b/python-astroid.spec @@ -5,29 +5,28 @@ %endif # This needs to be pulled from the source tarball -%global commit 315668c10333 +%global commit 912ee5c11020 Name: python-astroid -Version: 1.2.1 -Release: 2%{?dist} +Version: 1.3.4 +Release: 1%{?dist} Summary: Python Abstract Syntax Tree New Generation Group: Development/Languages License: GPLv2+ URL: http://www.astroid.org Source0: https://bitbucket.org/logilab/astroid/get/astroid-%{version}.tar.bz2 -Patch0: 0001-brain-gi-fix-glib-detection-1141440.patch Provides: python-astroid = %{version}-%{release} Obsoletes: python-logilab-astng <= 0.24.1 BuildArch: noarch BuildRequires: python-devel python-setuptools python-tools -BuildRequires: python-logilab-common >= 0.62.1 -Requires: python-logilab-common >= 0.62.1 +BuildRequires: python-logilab-common >= 0.63.2 +Requires: python-logilab-common >= 0.63.2 %if 0%{?with_python3} BuildRequires: python3-devel python3-setuptools python3-tools -BuildRequires: python3-logilab-common >= 0.62.1 +BuildRequires: python3-logilab-common >= 0.63.2 %endif # if with_python3 %description @@ -40,7 +39,7 @@ python module with some additional methods and attributes. %package -n python3-astroid Summary: Python Abstract Syntax Tree New Generation Group: Development/Languages -Requires: python3-logilab-common >= 0.62.1 +Requires: python3-logilab-common >= 0.63.2 %description -n python3-astroid The aim of this module is to provide a common base representation of @@ -51,7 +50,6 @@ python module with some additional methods and attributes. %prep %setup -q -n logilab-astroid-%{commit} -%patch0 -p1 %if 0%{?with_python3} rm -rf %{py3dir} @@ -114,6 +112,10 @@ popd %endif # with_python3 %changelog +* Wed Jan 28 2015 Brian C. Lane 1.3.4-1 +- Upstream v1.3.4 + Drop patches now included in upstream + * Fri Oct 17 2014 Brian C. Lane 1.2.1-2 - Add patch to fix GLib detection (#1141440) https://bitbucket.org/logilab/astroid/issue/49 diff --git a/sources b/sources index 241ecde..7723683 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -87deca0be1099cd1771f6792499b5772 astroid-1.2.1.tar.bz2 +6483be463a33c92b9980a18c5a72e49d astroid-1.3.4.tar.bz2