[PATCH 12 of 14 skos] [pkg] Move to cube as package layout

Denis Laxalde denis.laxalde at logilab.fr
Mon Feb 19 12:28:03 CET 2018


# HG changeset patch
# User Denis Laxalde <denis.laxalde at logilab.fr>
# Date 1519034586 -3600
#      Mon Feb 19 11:03:06 2018 +0100
# Node ID d7857c83029216f48960677a081ba72c74521d5e
# Parent  448195d9bbf226f8df455282b447f83efbe7ff21
[pkg] Move to cube as package layout

Closes #17133722.

diff --git a/MANIFEST.in b/MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,10 +1,10 @@
-include tox.ini test-requirements.txt
 include *.py
 include */*.py
-include test/data/*
-recursive-include data *.gif *.png *.ico *.css *.js
-recursive-include i18n *.po *.pot
-recursive-include wdoc *
+recursive-include cubicweb_skos *.py
+recursive-include cubicweb_skos/i18n *.po *.pot
+recursive-include test/data bootstrap_cubes *.py *.csv *.n3 *.rdf *.xml
+include *.ini
+include test-requirements.txt
 
 prune cubicweb-skos.spec
 prune debian
diff --git a/cubicweb-skos.spec b/cubicweb-skos.spec
--- a/cubicweb-skos.spec
+++ b/cubicweb-skos.spec
@@ -35,14 +35,11 @@ find . -name '*.py' -type f -print0 |  x
 %endif
 
 %install
-NO_SETUPTOOLS=1 %{__python} setup.py --quiet install --no-compile --prefix=%{_prefix} --root="$RPM_BUILD_ROOT"
-# remove generated .egg-info file
-rm -rf $RPM_BUILD_ROOT/usr/lib/python*
-
+%{__python} setup.py --quiet install --no-compile --prefix=%{_prefix} --root="$RPM_BUILD_ROOT"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%{_prefix}/share/cubicweb/cubes/*
+%{_python_sitelib}/*
diff --git a/__init__.py b/cubicweb_skos/__init__.py
rename from __init__.py
rename to cubicweb_skos/__init__.py
diff --git a/__pkginfo__.py b/cubicweb_skos/__pkginfo__.py
rename from __pkginfo__.py
rename to cubicweb_skos/__pkginfo__.py
--- a/__pkginfo__.py
+++ b/cubicweb_skos/__pkginfo__.py
@@ -1,7 +1,8 @@
 # pylint: disable=W0622
 """cubicweb-skos application packaging information"""
 
-modname = 'skos'
+
+modname = 'cubicweb_skos'
 distname = 'cubicweb-skos'
 
 numversion = (1, 2, 2)
@@ -13,8 +14,9 @@ author_email = 'contact at logilab.fr'
 description = '"SKOS implementation for cubicweb"'
 web = 'http://www.cubicweb.org/project/%s' % distname
 
-__depends__ =  {
+__depends__ = {
     'cubicweb': '>= 3.24.0',
+    'six': '>= 1.4.0',
 }
 __recommends__ = {
     'rdflib': '>= 4.1',
@@ -26,28 +28,4 @@ classifiers = [
     'Framework :: CubicWeb',
     'Programming Language :: Python',
     'Programming Language :: JavaScript',
-    ]
-
-from os import listdir as _listdir
-from os.path import join, isdir
-from glob import glob
-
-THIS_CUBE_DIR = join('share', 'cubicweb', 'cubes', modname)
-
-def listdir(dirpath):
-    return [join(dirpath, fname) for fname in _listdir(dirpath)
-            if fname[0] != '.' and not fname.endswith('.pyc')
-            and not fname.endswith('~')
-            and not isdir(join(dirpath, fname))]
-
-data_files = [
-    # common files
-    [THIS_CUBE_DIR, [fname for fname in glob('*.py') if fname != 'setup.py']],
-    ]
-# check for possible extended cube layout
-for dname in ('entities', 'views', 'sobjects', 'hooks', 'schema', 'data', 'wdoc', 'i18n', 'migration'):
-    if isdir(dname):
-        data_files.append([join(THIS_CUBE_DIR, dname), listdir(dname)])
-# Note: here, you'll need to add subdirectories if you want
-# them to be included in the debian package
-
+]
diff --git a/ccplugin.py b/cubicweb_skos/ccplugin.py
rename from ccplugin.py
rename to cubicweb_skos/ccplugin.py
--- a/ccplugin.py
+++ b/cubicweb_skos/ccplugin.py
@@ -26,8 +26,12 @@ from cubicweb.cwctl import CWCTL
 from cubicweb.utils import admincnx
 from cubicweb.dataimport.importer import SimpleImportLog
 
-from cubes.skos import rdfio
-from cubes.skos.sobjects import graph_extentities, import_skos_extentities, lcsv_extentities
+from cubicweb_skos import rdfio
+from cubicweb_skos.sobjects import (
+    graph_extentities,
+    import_skos_extentities,
+    lcsv_extentities,
+)
 
 
 def _massive_store_factory(cnx, config, **kwargs):
diff --git a/dataimport.py b/cubicweb_skos/dataimport.py
rename from dataimport.py
rename to cubicweb_skos/dataimport.py
diff --git a/entities.py b/cubicweb_skos/entities.py
rename from entities.py
rename to cubicweb_skos/entities.py
--- a/entities.py
+++ b/cubicweb_skos/entities.py
@@ -24,9 +24,9 @@ from cubicweb.view import EntityAdapter
 from cubicweb.entities import AnyEntity, fetch_config
 from cubicweb.entities.adapters import ITreeAdapter
 
-from cubes import skos
-from cubes.skos import rdfio
-from cubes.skos.rdfio import unicode_with_language as ul
+import cubicweb_skos as skos
+from cubicweb_skos import rdfio
+from cubicweb_skos.rdfio import unicode_with_language as ul
 
 
 def _add_concept(scheme, label, language_code, kind=u'preferred', **kwargs):
diff --git a/hooks.py b/cubicweb_skos/hooks.py
rename from hooks.py
rename to cubicweb_skos/hooks.py
--- a/hooks.py
+++ b/cubicweb_skos/hooks.py
@@ -23,7 +23,7 @@ from cubicweb import _
 from cubicweb.server import hook
 from cubicweb.predicates import is_instance
 
-from cubes.skos.dataimport import dump_relations
+from cubicweb_skos.dataimport import dump_relations
 
 
 class CreateRelationsOp(hook.DataOperationMixIn, hook.Operation):
diff --git a/i18n/en.po b/cubicweb_skos/i18n/en.po
rename from i18n/en.po
rename to cubicweb_skos/i18n/en.po
diff --git a/i18n/fr.po b/cubicweb_skos/i18n/fr.po
rename from i18n/fr.po
rename to cubicweb_skos/i18n/fr.po
diff --git a/i18n/static-messages.pot b/cubicweb_skos/i18n/static-messages.pot
rename from i18n/static-messages.pot
rename to cubicweb_skos/i18n/static-messages.pot
diff --git a/lcsv.py b/cubicweb_skos/lcsv.py
rename from lcsv.py
rename to cubicweb_skos/lcsv.py
--- a/lcsv.py
+++ b/cubicweb_skos/lcsv.py
@@ -22,8 +22,8 @@ from six import text_type
 from cubicweb import _
 from cubicweb.dataimport import ucsvreader
 
-from cubes.skos import rdfio
-from cubes.skos.rdfio import unicode_with_language as ul
+from cubicweb_skos import rdfio
+from cubicweb_skos.rdfio import unicode_with_language as ul
 
 
 class InvalidLCSVFile(RuntimeError):
diff --git a/migration/0.10.0_Any.py b/cubicweb_skos/migration/0.10.0_Any.py
rename from migration/0.10.0_Any.py
rename to cubicweb_skos/migration/0.10.0_Any.py
diff --git a/migration/0.12.1_Any.py b/cubicweb_skos/migration/0.12.1_Any.py
rename from migration/0.12.1_Any.py
rename to cubicweb_skos/migration/0.12.1_Any.py
diff --git a/migration/0.2.0_Any.py b/cubicweb_skos/migration/0.2.0_Any.py
rename from migration/0.2.0_Any.py
rename to cubicweb_skos/migration/0.2.0_Any.py
diff --git a/migration/0.4.0_Any.py b/cubicweb_skos/migration/0.4.0_Any.py
rename from migration/0.4.0_Any.py
rename to cubicweb_skos/migration/0.4.0_Any.py
diff --git a/migration/0.5.0_Any.py b/cubicweb_skos/migration/0.5.0_Any.py
rename from migration/0.5.0_Any.py
rename to cubicweb_skos/migration/0.5.0_Any.py
diff --git a/migration/0.6.0_Any.py b/cubicweb_skos/migration/0.6.0_Any.py
rename from migration/0.6.0_Any.py
rename to cubicweb_skos/migration/0.6.0_Any.py
diff --git a/migration/0.7.2_Any.py b/cubicweb_skos/migration/0.7.2_Any.py
rename from migration/0.7.2_Any.py
rename to cubicweb_skos/migration/0.7.2_Any.py
diff --git a/post321_import.py b/cubicweb_skos/post321_import.py
rename from post321_import.py
rename to cubicweb_skos/post321_import.py
diff --git a/rdfio.py b/cubicweb_skos/rdfio.py
rename from rdfio.py
rename to cubicweb_skos/rdfio.py
diff --git a/schema.py b/cubicweb_skos/schema.py
rename from schema.py
rename to cubicweb_skos/schema.py
diff --git a/site_cubicweb.py b/cubicweb_skos/site_cubicweb.py
rename from site_cubicweb.py
rename to cubicweb_skos/site_cubicweb.py
diff --git a/sobjects.py b/cubicweb_skos/sobjects.py
rename from sobjects.py
rename to cubicweb_skos/sobjects.py
--- a/sobjects.py
+++ b/cubicweb_skos/sobjects.py
@@ -38,8 +38,13 @@ from cubicweb.predicates import match_kw
 from cubicweb.server import Service
 from cubicweb.server.sources import datafeed
 
-from cubes.skos import (LABELS_RDF_MAPPING, register_skos_rdf_input_mapping,
-                        rdfio, lcsv, to_unicode)
+from cubicweb_skos import (
+    LABELS_RDF_MAPPING,
+    lcsv,
+    rdfio,
+    register_skos_rdf_input_mapping,
+    to_unicode,
+)
 from .dataimport import store_skos_extentities
 
 
@@ -159,7 +164,7 @@ def rdf_extentities(stream_or_url, rdf_f
 
 def graph_extentities(graph):
     """Return external entities generator from a RDF graph implementation (i.e. instance
-    implementing :class:`cubes.skos.rdfio.AbstractRDFGraph`).
+    implementing :class:`cubicweb_skos.rdfio.AbstractRDFGraph`).
     """
     reg = rdfio.RDFRegistry()
     register_skos_rdf_input_mapping(reg)
diff --git a/views/__init__.py b/cubicweb_skos/views/__init__.py
rename from views/__init__.py
rename to cubicweb_skos/views/__init__.py
--- a/views/__init__.py
+++ b/cubicweb_skos/views/__init__.py
@@ -33,8 +33,14 @@ from cubicweb.web import (action, compon
 from cubicweb.web.views import (actions, autoform, editcontroller, formrenderers, uicfg,
                                 ibreadcrumbs, forms, tabs, cwsources, treeview, baseviews)
 
-from cubes.skos import to_unicode, lcsv
-from cubes.skos.entities import CSVIndentationError, CSVDecodeError
+from cubicweb_skos import (
+    lcsv,
+    to_unicode,
+)
+from cubicweb_skos.entities import (
+    CSVDecodeError,
+    CSVIndentationError,
+)
 
 
 # uicfg tweaks #################################################################
diff --git a/views/rdf.py b/cubicweb_skos/views/rdf.py
rename from views/rdf.py
rename to cubicweb_skos/views/rdf.py
--- a/views/rdf.py
+++ b/cubicweb_skos/views/rdf.py
@@ -20,7 +20,7 @@ from io import BytesIO
 from cubicweb.predicates import adaptable
 from cubicweb.view import EntityView
 
-from cubes.skos.rdfio import default_graph
+from cubicweb_skos.rdfio import default_graph
 
 
 class RDFPrimaryView(EntityView):
diff --git a/views/widgets.py b/cubicweb_skos/views/widgets.py
rename from views/widgets.py
rename to cubicweb_skos/views/widgets.py
diff --git a/debian/compat b/debian/compat
--- a/debian/compat
+++ b/debian/compat
@@ -1,1 +1,1 @@
-9
+7
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,18 @@ Section: web
 Priority: optional
 Maintainer: LOGILAB S.A. (Paris, FRANCE) <contact at logilab.fr>
 Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 7),
+ dh-python,
  python (>= 2.6.5),
-Standards-Version: 3.9.6
+ python-setuptools,
+Standards-Version: 3.9.3
 X-Python-Version: >= 2.6
 
 Package: cubicweb-skos
 Architecture: all
 Depends:
- cubicweb-common (>= 3.24.0),
+ python-cubicweb (>= 3.24.0),
+ python-six (>= 1.4.0),
  ${python:Depends},
  ${misc:Depends},
 Recommends:
@@ -22,5 +25,5 @@ Description: "SKOS implementation for cu
  .
  "SKOS implementation for cubicweb"
  .
- This package will install all the components you need to run the
- cubicweb-skos application (cube :)..
+ This package will install all the components you need to run an application
+ using the cubicweb-skos cube.
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,4 @@
 #!/usr/bin/make -f
 
-export NO_SETUPTOOLS=1
-
 %:
 	dh $@ --with python2
-
-override_dh_python2:
-	dh_python2 -i /usr/share/cubicweb
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
-# pylint: disable=W0403,W0404,W0613,W0622,W0622,R0904,C0103,E0611,wrong-import-order,wrong-import-position
+# pylint: disable=W0142,W0403,W0404,W0613,W0622,W0622,W0704,R0904,C0103,E0611
 #
 # copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact at logilab.fr
 #
-# This file is part of CubicWeb tag cube.
+# This file is part of a cubicweb-skos.
 #
 # CubicWeb is free software: you can redistribute it and/or modify it under the
 # terms of the GNU Lesser General Public License as published by the Free
@@ -16,186 +16,67 @@
 # FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
 # details.
 #
-# You should have received a copy of the GNU Lesser General Public License along
-# with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
-"""Generic Setup script, takes package info from __pkginfo__.py file
+# You should have received a copy of the GNU Lesser General Public License
+# along with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
+"""cubicweb_skos setup module using data from
+cubicweb_skos/__pkginfo__.py file
 """
-__docformat__ = "restructuredtext en"
-
-import os
-import sys
-import shutil
-from os.path import exists, join, walk
-
-try:
-    if os.environ.get('NO_SETUPTOOLS'):
-        raise ImportError() # do as there is no setuptools
-    from setuptools import setup
-    from setuptools.command import install_lib
-    USE_SETUPTOOLS = True
-except ImportError:
-    from distutils.core import setup
-    from distutils.command import install_lib
-    USE_SETUPTOOLS = False
-from distutils.command import install_data
 
-# import required features
-from __pkginfo__ import modname, version, license, description, web, \
-     author, author_email, classifiers
-
-if exists('README'):
-    long_description = file('README').read()
-else:
-    long_description = ''
+from os.path import join, dirname
 
-# import optional features
-import __pkginfo__
-if USE_SETUPTOOLS:
-    requires = {}
-    for entry in ("__depends__",): # "__recommends__"):
-        requires.update(getattr(__pkginfo__, entry, {}))
-    install_requires = [("%s %s" % (d, v and v or "")).strip()
-                        for d, v in requires.iteritems()]
-else:
-    install_requires = []
-
-distname = getattr(__pkginfo__, 'distname', modname)
-scripts = getattr(__pkginfo__, 'scripts', ())
-include_dirs = getattr(__pkginfo__, 'include_dirs', ())
-data_files = getattr(__pkginfo__, 'data_files', None)
-ext_modules = getattr(__pkginfo__, 'ext_modules', None)
-dependency_links = getattr(__pkginfo__, 'dependency_links', ())
-
-BASE_BLACKLIST = ('CVS', '.svn', '.hg', 'debian', 'dist', 'build')
-IGNORED_EXTENSIONS = ('.pyc', '.pyo', '.elc', '~')
+from setuptools import find_packages, setup
 
 
-def ensure_scripts(linux_scripts):
-    """
-    Creates the proper script names required for each platform
-    (taken from 4Suite)
-    """
-    from distutils import util
-    if util.get_platform()[:3] == 'win':
-        scripts_ = [script + '.bat' for script in linux_scripts]
-    else:
-        scripts_ = linux_scripts
-    return scripts_
+here = dirname(__file__)
+
+# load metadata from the __pkginfo__.py file so there is no risk of conflict
+# see https://packaging.python.org/en/latest/single_source_version.html
+pkginfo = join(here, 'cubicweb_skos', '__pkginfo__.py')
+__pkginfo__ = {}
+with open(pkginfo) as f:
+    exec(f.read(), __pkginfo__)
 
-def export(from_dir, to_dir,
-           blacklist=BASE_BLACKLIST,
-           ignore_ext=IGNORED_EXTENSIONS,
-           verbose=True):
-    """make a mirror of from_dir in to_dir, omitting directories and files
-    listed in the black list
-    """
-    def make_mirror(arg, directory, fnames):
-        """walk handler"""
-        for norecurs in blacklist:
-            try:
-                fnames.remove(norecurs)
-            except ValueError:
-                pass
-        for filename in fnames:
-            # don't include binary files
-            if filename[-4:] in ignore_ext:
-                continue
-            if filename[-1] == '~':
-                continue
-            src = join(directory, filename)
-            dest = to_dir + src[len(from_dir):]
-            if verbose:
-                sys.stderr.write('%s -> %s\n' % (src, dest))
-            if os.path.isdir(src):
-                if not exists(dest):
-                    os.mkdir(dest)
-            else:
-                if exists(dest):
-                    os.remove(dest)
-                shutil.copy2(src, dest)
-    try:
-        os.mkdir(to_dir)
-    except OSError as ex:
-        # file exists ?
-        import errno
-        if ex.errno != errno.EEXIST:
-            raise
-    walk(from_dir, make_mirror, None)
+# get required metadatas
+distname = __pkginfo__['distname']
+version = __pkginfo__['version']
+license = __pkginfo__['license']
+description = __pkginfo__['description']
+web = __pkginfo__['web']
+author = __pkginfo__['author']
+author_email = __pkginfo__['author_email']
+classifiers = __pkginfo__['classifiers']
+
+with open(join(here, 'README')) as f:
+    long_description = f.read()
+
+# get optional metadatas
+data_files = __pkginfo__.get('data_files', None)
+dependency_links = __pkginfo__.get('dependency_links', ())
+
+requires = {}
+for entry in ("__depends__",):  # "__recommends__"):
+    requires.update(__pkginfo__.get(entry, {}))
+install_requires = ["{0} {1}".format(d, v and v or "").strip()
+                    for d, v in requires.items()]
 
 
-class MyInstallLib(install_lib.install_lib):
-    """extend install_lib command to handle  package __init__.py and
-    include_dirs variable if necessary
-    """
-    def run(self):
-        """overridden from install_lib class"""
-        install_lib.install_lib.run(self)
-        # manually install included directories if any
-        if include_dirs:
-            base = modname
-            for directory in include_dirs:
-                dest = join(self.install_dir, base, directory)
-                export(directory, dest, verbose=False)
-
-# re-enable copying data files in sys.prefix
-old_install_data = install_data.install_data
-if USE_SETUPTOOLS:
-    # overwrite InstallData to use sys.prefix instead of the egg directory
-    class MyInstallData(old_install_data):
-        """A class that manages data files installation"""
-        def run(self):
-            _old_install_dir = self.install_dir
-            if self.install_dir.endswith('egg'):
-                self.install_dir = sys.prefix
-            old_install_data.run(self)
-            self.install_dir = _old_install_dir
-    try:
-        import setuptools.command.easy_install # only if easy_install available
-        # monkey patch: Crack SandboxViolation verification
-        from setuptools.sandbox import DirectorySandbox as DS
-        old_ok = DS._ok
-        def _ok(self, path):
-            """Return True if ``path`` can be written during installation."""
-            out = old_ok(self, path) # here for side effect from setuptools
-            realpath = os.path.normcase(os.path.realpath(path))
-            allowed_path = os.path.normcase(sys.prefix)
-            if realpath.startswith(allowed_path):
-                out = True
-            return out
-        DS._ok = _ok
-    except ImportError:
-        pass
-
-def install(**kwargs):
-    """setup entry point"""
-    if USE_SETUPTOOLS:
-        if '--force-manifest' in sys.argv:
-            sys.argv.remove('--force-manifest')
-    # install-layout option was introduced in 2.5.3-1~exp1
-    elif sys.version_info < (2, 5, 4) and '--install-layout=deb' in sys.argv:
-        sys.argv.remove('--install-layout=deb')
-    cmdclass = {'install_lib': MyInstallLib}
-    if USE_SETUPTOOLS:
-        kwargs['install_requires'] = install_requires
-        kwargs['dependency_links'] = dependency_links
-        kwargs['zip_safe'] = False
-        cmdclass['install_data'] = MyInstallData
-
-    return setup(name=distname,
-                 version=version,
-                 license=license,
-                 description=description,
-                 long_description=long_description,
-                 author=author,
-                 author_email=author_email,
-                 url=web,
-                 scripts=ensure_scripts(scripts),
-                 data_files=data_files,
-                 ext_modules=ext_modules,
-                 cmdclass=cmdclass,
-                 classifiers=classifiers,
-                 **kwargs
-                )
-
-if __name__ == '__main__':
-    install()
+setup(
+    name=distname,
+    version=version,
+    license=license,
+    description=description,
+    long_description=long_description,
+    author=author,
+    author_email=author_email,
+    url=web,
+    classifiers=classifiers,
+    packages=find_packages(exclude=['test']),
+    install_requires=install_requires,
+    include_package_data=True,
+    entry_points={
+        'cubicweb.cubes': [
+            'skos=cubicweb_skos',
+        ],
+    },
+    zip_safe=False,
+)
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.skos import ccplugin
+    from cubicweb_skos import ccplugin
 
 
 def setUpModule():
diff --git a/test/unittest_entities.py b/test/unittest_entities.py
--- a/test/unittest_entities.py
+++ b/test/unittest_entities.py
@@ -22,9 +22,17 @@ from logilab.common.testlib import requi
 
 from cubicweb.devtools import testlib
 
-from cubes.skos.entities import CSVIndentationError, CSVDecodeError
-from cubes.skos.rdfio import (TYPE_PREDICATE_URI, RDFLibRDFGraph, LibRDFRDFGraph,
-                              permanent_url, unicode_with_language as ul)
+from cubicweb_skos.entities import (
+    CSVDecodeError,
+    CSVIndentationError,
+)
+from cubicweb_skos.rdfio import (
+    LibRDFRDFGraph,
+    RDFLibRDFGraph,
+    TYPE_PREDICATE_URI,
+    permanent_url,
+    unicode_with_language as ul,
+)
 
 
 def get_narrower_concepts(concept):
diff --git a/test/unittest_lcsv.py b/test/unittest_lcsv.py
--- a/test/unittest_lcsv.py
+++ b/test/unittest_lcsv.py
@@ -19,8 +19,8 @@ from logilab.common.testlib import TestC
 
 import cubicweb.devtools  # noqa set $PYTHONPATH
 
-from cubes.skos import lcsv
-from cubes.skos.rdfio import unicode_with_language as ul
+from cubicweb_skos import lcsv
+from cubicweb_skos.rdfio import unicode_with_language as ul
 
 
 class LCSV2RDFTC(TestCase):
diff --git a/test/unittest_rdfio.py b/test/unittest_rdfio.py
--- a/test/unittest_rdfio.py
+++ b/test/unittest_rdfio.py
@@ -22,8 +22,8 @@ from logilab.common.testlib import TestC
 
 from cubicweb.devtools import testlib
 
-from cubes.skos import rdfio
-from cubes.skos.rdfio import unicode_with_language as ul
+from cubicweb_skos import rdfio
+from cubicweb_skos.rdfio import unicode_with_language as ul
 
 
 def skos(name):
diff --git a/test/unittest_sobjects.py b/test/unittest_sobjects.py
--- a/test/unittest_sobjects.py
+++ b/test/unittest_sobjects.py
@@ -20,7 +20,7 @@ from contextlib import contextmanager
 
 from cubicweb.devtools import testlib
 
-from cubes.skos.dataimport import dump_relations
+from cubicweb_skos.dataimport import dump_relations
 
 
 @contextmanager
diff --git a/test/unittest_views.py b/test/unittest_views.py
--- a/test/unittest_views.py
+++ b/test/unittest_views.py
@@ -22,7 +22,7 @@ from tempfile import NamedTemporaryFile
 from cubicweb.web import Redirect
 from cubicweb.devtools import testlib
 
-from cubes.skos.rdfio import default_graph
+from cubicweb_skos.rdfio import default_graph
 
 
 class ViewsTC(testlib.CubicWebTC):
diff --git a/tox.ini b/tox.ini
--- a/tox.ini
+++ b/tox.ini
@@ -37,7 +37,7 @@ commands =
 
 [flake8]
 max-line-length = 100
-exclude = migration,__pkginfo__.py,setup.py,.tox
+exclude = cubicweb_skos/migration,.tox
 ignore = E731,W503
 
 [pytest]



More information about the saem-devel mailing list