[PATCH 01 of 52 Narval cube] [new style] convert cube to new style

Nsukami Patrick ptrck at nskm.xyz
Wed Apr 1 11:34:01 CEST 2020


# HG changeset patch
# User Nsukami Patrick <ptrck at nskm dot xyz>
# Date 1585405251 0
#      Sat Mar 28 14:20:51 2020 +0000
# Node ID b8fd17bf3a732aa9e094b9c9763f43d4d151d3d3
# Parent  0254dc66153806284007f4b0e5d1590db35a9c07
[new style] convert cube to new style

- move files to cube folder
- update setup.py & MANIFEST.in
- add basic tox.ini file

diff --git a/MANIFEST.in b/MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,8 +1,12 @@
+include README
 include *.py
 include */*.py
-include narvalbot/share/README
-include examples/*.ini
-recursive-include data *.gif *.png *.css *.ico *.js
-recursive-include i18n *.pot *.po
-recursive-include schema *.sql
-recursive-include wdoc *
+recursive-include cubicweb_narval/narvalbot/share/README
+recursive-include cubicweb_narval *.py
+recursive-include cubicweb_narval/data *.gif *.png *.ico *.css *.js
+recursive-include cubicweb_narval/i18n *.po
+recursive-include cubicweb_narval/wdoc *
+recursive-include test/data bootstrap_cubes *.py
+include *.ini
+prune debian
+prune cubicweb-narval.spec
diff --git a/__init__.py b/cubicweb_narval/__init__.py
rename from __init__.py
rename to cubicweb_narval/__init__.py
diff --git a/__pkginfo__.py b/cubicweb_narval/__pkginfo__.py
rename from __pkginfo__.py
rename to cubicweb_narval/__pkginfo__.py
--- a/__pkginfo__.py
+++ b/cubicweb_narval/__pkginfo__.py
@@ -1,56 +1,26 @@
-# pylint: disable-msg=W0622
+# pylint: disable=W0622
 """cubicweb-narval application packaging information"""
 
-modname = 'narval'
+
+modname = 'cubicweb_narval'
 distname = 'cubicweb-narval'
 
 numversion = (4, 2, 3)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LGPL'
-description = 'the Narval agent'
-web = 'http://www.cubicweb.org/project/cubicweb-narval'
 author = 'LOGILAB S.A. (Paris, FRANCE)'
 author_email = 'contact at logilab.fr'
+description = 'the Narval agent'
+web = 'http://www.cubicweb.org/project/%s' % distname
 
-__depends__ =  {'cubicweb': '>= 3.18.0',
-                'cubicweb-localperms': None,
-                'cubicweb-file': '>= 1.14',
-                'cubicweb-signedrequest': None,
-                'Pygments': None,
-                'requests': '>= 2.0.0',
-               }
+__depends__ = {'cubicweb': '>= 3.26.0', 'cubicweb-localperms': None, 'cubicweb-file': '>= 1.14', 'cubicweb-signedrequest': None, 'Pygments': None, 'requests': '>= 2.0.0'}
 __recommends__ = {}
 
 classifiers = [
     'Environment :: Web Environment',
     'Framework :: CubicWeb',
-    'Programming Language :: Python',
-    ]
-
-from os import listdir as _listdir
-from os.path import join, isdir, exists
-from glob import glob
-
-THIS_CUBE_DIR = join('share', 'cubicweb', 'cubes', modname)
-NARVAL_DIR = join('share', modname)
+    'Programming Language :: Python :: 3',
+    'Programming Language :: JavaScript',
+]
 
-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']],
-    [NARVAL_DIR, ['narvalbot/share/README',]],
-    ]
-# 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
-
-scripts = (join('bin', 'narval'),)
diff --git a/data/cubes.narval.css b/cubicweb_narval/data/cubes.narval.css
rename from data/cubes.narval.css
rename to cubicweb_narval/data/cubes.narval.css
diff --git a/data/cubes.narval.js b/cubicweb_narval/data/cubes.narval.js
rename from data/cubes.narval.js
rename to cubicweb_narval/data/cubes.narval.js
diff --git a/entities.py b/cubicweb_narval/entities.py
rename from entities.py
rename to cubicweb_narval/entities.py
diff --git a/examples/narval-cw-sources.ini b/cubicweb_narval/examples/narval-cw-sources.ini
rename from examples/narval-cw-sources.ini
rename to cubicweb_narval/examples/narval-cw-sources.ini
diff --git a/examples/narval.ini b/cubicweb_narval/examples/narval.ini
rename from examples/narval.ini
rename to cubicweb_narval/examples/narval.ini
diff --git a/hooks.py b/cubicweb_narval/hooks.py
rename from hooks.py
rename to cubicweb_narval/hooks.py
diff --git a/i18n/en.po b/cubicweb_narval/i18n/en.po
rename from i18n/en.po
rename to cubicweb_narval/i18n/en.po
diff --git a/i18n/fr.po b/cubicweb_narval/i18n/fr.po
rename from i18n/fr.po
rename to cubicweb_narval/i18n/fr.po
diff --git a/logformat.py b/cubicweb_narval/logformat.py
rename from logformat.py
rename to cubicweb_narval/logformat.py
diff --git a/migration/3.0.0_Any.py b/cubicweb_narval/migration/3.0.0_Any.py
rename from migration/3.0.0_Any.py
rename to cubicweb_narval/migration/3.0.0_Any.py
diff --git a/migration/3.2.1_Any.py b/cubicweb_narval/migration/3.2.1_Any.py
rename from migration/3.2.1_Any.py
rename to cubicweb_narval/migration/3.2.1_Any.py
diff --git a/migration/4.0.0_Any.py b/cubicweb_narval/migration/4.0.0_Any.py
rename from migration/4.0.0_Any.py
rename to cubicweb_narval/migration/4.0.0_Any.py
diff --git a/migration/4.2.1_Any.py b/cubicweb_narval/migration/4.2.1_Any.py
rename from migration/4.2.1_Any.py
rename to cubicweb_narval/migration/4.2.1_Any.py
diff --git a/migration/postcreate.py b/cubicweb_narval/migration/postcreate.py
rename from migration/postcreate.py
rename to cubicweb_narval/migration/postcreate.py
diff --git a/migration/precreate.py b/cubicweb_narval/migration/precreate.py
rename from migration/precreate.py
rename to cubicweb_narval/migration/precreate.py
diff --git a/narvalbot/__init__.py b/cubicweb_narval/narvalbot/__init__.py
rename from narvalbot/__init__.py
rename to cubicweb_narval/narvalbot/__init__.py
diff --git a/narvalbot/__pkginfo__.py b/cubicweb_narval/narvalbot/__pkginfo__.py
rename from narvalbot/__pkginfo__.py
rename to cubicweb_narval/narvalbot/__pkginfo__.py
diff --git a/narvalbot/engine.py b/cubicweb_narval/narvalbot/engine.py
rename from narvalbot/engine.py
rename to cubicweb_narval/narvalbot/engine.py
diff --git a/narvalbot/main.py b/cubicweb_narval/narvalbot/main.py
rename from narvalbot/main.py
rename to cubicweb_narval/narvalbot/main.py
diff --git a/narvalbot/server.py b/cubicweb_narval/narvalbot/server.py
rename from narvalbot/server.py
rename to cubicweb_narval/narvalbot/server.py
diff --git a/narvalbot/share/README b/cubicweb_narval/narvalbot/share/README
rename from narvalbot/share/README
rename to cubicweb_narval/narvalbot/share/README
diff --git a/schema.py b/cubicweb_narval/schema.py
rename from schema.py
rename to cubicweb_narval/schema.py
diff --git a/schema/_regproc.postgres.sql b/cubicweb_narval/schema/_regproc.postgres.sql
rename from schema/_regproc.postgres.sql
rename to cubicweb_narval/schema/_regproc.postgres.sql
diff --git a/site_cubicweb.py b/cubicweb_narval/site_cubicweb.py
rename from site_cubicweb.py
rename to cubicweb_narval/site_cubicweb.py
diff --git a/views/__init__.py b/cubicweb_narval/views/__init__.py
rename from views/__init__.py
rename to cubicweb_narval/views/__init__.py
diff --git a/views/bot.py b/cubicweb_narval/views/bot.py
rename from views/bot.py
rename to cubicweb_narval/views/bot.py
diff --git a/views/plan.py b/cubicweb_narval/views/plan.py
rename from views/plan.py
rename to cubicweb_narval/views/plan.py
diff --git a/views/recipe.py b/cubicweb_narval/views/recipe.py
rename from views/recipe.py
rename to cubicweb_narval/views/recipe.py
diff --git a/views/startplan.py b/cubicweb_narval/views/startplan.py
rename from views/startplan.py
rename to cubicweb_narval/views/startplan.py
diff --git a/views/startup.py b/cubicweb_narval/views/startup.py
rename from views/startup.py
rename to cubicweb_narval/views/startup.py
diff --git a/wdoc/narval_architecture_en.rst b/cubicweb_narval/wdoc/narval_architecture_en.rst
rename from wdoc/narval_architecture_en.rst
rename to cubicweb_narval/wdoc/narval_architecture_en.rst
diff --git a/wdoc/narval_quick_start_en.rst b/cubicweb_narval/wdoc/narval_quick_start_en.rst
rename from wdoc/narval_quick_start_en.rst
rename to cubicweb_narval/wdoc/narval_quick_start_en.rst
diff --git a/wdoc/toc.xml b/cubicweb_narval/wdoc/toc.xml
rename from wdoc/toc.xml
rename to cubicweb_narval/wdoc/toc.xml
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1,173 +1,82 @@
 #!/usr/bin/env python
-# pylint: disable-msg=W0404,W0622,W0704,W0613,W0152
-# copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# pylint: disable=W0142,W0403,W0404,W0613,W0622,W0622,W0704,R0904,C0103,E0611
+#
+# copyright 2003-2016 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact at logilab.fr
-
-__docformat__ = "restructuredtext en"
+#
+# This file is part of a cubicweb-narval.
+#
+# 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
+# Software Foundation, either version 2.1 of the License, or (at your option)
+# any later version.
+#
+# CubicWeb is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# 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/>.
+"""cubicweb_narval setup module using data from
+cubicweb_narval/__pkginfo__.py file
+"""
 
-import os
-import sys
-import shutil
-from os.path import isdir, exists, join, walk, dirname
+from os.path import join, dirname
 
-try:
-    if os.environ.get('NO_SETUPTOOLS'):
-        raise ImportError()
-    from setuptools import setup
-    from setuptools.command import install_lib
-    USE_SETUPTOOLS = 1
-except ImportError:
-    from distutils.core import setup
-    from distutils.command import install_lib
-    USE_SETUPTOOLS = 0
+from setuptools import find_packages, setup
+
+
+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
-base_dir = dirname(__file__)
+pkginfo = join(here, 'cubicweb_narval', '__pkginfo__.py')
+__pkginfo__ = {}
+with open(pkginfo) as f:
+    exec(f.read(), __pkginfo__)
 
-pkginfo = {}
-with open(join(base_dir, "__pkginfo__.py")) as f:
-    exec(f.read(), pkginfo)
 # get required metadatas
-modname = pkginfo['modname']
-version = pkginfo['version']
-license = pkginfo['license']
-description = pkginfo['description']
-web = pkginfo['web']
-author = pkginfo['author']
-author_email = pkginfo['author_email']
-classifiers = pkginfo['classifiers']
+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(base_dir, 'README')) as f:
+with open(join(here, 'README')) as f:
     long_description = f.read()
 
 # get optional metadatas
-distname = pkginfo.get('distname', modname)
-scripts = pkginfo.get('scripts', ())
-include_dirs = pkginfo.get('include_dirs', ())
-data_files = pkginfo.get('data_files', None)
-ext_modules = pkginfo.get('ext_modules', None)
-dependency_links = pkginfo.get('dependency_links', ())
-
-if USE_SETUPTOOLS:
-    requires = {}
-    for entry in ("__depends__",): # "__recommends__"):
-        requires.update(pkginfo.get(entry, {}))
-    install_requires = [("%s %s" % (d, v and v or "")).strip()
-                       for d, v in requires.iteritems()]
-else:
-    install_requires = []
-
-BASE_BLACKLIST = ('CVS', '.svn', '.hg', '.git', 'debian', 'dist', 'build')
-IGNORED_EXTENSIONS = ('.pyc', '.pyo', '.elc', '~')
+data_files = __pkginfo__.get('data_files', None)
+dependency_links = __pkginfo__.get('dependency_links', ())
 
-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_
+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()]
 
-def get_packages(directory, prefix):
-    """return a list of subpackages for the given directory"""
-    result = []
-    for package in os.listdir(directory):
-        absfile = join(directory, package)
-        if isdir(absfile):
-            if exists(join(absfile, '__init__.py')) or \
-                   package in ('test', 'tests'):
-                if prefix:
-                    result.append('%s.%s' % (prefix, package))
-                else:
-                    result.append(package)
-                result += get_packages(absfile, result[-1])
-    return result
 
-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:
-                print >> sys.stderr, 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, ex:
-        # file exists ?
-        import errno
-        if ex.errno != errno.EEXIST:
-            raise
-    walk(from_dir, make_mirror, None)
-
-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)
-
-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')
-    if USE_SETUPTOOLS and install_requires:
-        kwargs['install_requires'] = install_requires
-        kwargs['dependency_links'] = dependency_links
-    kwargs['packages'] = ('narvalbot',)
-    #kwargs['package_dir'] = {'narvalbot' : 'narvalbot',}
-    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 = {'install_lib': MyInstallLib},
-                 **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': [
+            'narval=cubicweb_narval',
+        ],
+    },
+    zip_safe=False,
+)
diff --git a/tox.ini b/tox.ini
new file mode 100644
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,25 @@
+[tox]
+envlist = py3,flake8,check-manifest
+
+[testenv]
+deps =
+  pytest
+commands =
+  {envpython} -m pytest {posargs:test}
+
+[testenv:flake8]
+basepython = python3
+skip_install = true
+deps =
+  flake8
+commands = flake8
+
+[testenv:check-manifest]
+skip_install = true
+deps =
+  check-manifest
+commands =
+  {envpython} -m check_manifest {toxinidir}
+
+[flake8]
+exclude = cubicweb_narval/migration/*,test/data/*,.tox/*




More information about the cubicweb-devel mailing list