From 1886d400d739b83e466b8f8a2e75909682b007b0 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Tue, 25 Sep 2012 16:31:59 +0200
Subject: [PATCH] Rename the package as xbob.flandmark
---
README.rst | 2 +-
setup.py | 14 +++++++++-----
xbob/__init__.py | 2 ++
{flandmark => xbob/flandmark}/__init__.py | 0
{flandmark => xbob/flandmark}/ext/ext.cpp | 0
.../flandmark}/ext/flandmark_detector.cpp | 0
.../flandmark}/ext/flandmark_detector.h | 0
{flandmark => xbob/flandmark}/ext/liblbp.cpp | 0
{flandmark => xbob/flandmark}/ext/liblbp.h | 0
{flandmark => xbob/flandmark}/flandmark_model.dat | Bin
.../flandmark}/haarcascade_frontalface_alt.xml | 0
.../flandmark}/haarcascade_frontalface_alt2.xml | 0
{flandmark => xbob/flandmark}/script/__init__.py | 0
{flandmark => xbob/flandmark}/script/annotate.py | 0
{flandmark => xbob/flandmark}/test.py | 0
{flandmark => xbob/flandmark}/version.py | 0
16 files changed, 12 insertions(+), 6 deletions(-)
create mode 100644 xbob/__init__.py
rename {flandmark => xbob/flandmark}/__init__.py (100%)
rename {flandmark => xbob/flandmark}/ext/ext.cpp (100%)
rename {flandmark => xbob/flandmark}/ext/flandmark_detector.cpp (100%)
rename {flandmark => xbob/flandmark}/ext/flandmark_detector.h (100%)
rename {flandmark => xbob/flandmark}/ext/liblbp.cpp (100%)
rename {flandmark => xbob/flandmark}/ext/liblbp.h (100%)
rename {flandmark => xbob/flandmark}/flandmark_model.dat (100%)
rename {flandmark => xbob/flandmark}/haarcascade_frontalface_alt.xml (100%)
rename {flandmark => xbob/flandmark}/haarcascade_frontalface_alt2.xml (100%)
rename {flandmark => xbob/flandmark}/script/__init__.py (100%)
rename {flandmark => xbob/flandmark}/script/annotate.py (100%)
rename {flandmark => xbob/flandmark}/test.py (100%)
rename {flandmark => xbob/flandmark}/version.py (100%)
diff --git a/README.rst b/README.rst
index 739f6a5..7d00d49 100644
--- a/README.rst
+++ b/README.rst
@@ -56,7 +56,7 @@ Usage
Pretty simple, just do something like::
import bob
- import flandmark
+ from xbob import flandmark
video = bob.io.VideoReader('myvideo.avi')
localize = flandmark.Localizer()
diff --git a/setup.py b/setup.py
index c69357d..3ba83af 100644
--- a/setup.py
+++ b/setup.py
@@ -105,6 +105,10 @@ setup(
include_package_data=True,
zip_safe=False,
+ namespace_packages=[
+ "xbob",
+ ],
+
install_requires=[
'setuptools',
'bob',
@@ -112,16 +116,16 @@ setup(
entry_points = {
'console_scripts': [
- 'annotate.py = flandmark.script.annotate:main',
+ 'annotate.py = xbob.flandmark.script.annotate:main',
],
},
ext_modules=[
- setup_bob_extension("flandmark._flandmark",
+ setup_bob_extension("xbob.flandmark._flandmark",
[
- "flandmark/ext/flandmark_detector.cpp",
- "flandmark/ext/liblbp.cpp",
- "flandmark/ext/ext.cpp",
+ "xbob/flandmark/ext/flandmark_detector.cpp",
+ "xbob/flandmark/ext/liblbp.cpp",
+ "xbob/flandmark/ext/ext.cpp",
])
],
diff --git a/xbob/__init__.py b/xbob/__init__.py
new file mode 100644
index 0000000..60381ea
--- /dev/null
+++ b/xbob/__init__.py
@@ -0,0 +1,2 @@
+#see http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/flandmark/__init__.py b/xbob/flandmark/__init__.py
similarity index 100%
rename from flandmark/__init__.py
rename to xbob/flandmark/__init__.py
diff --git a/flandmark/ext/ext.cpp b/xbob/flandmark/ext/ext.cpp
similarity index 100%
rename from flandmark/ext/ext.cpp
rename to xbob/flandmark/ext/ext.cpp
diff --git a/flandmark/ext/flandmark_detector.cpp b/xbob/flandmark/ext/flandmark_detector.cpp
similarity index 100%
rename from flandmark/ext/flandmark_detector.cpp
rename to xbob/flandmark/ext/flandmark_detector.cpp
diff --git a/flandmark/ext/flandmark_detector.h b/xbob/flandmark/ext/flandmark_detector.h
similarity index 100%
rename from flandmark/ext/flandmark_detector.h
rename to xbob/flandmark/ext/flandmark_detector.h
diff --git a/flandmark/ext/liblbp.cpp b/xbob/flandmark/ext/liblbp.cpp
similarity index 100%
rename from flandmark/ext/liblbp.cpp
rename to xbob/flandmark/ext/liblbp.cpp
diff --git a/flandmark/ext/liblbp.h b/xbob/flandmark/ext/liblbp.h
similarity index 100%
rename from flandmark/ext/liblbp.h
rename to xbob/flandmark/ext/liblbp.h
diff --git a/flandmark/flandmark_model.dat b/xbob/flandmark/flandmark_model.dat
similarity index 100%
rename from flandmark/flandmark_model.dat
rename to xbob/flandmark/flandmark_model.dat
diff --git a/flandmark/haarcascade_frontalface_alt.xml b/xbob/flandmark/haarcascade_frontalface_alt.xml
similarity index 100%
rename from flandmark/haarcascade_frontalface_alt.xml
rename to xbob/flandmark/haarcascade_frontalface_alt.xml
diff --git a/flandmark/haarcascade_frontalface_alt2.xml b/xbob/flandmark/haarcascade_frontalface_alt2.xml
similarity index 100%
rename from flandmark/haarcascade_frontalface_alt2.xml
rename to xbob/flandmark/haarcascade_frontalface_alt2.xml
diff --git a/flandmark/script/__init__.py b/xbob/flandmark/script/__init__.py
similarity index 100%
rename from flandmark/script/__init__.py
rename to xbob/flandmark/script/__init__.py
diff --git a/flandmark/script/annotate.py b/xbob/flandmark/script/annotate.py
similarity index 100%
rename from flandmark/script/annotate.py
rename to xbob/flandmark/script/annotate.py
diff --git a/flandmark/test.py b/xbob/flandmark/test.py
similarity index 100%
rename from flandmark/test.py
rename to xbob/flandmark/test.py
diff --git a/flandmark/version.py b/xbob/flandmark/version.py
similarity index 100%
rename from flandmark/version.py
rename to xbob/flandmark/version.py
--
GitLab