[saem-devel] [PATCH saem_ref V2] [pkg] use updated cubicweb-eac with new "cube as package" layout

Philippe Pepiot philippe.pepiot at logilab.fr
Wed Feb 22 14:37:15 CET 2017


# HG changeset patch
# User Philippe Pepiot <philippe.pepiot at logilab.fr>
# Date 1487770583 -3600
#      Wed Feb 22 14:36:23 2017 +0100
# Node ID 783d91483745e45627dbef32ce86ad06a9da1004
# Parent  b4fd0950420876bfb3b57b6840885b1dbbf1cb50
# Available At https://hg.logilab.org/review/cubes/saem_ref
#              hg pull https://hg.logilab.org/review/cubes/saem_ref -r 783d91483745
# Tested at https://jenkins.logilab.org/job/cubicweb-saem_ref/94/
[pkg] use updated cubicweb-eac with new "cube as package" layout

Legacy import does not work as expected in cubicweb 3.24 causing stranges
issues due to double import of same modules. Until this is fixed, it should be
in cubicweb 3.25, explicitely import from cubicweb_eac instead of cubes.eac.

diff --git a/cubicweb_saem_ref/ccplugin.py b/cubicweb_saem_ref/ccplugin.py
--- a/cubicweb_saem_ref/ccplugin.py
+++ b/cubicweb_saem_ref/ccplugin.py
@@ -25,7 +25,7 @@ from cubicweb import MultipleResultsErro
 from cubicweb.toolsutils import underline_title
 from cubicweb.utils import admincnx
 
-from cubes.eac import ccplugin as eac
+from cubicweb_eac import ccplugin as eac
 
 from . import _massive_store_factory, _nohook_store_factory
 
diff --git a/cubicweb_saem_ref/entities/eac.py b/cubicweb_saem_ref/entities/eac.py
--- a/cubicweb_saem_ref/entities/eac.py
+++ b/cubicweb_saem_ref/entities/eac.py
@@ -19,7 +19,7 @@ from cubicweb.predicates import is_insta
 
 from cubes.oaipmh import MetadataFormat
 from cubes.oaipmh.entities import RelatedEntityOAISetSpec
-from cubes.eac import entities as eac
+from cubicweb_eac import entities as eac
 
 from . import oai
 
diff --git a/cubicweb_saem_ref/pviews.py b/cubicweb_saem_ref/pviews.py
--- a/cubicweb_saem_ref/pviews.py
+++ b/cubicweb_saem_ref/pviews.py
@@ -21,7 +21,7 @@ from pyramid.view import view_config
 from cubicweb.dataimport.importer import SimpleImportLog
 
 from cubes.skos import to_unicode
-from cubes.eac import dataimport
+from cubicweb_eac import dataimport
 
 
 @view_config(
diff --git a/cubicweb_saem_ref/schema.py b/cubicweb_saem_ref/schema.py
--- a/cubicweb_saem_ref/schema.py
+++ b/cubicweb_saem_ref/schema.py
@@ -26,7 +26,7 @@ from cubicweb.schema import (RO_ATTR_PER
 from cubicweb.schemas.base import ExternalUri, EmailAddress
 
 from cubes.skos.schema import ConceptScheme
-from cubes.eac.schema import AuthorityRecord, NameEntry
+from cubicweb_eac.schema import AuthorityRecord, NameEntry
 from cubes.seda.schema import simplified_profile
 from cubes.seda.schema.seda2 import SEDAArchiveTransfer
 
diff --git a/cubicweb_saem_ref/sobjects/__init__.py b/cubicweb_saem_ref/sobjects/__init__.py
--- a/cubicweb_saem_ref/sobjects/__init__.py
+++ b/cubicweb_saem_ref/sobjects/__init__.py
@@ -21,7 +21,7 @@ from cubicweb.predicates import match_us
 from cubicweb.server import Service
 from cubicweb.dataimport.stores import MetadataGenerator
 
-from cubes.eac import sobjects as eac
+from cubicweb_eac import sobjects as eac
 
 from .. import user_has_naa
 from ..hooks import set_ark_and_cwuri
diff --git a/cubicweb_saem_ref/views/eac.py b/cubicweb_saem_ref/views/eac.py
--- a/cubicweb_saem_ref/views/eac.py
+++ b/cubicweb_saem_ref/views/eac.py
@@ -22,7 +22,7 @@ from cubicweb.predicates import specifie
 from cubicweb.web import formfields as ff
 from cubicweb.web.views import editforms
 
-from cubes.eac import views as eac
+from cubicweb_eac import views as eac
 
 from .. import user_has_naa, user_has_authority
 
diff --git a/dev-requirements.txt b/dev-requirements.txt
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,4 +1,5 @@
 pytest
 webtest
+http://hg.logilab.org/master/cubes/eac/archive/tip.tar.bz2
 http://hg.logilab.org/master/cubes/seda/archive/tip.tar.bz2#egg=cubicweb-seda
 http://hg.logilab.org/master/cubes/relationwidget/archive/tip.tar.bz2
diff --git a/test/test_ccplugin.py b/test/test_ccplugin.py
--- a/test/test_ccplugin.py
+++ b/test/test_ccplugin.py
@@ -26,7 +26,7 @@ except ImportError as exc:
     import pytest
     pytestmark = pytest.mark.skipif(True, reason=str(exc))
 else:
-    from cubes.eac import ccplugin
+    from cubicweb_eac import ccplugin
 
 import testutils
 



More information about the saem-devel mailing list