[Pkg-debile-commits] [debile-slave] 01/03: Big renaming from ethel to debile-slave
Léo Cavaillé
leo.cavaille-guest at alioth.debian.org
Thu Aug 22 22:21:11 UTC 2013
This is an automated email from the git hooks/post-receive script.
leo.cavaille-guest pushed a commit to branch master
in repository debile-slave.
commit 1e37b26ec720f3412b484ca4d3ce66cd6add13f1
Author: Léo Cavaillé <leo at cavaille.net>
Date: Thu Aug 22 20:54:40 2013 +0200
Big renaming from ethel to debile-slave
---
bin/create-schroot-file | 6 ++---
{ethel/runners => debile}/__init__.py | 0
debile/slave/__init__.py | 4 ++++
{ethel => debile/slave}/cli.py | 2 +-
{ethel => debile/slave}/client.py | 4 ++--
debile/slave/commands/__init__.py | 25 ++++++++++++++++++++
{ethel => debile/slave}/commands/adequate.py | 4 ++--
{ethel => debile/slave}/commands/build.py | 4 ++--
{ethel => debile/slave}/commands/clanganalyzer.py | 4 ++--
{ethel => debile/slave}/commands/coccinelle.py | 2 +-
{ethel => debile/slave}/commands/cppcheck.py | 2 +-
.../slave}/commands/desktop_file_validate.py | 4 ++--
{ethel => debile/slave}/commands/lintian.py | 2 +-
{ethel => debile/slave}/commands/lintian4py.py | 2 +-
{ethel => debile/slave}/commands/pep8.py | 2 +-
{ethel => debile/slave}/commands/perlcritic.py | 2 +-
{ethel => debile/slave}/commands/piuparts.py | 4 ++--
{ethel => debile/slave}/config.py | 2 +-
{ethel => debile/slave}/daemon.py | 18 +++++++-------
{ethel => debile/slave}/error.py | 0
.../wrappers => debile/slave/runners}/__init__.py | 0
{ethel => debile/slave}/runners/adequate.py | 2 +-
{ethel => debile/slave}/runners/clanganalyzer.py | 4 ++--
{ethel => debile/slave}/runners/coccinelle.py | 6 ++---
{ethel => debile/slave}/runners/cppcheck.py | 4 ++--
.../slave}/runners/desktop_file_validate.py | 4 ++--
{ethel => debile/slave}/runners/lintian.py | 4 ++--
{ethel => debile/slave}/runners/pep8.py | 4 ++--
{ethel => debile/slave}/runners/perlcritic.py | 4 ++--
{ethel => debile/slave}/runners/piuparts.py | 4 ++--
{ethel => debile/slave}/runners/sbuild.py | 2 +-
{ethel => debile/slave}/utils.py | 4 ++--
.../runners => debile/slave/wrappers}/__init__.py | 0
{ethel => debile/slave}/wrappers/adequate.py | 0
{ethel => debile/slave}/wrappers/clanganalyzer.py | 0
{ethel => debile/slave}/wrappers/coccinelle.py | 0
{ethel => debile/slave}/wrappers/cppcheck.py | 0
.../slave}/wrappers/desktop_file_validate.py | 0
{ethel => debile/slave}/wrappers/lintian.py | 0
{ethel => debile/slave}/wrappers/pep8.py | 0
{ethel => debile/slave}/wrappers/perlcritic.py | 0
{ethel => debile/slave}/wrappers/piuparts.py | 0
ethel/__init__.py | 4 ----
ethel/commands/__init__.py | 25 --------------------
setup.py | 13 ++++------
skel/{ethel.ini => debile-slave.ini} | 2 +-
tests/wrappers/test_adequate.py | 2 +-
tests/wrappers/test_cppcheck.py | 2 +-
tests/wrappers/test_desktop_file_validate.py | 2 +-
tests/wrappers/test_lintian.py | 2 +-
tests/wrappers/test_pep8.py | 2 +-
tests/wrappers/test_perlcritic.py | 2 +-
tests/wrappers/test_piuparts.py | 2 +-
53 files changed, 95 insertions(+), 98 deletions(-)
diff --git a/bin/create-schroot-file b/bin/create-schroot-file
index a554c72..9349d95 100755
--- a/bin/create-schroot-file
+++ b/bin/create-schroot-file
@@ -1,7 +1,7 @@
#!/bin/bash
-# This script is part of ethel.
+# This script is part of debile-slave
# It creates a chroot for the given debian suite using debootstrap, the chroot
-# is enclosed in a tarball and the according schroot configuration for ethel
+# is enclosed in a tarball and the according schroot configuration for debile
# is given.
#
# Usage : create-schroot-file [suite]
@@ -19,7 +19,7 @@ MIRROR=http://debian.lcs.mit.edu/debian/
# TODO : we want either to take a known mirror (from sources.list)
# or add an option to do so
# FIXME : verify that the $OUTPUT exists, or create it here/in the package
-OUTPUT="/var/lib/ethel/chroots"
+OUTPUT="/var/lib/debile/chroots"
VARIANT="buildd"
TARBALL="${OUTPUT}/${SUITE}.tar.gz"
diff --git a/ethel/runners/__init__.py b/debile/__init__.py
similarity index 100%
copy from ethel/runners/__init__.py
copy to debile/__init__.py
diff --git a/debile/slave/__init__.py b/debile/slave/__init__.py
new file mode 100644
index 0000000..5171b00
--- /dev/null
+++ b/debile/slave/__init__.py
@@ -0,0 +1,4 @@
+
+
+__appname__ = "debile.slave"
+__version__ = "0.0.1"
diff --git a/ethel/cli.py b/debile/slave/cli.py
similarity index 89%
rename from ethel/cli.py
rename to debile/slave/cli.py
index 2e87bd2..efe1b95 100644
--- a/ethel/cli.py
+++ b/debile/slave/cli.py
@@ -1,5 +1,5 @@
import clint
-from ethel.client import get_proxy
+from debile.slave.client import get_proxy
proxy = get_proxy()
diff --git a/ethel/client.py b/debile/slave/client.py
similarity index 91%
rename from ethel/client.py
rename to debile/slave/client.py
index 4a61c18..52bd984 100644
--- a/ethel/client.py
+++ b/debile/slave/client.py
@@ -1,5 +1,5 @@
-from ethel.utils import tdir, cd, dget, upload, run_command
-from ethel.config import Config
+from debile.slave.utils import tdir, cd, dget, upload, run_command
+from debile.slave.config import Config
from contextlib import contextmanager
import xmlrpclib
diff --git a/debile/slave/commands/__init__.py b/debile/slave/commands/__init__.py
new file mode 100644
index 0000000..9d8751b
--- /dev/null
+++ b/debile/slave/commands/__init__.py
@@ -0,0 +1,25 @@
+import importlib
+
+
+PLUGINS = {
+ "build": "debile.slave.commands.build",
+ "clanganalyzer": "debile.slave.commands.clanganalyzer",
+
+ "pep8": "debile.slave.commands.pep8",
+ "perlcritic": "debile.slave.commands.perlcritic",
+ "cppcheck": "debile.slave.commands.cppcheck",
+ "coccinelle": "debile.slave.commands.coccinelle",
+
+ "lintian": "debile.slave.commands.lintian",
+ "lintian4py": "debile.slave.commands.lintian4py",
+
+ "adequate": "debile.slave.commands.adequate",
+ "piuparts": "debile.slave.commands.piuparts",
+ "desktop-file-validate": "debile.slave.commands.desktop_file_validate",
+}
+
+
+def load_module(what):
+ path = PLUGINS[what]
+ mod = importlib.import_module(path)
+ return (mod.run, mod.get_version)
diff --git a/ethel/commands/adequate.py b/debile/slave/commands/adequate.py
similarity index 83%
rename from ethel/commands/adequate.py
rename to debile/slave/commands/adequate.py
index 2d52deb..8345baf 100644
--- a/ethel/commands/adequate.py
+++ b/debile/slave/commands/adequate.py
@@ -1,5 +1,5 @@
-from ethel.runners.adequate import adequate, version
-from ethel.config import Config
+from debile.slave.runners.adequate import adequate, version
+from debile.slave.config import Config
# For binaries only
diff --git a/ethel/commands/build.py b/debile/slave/commands/build.py
similarity index 87%
rename from ethel/commands/build.py
rename to debile/slave/commands/build.py
index f3418c2..147390f 100644
--- a/ethel/commands/build.py
+++ b/debile/slave/commands/build.py
@@ -1,5 +1,5 @@
-from ethel.runners.sbuild import sbuild, version
-from ethel.utils import upload
+from debile.slave.runners.sbuild import sbuild, version
+from debile.slave.utils import upload
import glob
import os
diff --git a/ethel/commands/clanganalyzer.py b/debile/slave/commands/clanganalyzer.py
similarity index 73%
rename from ethel/commands/clanganalyzer.py
rename to debile/slave/commands/clanganalyzer.py
index 9d49a1e..fcd006a 100644
--- a/ethel/commands/clanganalyzer.py
+++ b/debile/slave/commands/clanganalyzer.py
@@ -1,5 +1,5 @@
-from ethel.runners.clanganalyzer import clanganalyzer, version
-from ethel.config import Config
+from debile.slave.runners.clanganalyzer import clanganalyzer, version
+from debile.slave.config import Config
# target package firehose
diff --git a/ethel/commands/coccinelle.py b/debile/slave/commands/coccinelle.py
similarity index 64%
rename from ethel/commands/coccinelle.py
rename to debile/slave/commands/coccinelle.py
index b3e2418..2f5f5e2 100644
--- a/ethel/commands/coccinelle.py
+++ b/debile/slave/commands/coccinelle.py
@@ -1,4 +1,4 @@
-from ethel.runners.coccinelle import coccinelle, version
+from debile.slave.runners.coccinelle import coccinelle, version
def run(dsc, package, job, firehose):
return coccinelle(dsc, firehose)
diff --git a/ethel/commands/cppcheck.py b/debile/slave/commands/cppcheck.py
similarity index 65%
rename from ethel/commands/cppcheck.py
rename to debile/slave/commands/cppcheck.py
index 1680c36..8dae042 100644
--- a/ethel/commands/cppcheck.py
+++ b/debile/slave/commands/cppcheck.py
@@ -1,4 +1,4 @@
-from ethel.runners.cppcheck import cppcheck, version
+from debile.slave.runners.cppcheck import cppcheck, version
def run(dsc, package, job, firehose):
return cppcheck(dsc, firehose)
diff --git a/ethel/commands/desktop_file_validate.py b/debile/slave/commands/desktop_file_validate.py
similarity index 61%
rename from ethel/commands/desktop_file_validate.py
rename to debile/slave/commands/desktop_file_validate.py
index 06a2361..a13fe51 100644
--- a/ethel/commands/desktop_file_validate.py
+++ b/debile/slave/commands/desktop_file_validate.py
@@ -1,5 +1,5 @@
-from ethel.runners.desktop_file_validate import desktop_file_validate, version
-from ethel.utils import run_command, cd
+from debile.slave.runners.desktop_file_validate import desktop_file_validate, version
+from debile.slave.utils import run_command, cd
def run(dsc, source, job, firehose):
diff --git a/ethel/commands/lintian.py b/debile/slave/commands/lintian.py
similarity index 78%
rename from ethel/commands/lintian.py
rename to debile/slave/commands/lintian.py
index f29375b..62dea96 100644
--- a/ethel/commands/lintian.py
+++ b/debile/slave/commands/lintian.py
@@ -1,4 +1,4 @@
-from ethel.runners.lintian import lintian, version
+from debile.slave.runners.lintian import lintian, version
# Can take either a .dsc or a .deb as target
def run(target, package, job, firehose):
diff --git a/ethel/commands/lintian4py.py b/debile/slave/commands/lintian4py.py
similarity index 80%
rename from ethel/commands/lintian4py.py
rename to debile/slave/commands/lintian4py.py
index 2166a64..276615c 100644
--- a/ethel/commands/lintian4py.py
+++ b/debile/slave/commands/lintian4py.py
@@ -1,4 +1,4 @@
-from ethel.runners.lintian import lintian, version
+from debile.slave.runners.lintian import lintian, version
def run(dfiles, package, job, firehose):
diff --git a/ethel/commands/pep8.py b/debile/slave/commands/pep8.py
similarity index 68%
rename from ethel/commands/pep8.py
rename to debile/slave/commands/pep8.py
index f05d546..36bbc5f 100644
--- a/ethel/commands/pep8.py
+++ b/debile/slave/commands/pep8.py
@@ -1,4 +1,4 @@
-from ethel.runners.pep8 import pep8, version
+from debile.slave.runners.pep8 import pep8, version
def run(dsc, package, job, firehose):
diff --git a/ethel/commands/perlcritic.py b/debile/slave/commands/perlcritic.py
similarity index 64%
rename from ethel/commands/perlcritic.py
rename to debile/slave/commands/perlcritic.py
index 6ae7ebc..986ca7a 100644
--- a/ethel/commands/perlcritic.py
+++ b/debile/slave/commands/perlcritic.py
@@ -1,4 +1,4 @@
-from ethel.runners.perlcritic import perlcritic, version
+from debile.slave.runners.perlcritic import perlcritic, version
def run(dsc, package, job, firehose):
diff --git a/ethel/commands/piuparts.py b/debile/slave/commands/piuparts.py
similarity index 81%
rename from ethel/commands/piuparts.py
rename to debile/slave/commands/piuparts.py
index d65a955..15f298f 100644
--- a/ethel/commands/piuparts.py
+++ b/debile/slave/commands/piuparts.py
@@ -1,5 +1,5 @@
-from ethel.runners.piuparts import piuparts, version
-from ethel.config import Config
+from debile.slave.runners.piuparts import piuparts, version
+from debile.slave.config import Config
def run(target, package, job, firehose):
diff --git a/ethel/config.py b/debile/slave/config.py
similarity index 88%
rename from ethel/config.py
rename to debile/slave/config.py
index 2885080..62ffa19 100644
--- a/ethel/config.py
+++ b/debile/slave/config.py
@@ -8,7 +8,7 @@ class Config(ConfigParser.ConfigParser):
cls._instance = super(Config, cls).__new__(cls, *args, **kwargs)
return cls._instance
- def __init__(self, location="/etc/ethel.ini"):
+ def __init__(self, location="/etc/debile-master.ini"):
ConfigParser.ConfigParser.__init__(self)
self.read(location)
diff --git a/ethel/daemon.py b/debile/slave/daemon.py
similarity index 93%
rename from ethel/daemon.py
rename to debile/slave/daemon.py
index da3f89d..b3cabda 100644
--- a/ethel/daemon.py
+++ b/debile/slave/daemon.py
@@ -1,11 +1,11 @@
from firehose.model import (Analysis, Generator, Metadata,
DebianBinary, DebianSource)
-from ethel.commands import PLUGINS, load_module
-from ethel.client import get_proxy, checkout
+from debile.slave.commands import PLUGINS, load_module
+from debile.slave.client import get_proxy, checkout
from contextlib import contextmanager
-from ethel.utils import tdir, cd, run_command
-from ethel.config import Config
+from debile.slave.utils import tdir, cd, run_command
+from debile.slave.config import Config
import logging
import time
@@ -71,7 +71,7 @@ def create_firehose(package, version_getter):
}[package['type']](package)
gname_, gversion = version_getter()
- gname = "ethel/%s" % gname_
+ gname = "debile/%s" % gname_
return Analysis(metadata=Metadata(
generator=Generator(name=gname, version=gversion),
@@ -132,8 +132,8 @@ def iterate():
logging.info("Sending the logs to the pool")
remote_log_path = proxy.get_write_location(job['uuid'])
remote_log_path = os.path.join(remote_log_path, 'log.txt')
- open('ethel-log', 'wb').write(log.encode('utf-8'))
- cmd = config.get('lucy', 'copy').format(src='ethel-log',
+ open('job-log', 'wb').write(log.encode('utf-8'))
+ cmd = config.get('lucy', 'copy').format(src='job-log',
dest=remote_log_path)
out, err, ret = run_command(cmd)
if ret != 0:
@@ -142,8 +142,8 @@ def iterate():
def main():
- logging.basicConfig(format='%(asctime)s - %(levelname)8s - [ethel] %(message)s', level=logging.DEBUG)
- logging.info("Booting ethel daemon")
+ logging.basicConfig(format='%(asctime)s - %(levelname)8s - [debile-slave] %(message)s', level=logging.DEBUG)
+ logging.info("Booting debile-slave daemon")
while True:
logging.debug("Checking for new jobs")
try:
diff --git a/ethel/error.py b/debile/slave/error.py
similarity index 100%
rename from ethel/error.py
rename to debile/slave/error.py
diff --git a/ethel/wrappers/__init__.py b/debile/slave/runners/__init__.py
similarity index 100%
rename from ethel/wrappers/__init__.py
rename to debile/slave/runners/__init__.py
diff --git a/ethel/runners/adequate.py b/debile/slave/runners/adequate.py
similarity index 93%
rename from ethel/runners/adequate.py
rename to debile/slave/runners/adequate.py
index 0ae35a9..ce760d8 100644
--- a/ethel/runners/adequate.py
+++ b/debile/slave/runners/adequate.py
@@ -1,4 +1,4 @@
-from ethel.wrappers.adequate import parse_adequate
+from debile.slave.wrappers.adequate import parse_adequate
from firehose.model import Issue, Message, File, Location
from schroot import schroot
diff --git a/ethel/runners/clanganalyzer.py b/debile/slave/runners/clanganalyzer.py
similarity index 96%
rename from ethel/runners/clanganalyzer.py
rename to debile/slave/runners/clanganalyzer.py
index 1d9d3dd..b381576 100644
--- a/ethel/runners/clanganalyzer.py
+++ b/debile/slave/runners/clanganalyzer.py
@@ -1,5 +1,5 @@
-from ethel.utils import run_command
-from ethel.wrappers.clanganalyzer import parse_scandir
+from debile.slave.utils import run_command
+from debile.slave.wrappers.clanganalyzer import parse_scandir
from schroot import schroot
import os
diff --git a/ethel/runners/coccinelle.py b/debile/slave/runners/coccinelle.py
similarity index 90%
rename from ethel/runners/coccinelle.py
rename to debile/slave/runners/coccinelle.py
index 83efb41..a547871 100644
--- a/ethel/runners/coccinelle.py
+++ b/debile/slave/runners/coccinelle.py
@@ -1,6 +1,6 @@
-from ethel.wrappers.coccinelle import parse_coccinelle
-from ethel.utils import run_command, cd
-from ethel.config import Config
+from debile.slave.wrappers.coccinelle import parse_coccinelle
+from debile.slave.utils import run_command, cd
+from debile.slave.config import Config
import os
import glob
diff --git a/ethel/runners/cppcheck.py b/debile/slave/runners/cppcheck.py
similarity index 88%
rename from ethel/runners/cppcheck.py
rename to debile/slave/runners/cppcheck.py
index f11e918..f71a606 100644
--- a/ethel/runners/cppcheck.py
+++ b/debile/slave/runners/cppcheck.py
@@ -1,5 +1,5 @@
-from ethel.wrappers.cppcheck import parse_cppcheck
-from ethel.utils import run_command, cd
+from debile.slave.wrappers.cppcheck import parse_cppcheck
+from debile.slave.utils import run_command, cd
import os
diff --git a/ethel/runners/desktop_file_validate.py b/debile/slave/runners/desktop_file_validate.py
similarity index 81%
rename from ethel/runners/desktop_file_validate.py
rename to debile/slave/runners/desktop_file_validate.py
index de27393..bd0589f 100644
--- a/ethel/runners/desktop_file_validate.py
+++ b/debile/slave/runners/desktop_file_validate.py
@@ -1,5 +1,5 @@
-from ethel.wrappers.desktop_file_validate import parse_desktop_file_validate
-from ethel.utils import run_command
+from debile.slave.wrappers.desktop_file_validate import parse_desktop_file_validate
+from debile.slave.utils import run_command
import os
diff --git a/ethel/runners/lintian.py b/debile/slave/runners/lintian.py
similarity index 87%
rename from ethel/runners/lintian.py
rename to debile/slave/runners/lintian.py
index f36041c..bbcd1cb 100644
--- a/ethel/runners/lintian.py
+++ b/debile/slave/runners/lintian.py
@@ -1,5 +1,5 @@
-from ethel.wrappers.lintian import parse_lintian
-from ethel.utils import run_command
+from debile.slave.wrappers.lintian import parse_lintian
+from debile.slave.utils import run_command
import os
diff --git a/ethel/runners/pep8.py b/debile/slave/runners/pep8.py
similarity index 83%
rename from ethel/runners/pep8.py
rename to debile/slave/runners/pep8.py
index 87f1388..d47df78 100644
--- a/ethel/runners/pep8.py
+++ b/debile/slave/runners/pep8.py
@@ -1,5 +1,5 @@
-from ethel.wrappers.pep8 import parse_pep8
-from ethel.utils import run_command, cd
+from debile.slave.wrappers.pep8 import parse_pep8
+from debile.slave.utils import run_command, cd
import os
diff --git a/ethel/runners/perlcritic.py b/debile/slave/runners/perlcritic.py
similarity index 86%
rename from ethel/runners/perlcritic.py
rename to debile/slave/runners/perlcritic.py
index 1105a99..6ec2370 100644
--- a/ethel/runners/perlcritic.py
+++ b/debile/slave/runners/perlcritic.py
@@ -1,5 +1,5 @@
-from ethel.wrappers.perlcritic import parse_perlcritic
-from ethel.utils import run_command, cd
+from debile.slave.wrappers.perlcritic import parse_perlcritic
+from debile.slave.utils import run_command, cd
import os
diff --git a/ethel/runners/piuparts.py b/debile/slave/runners/piuparts.py
similarity index 93%
rename from ethel/runners/piuparts.py
rename to debile/slave/runners/piuparts.py
index 92d5d36..bc48980 100644
--- a/ethel/runners/piuparts.py
+++ b/debile/slave/runners/piuparts.py
@@ -1,5 +1,5 @@
-from ethel.utils import EthelSubprocessError
-from ethel.wrappers.piuparts import parse_piuparts
+from debile.slave.utils import EthelSubprocessError
+from debile.slave.wrappers.piuparts import parse_piuparts
from firehose.model import Issue, Message, File, Location
from schroot.chroot import SchrootCommandError
diff --git a/ethel/runners/sbuild.py b/debile/slave/runners/sbuild.py
similarity index 98%
rename from ethel/runners/sbuild.py
rename to debile/slave/runners/sbuild.py
index fbc5771..83cb396 100644
--- a/ethel/runners/sbuild.py
+++ b/debile/slave/runners/sbuild.py
@@ -1,4 +1,4 @@
-from ethel.utils import safe_run, run_command, tdir
+from debile.slave.utils import safe_run, run_command, tdir
from firehose.model import Issue, Message, File, Location, Stats, DebianBinary
import firehose.parsers.gcc as fgcc
diff --git a/ethel/utils.py b/debile/slave/utils.py
similarity index 97%
rename from ethel/utils.py
rename to debile/slave/utils.py
index bf64e75..92bcb4d 100644
--- a/ethel/utils.py
+++ b/debile/slave/utils.py
@@ -1,5 +1,5 @@
-from ethel.error import EthelError
-from ethel.config import Config
+from debile.slave.error import EthelError
+from debile.slave.config import Config
from contextlib import contextmanager
from schroot import schroot
diff --git a/ethel/runners/__init__.py b/debile/slave/wrappers/__init__.py
similarity index 100%
rename from ethel/runners/__init__.py
rename to debile/slave/wrappers/__init__.py
diff --git a/ethel/wrappers/adequate.py b/debile/slave/wrappers/adequate.py
similarity index 100%
rename from ethel/wrappers/adequate.py
rename to debile/slave/wrappers/adequate.py
diff --git a/ethel/wrappers/clanganalyzer.py b/debile/slave/wrappers/clanganalyzer.py
similarity index 100%
rename from ethel/wrappers/clanganalyzer.py
rename to debile/slave/wrappers/clanganalyzer.py
diff --git a/ethel/wrappers/coccinelle.py b/debile/slave/wrappers/coccinelle.py
similarity index 100%
rename from ethel/wrappers/coccinelle.py
rename to debile/slave/wrappers/coccinelle.py
diff --git a/ethel/wrappers/cppcheck.py b/debile/slave/wrappers/cppcheck.py
similarity index 100%
rename from ethel/wrappers/cppcheck.py
rename to debile/slave/wrappers/cppcheck.py
diff --git a/ethel/wrappers/desktop_file_validate.py b/debile/slave/wrappers/desktop_file_validate.py
similarity index 100%
rename from ethel/wrappers/desktop_file_validate.py
rename to debile/slave/wrappers/desktop_file_validate.py
diff --git a/ethel/wrappers/lintian.py b/debile/slave/wrappers/lintian.py
similarity index 100%
rename from ethel/wrappers/lintian.py
rename to debile/slave/wrappers/lintian.py
diff --git a/ethel/wrappers/pep8.py b/debile/slave/wrappers/pep8.py
similarity index 100%
rename from ethel/wrappers/pep8.py
rename to debile/slave/wrappers/pep8.py
diff --git a/ethel/wrappers/perlcritic.py b/debile/slave/wrappers/perlcritic.py
similarity index 100%
rename from ethel/wrappers/perlcritic.py
rename to debile/slave/wrappers/perlcritic.py
diff --git a/ethel/wrappers/piuparts.py b/debile/slave/wrappers/piuparts.py
similarity index 100%
rename from ethel/wrappers/piuparts.py
rename to debile/slave/wrappers/piuparts.py
diff --git a/ethel/__init__.py b/ethel/__init__.py
deleted file mode 100644
index 4aa77f9..0000000
--- a/ethel/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-__appname__ = "ethel"
-__version__ = "0.0.1"
diff --git a/ethel/commands/__init__.py b/ethel/commands/__init__.py
deleted file mode 100644
index d2c7f9d..0000000
--- a/ethel/commands/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import importlib
-
-
-PLUGINS = {
- "build": "ethel.commands.build",
- "clanganalyzer": "ethel.commands.clanganalyzer",
-
- "pep8": "ethel.commands.pep8",
- "perlcritic": "ethel.commands.perlcritic",
- "cppcheck": "ethel.commands.cppcheck",
- "coccinelle": "ethel.commands.coccinelle",
-
- "lintian": "ethel.commands.lintian",
- "lintian4py": "ethel.commands.lintian4py",
-
- "adequate": "ethel.commands.adequate",
- "piuparts": "ethel.commands.piuparts",
- "desktop-file-validate": "ethel.commands.desktop_file_validate",
-}
-
-
-def load_module(what):
- path = PLUGINS[what]
- mod = importlib.import_module(path)
- return (mod.run, mod.get_version)
diff --git a/setup.py b/setup.py
index bd8f011..a779f5d 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from ethel import __appname__, __version__
+from debile.slave import __appname__, __version__
from setuptools import setup
@@ -9,22 +9,19 @@ setup(
version=__version__,
scripts=[],
packages=[
- 'ethel',
+ 'debile.slave',
],
author="Paul Tagliamonte",
author_email="tag at pault.ag",
long_description=long_description,
- description='Ethyl!',
+ description='debile-slave module from debile suite',
license="Expat",
url="http://deb.io/",
platforms=['any'],
entry_points = {
'console_scripts': [
- 'ethel-source = ethel.cli:get_source_package',
- 'ethel-binary = ethel.cli:get_binary_package',
-
- 'etheld = ethel.daemon:main',
- 'ethel-update = ethel.utils:doupdate',
+ 'debile-slaved = debile.slave.daemon:main',
+ 'debile-update = debile.slave.utils:doupdate',
],
}
)
diff --git a/skel/ethel.ini b/skel/debile-slave.ini
similarity index 94%
rename from skel/ethel.ini
rename to skel/debile-slave.ini
index 9981ad5..238dd34 100644
--- a/skel/ethel.ini
+++ b/skel/debile-slave.ini
@@ -18,7 +18,7 @@ copy=scp -r {src} lucy at debian-manager.via.ecp.fr:{dest}
# `gpg --list-secret-keys --fingerprint | grep fingerprint | cut -d'=' -f2 | tr -d ' '`
fingerprint=D0FEF8101640900183B8C37A42FE51628224AAA3
# The keyring where this key is
-keyring=/srv/ethel/.gnupg/secring.gpg
+keyring=/srv/debile/.gnupg/secring.gpg
[capabilities]
# The builder capabilities
diff --git a/tests/wrappers/test_adequate.py b/tests/wrappers/test_adequate.py
index a02a433..8adee9f 100644
--- a/tests/wrappers/test_adequate.py
+++ b/tests/wrappers/test_adequate.py
@@ -1,4 +1,4 @@
-from ethel.wrappers.adequate import parse_adequate
+from debile.slave.wrappers.adequate import parse_adequate
TESTS = [
diff --git a/tests/wrappers/test_cppcheck.py b/tests/wrappers/test_cppcheck.py
index ec61a8b..3789b7e 100644
--- a/tests/wrappers/test_cppcheck.py
+++ b/tests/wrappers/test_cppcheck.py
@@ -1,4 +1,4 @@
-from ethel.wrappers.cppcheck import parse_cppcheck
+from debile.slave.wrappers.cppcheck import parse_cppcheck
DATA = b"""<?xml version="1.0" encoding="UTF-8"?>
<results>
diff --git a/tests/wrappers/test_desktop_file_validate.py b/tests/wrappers/test_desktop_file_validate.py
index 1b8c9cc..4862ebb 100644
--- a/tests/wrappers/test_desktop_file_validate.py
+++ b/tests/wrappers/test_desktop_file_validate.py
@@ -1,4 +1,4 @@
-from ethel.wrappers.desktop_file_validate import parse_desktop_file_validate
+from debile.slave.wrappers.desktop_file_validate import parse_desktop_file_validate
STRINGS = [
diff --git a/tests/wrappers/test_lintian.py b/tests/wrappers/test_lintian.py
index b613be3..9897dd8 100644
--- a/tests/wrappers/test_lintian.py
+++ b/tests/wrappers/test_lintian.py
@@ -1,4 +1,4 @@
-from ethel.wrappers.lintian import parse_lintian
+from debile.slave.wrappers.lintian import parse_lintian
TESTS = [
diff --git a/tests/wrappers/test_pep8.py b/tests/wrappers/test_pep8.py
index 8a819ec..5e4b739 100644
--- a/tests/wrappers/test_pep8.py
+++ b/tests/wrappers/test_pep8.py
@@ -1,4 +1,4 @@
-from ethel.wrappers.pep8 import parse_pep8
+from debile.slave.wrappers.pep8 import parse_pep8
STRINGS = [
diff --git a/tests/wrappers/test_perlcritic.py b/tests/wrappers/test_perlcritic.py
index 1c5be3b..f34fadb 100644
--- a/tests/wrappers/test_perlcritic.py
+++ b/tests/wrappers/test_perlcritic.py
@@ -1,4 +1,4 @@
-from ethel.wrappers.perlcritic import parse_perlcritic
+from debile.slave.wrappers.perlcritic import parse_perlcritic
TESTS = [
diff --git a/tests/wrappers/test_piuparts.py b/tests/wrappers/test_piuparts.py
index bd7446c..2fe31a3 100644
--- a/tests/wrappers/test_piuparts.py
+++ b/tests/wrappers/test_piuparts.py
@@ -1,4 +1,4 @@
-from ethel.wrappers.piuparts import parse_piuparts
+from debile.slave.wrappers.piuparts import parse_piuparts
import os
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-slave.git
More information about the Pkg-debile-commits
mailing list