[med-svn] [Git][med-team/intake][master] Fix tests to an extent and address bug #971177

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / intake


Commits:
94465586 by Shayan Doust at 2020-10-29T21:29:45+00:00
Fix tests to an extent and address bug #971177

- - - - -


3 changed files:

- debian/patches/fix_tests.patch
- debian/patches/series
- + debian/patches/tempfix_ftbfs.patch


Changes:

=====================================
debian/patches/fix_tests.patch
=====================================
@@ -3,9 +3,11 @@ Description: fix failing tests
 Author: Shayan Doust <hello at shayandoust.me>
 Last-Update: 2020-06-20
 ---
+Index: intake/intake/conftest.py
+===================================================================
 --- intake.orig/intake/conftest.py
 +++ intake/intake/conftest.py
-@@ -144,7 +144,7 @@
+@@ -144,7 +144,7 @@ def http_server():
      if PY2:
          cmd = ['python', '-m', 'SimpleHTTPServer', port_as_str]
      else:
@@ -14,9 +16,11 @@ Last-Update: 2020-06-20
      p = subprocess.Popen(cmd, cwd=os.path.join(here, 'catalog', 'tests'))
      url = 'http://localhost:{}/'.format(port_as_str)
      timeout = 5
+Index: intake/intake/catalog/tests/test_default.py
+===================================================================
 --- intake.orig/intake/catalog/tests/test_default.py
 +++ intake/intake/catalog/tests/test_default.py
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,7 @@ from intake.catalog.base import Catalog
  
  
  def test_which():
@@ -25,9 +29,11 @@ Last-Update: 2020-06-20
      assert Path(p).resolve() == Path(sys.executable).resolve()
  
  
+Index: intake/intake/container/tests/test_persist.py
+===================================================================
 --- intake.orig/intake/container/tests/test_persist.py
 +++ intake/intake/container/tests/test_persist.py
-@@ -41,9 +41,9 @@
+@@ -41,9 +41,9 @@ def test_store(temp_cache):
  
  def test_backtrack(temp_cache):
      s = TextFilesSource("*.py")
@@ -40,9 +46,11 @@ Last-Update: 2020-06-20
  
  
  def test_persist_with_nonnumeric_ttl_raises_error(temp_cache):
+Index: intake/intake/source/tests/test_discovery.py
+===================================================================
 --- intake.orig/intake/source/tests/test_discovery.py
 +++ intake/intake/source/tests/test_discovery.py
-@@ -46,22 +46,22 @@
+@@ -46,22 +46,22 @@ def test_discover_cli(extra_pythonpath,
      env["INTAKE_CONF_FILE"] = tmp_config_path
      env['PYTHONPATH'] = extra_pythonpath
  
@@ -81,9 +89,11 @@ Last-Update: 2020-06-20
  
  
  def test_discover(extra_pythonpath, tmp_config_path):
+Index: intake/intake/cli/server/tests/test_server.py
+===================================================================
 --- intake.orig/intake/cli/server/tests/test_server.py
 +++ intake/intake/cli/server/tests/test_server.py
-@@ -323,6 +323,6 @@
+@@ -323,6 +323,6 @@ def address_server(tmpdir):
      shutil.rmtree(tmpdir)
  
  
@@ -93,4 +103,16 @@ Last-Update: 2020-06-20
 +#def test_address_flag(address_server):
 +#    cat = open_catalog(address_server)
 +#    assert 'use_example1' in list(cat)
-
+Index: intake/intake/source/tests/test_npy.py
+===================================================================
+--- intake.orig/intake/source/tests/test_npy.py
++++ intake/intake/source/tests/test_npy.py
+@@ -10,7 +10,7 @@ import numpy as np
+ import posixpath
+ import pytest
+ import intake
+-from ..npy import NPySource
++from intake.source.npy import NPySource
+ 
+ here = os.path.abspath(os.path.dirname(__file__))
+ 


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
+tempfix_ftbfs.patch
 fix_privacy_breach.patch
 fix_tests.patch


=====================================
debian/patches/tempfix_ftbfs.patch
=====================================
@@ -0,0 +1,19 @@
+Description: temp fix for FTBFS regarding sphinx doc generation
+Author: Shayan Doust <hello at shayandoust.me>
+Bug-Debian: https://bugs.debian.org/971177/
+Last-Update: 2020-10-29
+---
+
+Index: intake/intake/__init__.py
+===================================================================
+--- intake.orig/intake/__init__.py
++++ intake/intake/__init__.py
+@@ -39,6 +39,8 @@ if sys.version_info >= (3, 7):
+             warnings.warn('deprecation: intake.Catalog now references the base class intake.catalog.base.Catalog\n '
+                           'If you want to open a generic URL, you should use intake.open_catalog')
+             return Catalog
++        if attr == '__mro__':
++            raise AttributeError
+ 
+ 
+ def make_open_functions():



View it on GitLab: https://salsa.debian.org/med-team/intake/-/commit/94465586d6e9917441cca4b395b9b4b15691232e

-- 
View it on GitLab: https://salsa.debian.org/med-team/intake/-/commit/94465586d6e9917441cca4b395b9b4b15691232e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201029/59bcb2ec/attachment-0001.html>