#2 Update to 0.10.7 and add a python3 subpackage.
Merged 6 years ago by nonamedotc. Opened 6 years ago by cstratak.
Unknown source master  into  master

file modified
+1
@@ -1,2 +1,3 @@

  /rope-0.10.2.tar.gz

  /rope-0.10.3.tar.gz

+ /rope-0.10.7.tar.gz

@@ -0,0 +1,31 @@

+ diff --git a/rope/base/stdmods.py b/rope/base/stdmods.py

+ index 5e868c2a..7d5db1d1 100644

+ --- a/rope/base/stdmods.py

+ +++ b/rope/base/stdmods.py

+ @@ -43,6 +43,10 @@ def normalize_so_name(name):

+      """

+      if "cpython" in name:

+          return os.path.splitext(os.path.splitext(name)[0])[0]

+ +    # XXX: Special handling for Fedora python2 distribution

+ +    # See: https://github.com/python-rope/rope/issues/211

+ +    if name == "timemodule.so":

+ +        return "time"

+      return os.path.splitext(name)[0]

+  

+  

+ diff --git a/ropetest/builtinstest.py b/ropetest/builtinstest.py

+ index 0093ff2c..68a3df67 100644

+ --- a/ropetest/builtinstest.py

+ +++ b/ropetest/builtinstest.py

+ @@ -502,6 +502,11 @@ def test_time_in_std_mods(self):

+          import rope.base.stdmods

+          self.assertTrue('time' in rope.base.stdmods.standard_modules())

+  

+ +    def test_timemodule_normalizes_to_time(self):

+ +        import rope.base.stdmods

+ +        self.assertEqual(

+ +            rope.base.stdmods.normalize_so_name('timemodule.so'), 'time')

+ +

+  

+  def suite():

+      result = unittest.TestSuite()

file modified
+36 -21
@@ -1,18 +1,21 @@

- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

- 

  Name:           python-rope

- Version:        0.10.3

- Release:        3%{?dist}

+ Version:        0.10.7

+ Release:        1%{?dist}

  Summary:        Python Code Refactoring Library

  

  Group:          Development/Languages

  License:        GPLv2+

- URL:            http://rope.sourceforge.net/

- Source0:        http://pypi.python.org/packages/source/r/rope/rope-%{version}.tar.gz

- BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

+ URL:            https://github.com/python-rope/rope

+ Source0:        https://files.pythonhosted.org/packages/source/r/rope/rope-%{version}.tar.gz

+ 

+ # Fix two tests with py2 on Fedora which fails due to building the time module as a

+ # shared library. See https://github.com/python-rope/rope/issues/220 and

+ # https://github.com/python-rope/rope/issues/211

+ # Fixed upstream: https://github.com/python-rope/rope/pull/225

+ Patch0:         fix-py2-failing-tests.patch

  

  BuildArch:      noarch

- BuildRequires:  python2-devel

+ BuildRequires:  python2-devel python3-devel

  

  # pysvn, hg, git, and darcs are optional.  If installed, they give integration

  # between rope and the version control system.  (So refactorings that rename a
@@ -30,31 +33,43 @@

  

  %description -n python2-rope %_description

  

- %prep

- %setup -q -n rope-%{version}

+ %package -n python3-rope

+ Summary: %summary

+ %{?python_provide:%python_provide python3-%{srcname}}

  

+ %description -n python3-rope %_description

  

- %build

- %{__python} setup.py build

  

+ %prep

+ %autosetup -p1 -n rope-%{version}

  

- %install

- rm -rf $RPM_BUILD_ROOT

- %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

+ %build

+ %py2_build

+ %py3_build

  

- %clean

- rm -rf $RPM_BUILD_ROOT

+ %install

+ %py2_install

+ %py3_install

  

  %check

- python setup.py test

+ %{__python2} setup.py test

+ %{__python3} setup.py test

  

  %files -n python2-rope

- %defattr(-,root,root,-)

- %doc README.rst COPYING docs

- %{python_sitelib}/*

+ %license COPYING

+ %doc README.rst docs

+ %{python2_sitelib}/*

  

+ %files -n python3-rope

+ %license COPYING

+ %doc README.rst docs

+ %{python3_sitelib}/*

  

  %changelog

+ * Wed Nov 08 2017 Charalampos Stratakis <cstratak@redhat.com> - 0.10.7-1

+ - Update to 0.10.7.

+ - Add python3 subpackage.

+ 

  * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.10.3-3

  - Python 2 binary package renamed to python2-rope

    See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3

file modified
+1 -1
@@ -1,1 +1,1 @@

- SHA512 (rope-0.10.3.tar.gz) = 1d868aeebd086c3fc199316a71e61a8c46c76d85176557842051bb8f51d090f316df6bb84f766db5a46dc164d3e471eb90465805a102e46acb34e39b2b0ce8b4

+ SHA512 (rope-0.10.7.tar.gz) = 80343b8b7af883afbd04734b0fe4dbdab114301234654cbd95b3ae8be8dff40878105b7647209f5e899b981ab6a7ecb987d9bdf942b32ed083c745128c22ef95

Based on #1 however the the patch for skipping the failing tests is replaced with the upstream fix.

rebased onto c84958b

6 years ago

Looks good. I will push this and build.

Pull-Request has been merged by nonamedotc

6 years ago

Thanks for fixing this up.