Commit a5c658a3 authored by André Anjos's avatar André Anjos 💬
Browse files

xbob -> bob

parent d9484ee3
......@@ -25,8 +25,8 @@ install:
- "python bootstrap.py"
- "CFLAGS=-coverage ./bin/buildout"
script:
- "./bin/python -c 'from xbob.ip.draw import get_config; print(get_config())'"
- "./bin/coverage run --source=xbob.ip.draw ./bin/nosetests -sv"
- "./bin/python -c 'from bob.ip.draw import get_config; print(get_config())'"
- "./bin/coverage run --source=bob.ip.draw ./bin/nosetests -sv"
- "./bin/sphinx-build -b doctest doc sphinx"
- "./bin/sphinx-build -b html doc sphinx"
after_success:
......
include LICENSE README.rst bootstrap.py buildout.cfg
recursive-include doc conf.py *.rst
recursive-include xbob *.cpp
recursive-include bob *.cpp
......@@ -2,16 +2,16 @@
.. Andre Anjos <andre.anjos@idiap.ch>
.. Thu 30 Jan 08:46:53 2014 CET
.. image:: https://travis-ci.org/bioidiap/xbob.ip.draw.svg?branch=master
:target: https://travis-ci.org/bioidiap/xbob.ip.draw
.. image:: https://coveralls.io/repos/bioidiap/xbob.ip.draw/badge.png
:target: https://coveralls.io/r/bioidiap/xbob.ip.draw
.. image:: http://img.shields.io/github/tag/bioidiap/xbob.ip.draw.png
:target: https://github.com/bioidiap/xbob.ip.draw
.. image:: http://img.shields.io/pypi/v/xbob.ip.draw.png
:target: https://pypi.python.org/pypi/xbob.ip.draw
.. image:: http://img.shields.io/pypi/dm/xbob.ip.draw.png
:target: https://pypi.python.org/pypi/xbob.ip.draw
.. image:: https://travis-ci.org/bioidiap/bob.ip.draw.svg?branch=master
:target: https://travis-ci.org/bioidiap/bob.ip.draw
.. image:: https://coveralls.io/repos/bioidiap/bob.ip.draw/badge.png
:target: https://coveralls.io/r/bioidiap/bob.ip.draw
.. image:: http://img.shields.io/github/tag/bioidiap/bob.ip.draw.png
:target: https://github.com/bioidiap/bob.ip.draw
.. image:: http://img.shields.io/pypi/v/bob.ip.draw.png
:target: https://pypi.python.org/pypi/bob.ip.draw
.. image:: http://img.shields.io/pypi/dm/bob.ip.draw.png
:target: https://pypi.python.org/pypi/bob.ip.draw
==================================
Python bindings for bob.ip.draw
......@@ -42,7 +42,7 @@ Testing
You can run a set of tests using the nose test runner::
$ nosetests -sv xbob.ip.draw
$ nosetests -sv bob.ip.draw
.. warning::
......@@ -59,7 +59,7 @@ You can run our documentation tests using sphinx itself::
You can test overall test coverage with::
$ nosetests --with-coverage --cover-package=xbob.ip.draw
$ nosetests --with-coverage --cover-package=bob.ip.draw
The ``coverage`` egg must be installed for this to work properly.
......
......@@ -7,8 +7,8 @@
* Copyright (C) 2011-2014 Idiap Research Institute, Martigny, Switzerland
*/
#include <xbob.blitz/cppapi.h>
#include <xbob.blitz/cleanup.h>
#include <bob.blitz/cppapi.h>
#include <bob.blitz/cleanup.h>
#include "drawing.h"
#include "utils.h"
......
......@@ -8,8 +8,8 @@
*/
#include <xbob.blitz/cppapi.h>
#include <xbob.blitz/cleanup.h>
#include <bob.blitz/cppapi.h>
#include <bob.blitz/cleanup.h>
#include "drawing.h"
#include "utils.h"
......
......@@ -7,8 +7,8 @@
* Copyright (C) 2011-2014 Idiap Research Institute, Martigny, Switzerland
*/
#include <xbob.blitz/cppapi.h>
#include <xbob.blitz/cleanup.h>
#include <bob.blitz/cppapi.h>
#include <bob.blitz/cleanup.h>
#include "drawing.h"
#include "utils.h"
......
......@@ -8,12 +8,12 @@
#ifdef NO_IMPORT_ARRAY
#undef NO_IMPORT_ARRAY
#endif
#include <xbob.blitz/capi.h>
#include <xbob.blitz/cleanup.h>
#include <xbob.extension/documentation.h>
#include <bob.blitz/capi.h>
#include <bob.blitz/cleanup.h>
#include <bob.extension/documentation.h>
extern PyObject* PyBobIpDraw_Point(PyObject*, PyObject* args, PyObject* kwds);
static xbob::extension::FunctionDoc s_point = xbob::extension::FunctionDoc(
static bob::extension::FunctionDoc s_point = bob::extension::FunctionDoc(
"point",
"Draws a point in the given (gray-scale or color) image.",
......@@ -40,7 +40,7 @@ static xbob::extension::FunctionDoc s_point = xbob::extension::FunctionDoc(
;
extern PyObject* PyBobIpDraw_TryPoint(PyObject*, PyObject* args, PyObject* kwds);
static xbob::extension::FunctionDoc s_try_point = xbob::extension::FunctionDoc(
static bob::extension::FunctionDoc s_try_point = bob::extension::FunctionDoc(
"try_point",
"Tries to draw a point in the given (gray-scale or color) image.",
......@@ -58,7 +58,7 @@ static xbob::extension::FunctionDoc s_try_point = xbob::extension::FunctionDoc(
;
extern PyObject* PyBobIpDraw_Line(PyObject*, PyObject* args, PyObject* kwds);
static xbob::extension::FunctionDoc s_line = xbob::extension::FunctionDoc(
static bob::extension::FunctionDoc s_line = bob::extension::FunctionDoc(
"line",
"Draws a line between two points on the given image.",
......@@ -90,7 +90,7 @@ static xbob::extension::FunctionDoc s_line = xbob::extension::FunctionDoc(
;
extern PyObject* PyBobIpDraw_Cross(PyObject*, PyObject* args, PyObject* kwds);
static xbob::extension::FunctionDoc s_cross = xbob::extension::FunctionDoc(
static bob::extension::FunctionDoc s_cross = bob::extension::FunctionDoc(
"cross",
"Draws a cross in the given (gray-scale or color) image.",
......@@ -120,7 +120,7 @@ static xbob::extension::FunctionDoc s_cross = xbob::extension::FunctionDoc(
;
extern PyObject* PyBobIpDraw_Plus(PyObject*, PyObject* args, PyObject* kwds);
static xbob::extension::FunctionDoc s_plus = xbob::extension::FunctionDoc(
static bob::extension::FunctionDoc s_plus = bob::extension::FunctionDoc(
"plus",
"Draws a plus sign in the given (gray-scale or color) image.",
......@@ -150,7 +150,7 @@ static xbob::extension::FunctionDoc s_plus = xbob::extension::FunctionDoc(
;
extern PyObject* PyBobIpDraw_Box(PyObject*, PyObject* args, PyObject* kwds);
static xbob::extension::FunctionDoc s_box = xbob::extension::FunctionDoc(
static bob::extension::FunctionDoc s_box = bob::extension::FunctionDoc(
"box",
"Draws a box anchored at a point, with the given dimensions.",
......@@ -227,7 +227,7 @@ PyDoc_STRVAR(module_docstr, "Bob image drawing utilitiles");
#if PY_VERSION_HEX >= 0x03000000
static PyModuleDef module_definition = {
PyModuleDef_HEAD_INIT,
XBOB_EXT_MODULE_NAME,
BOB_EXT_MODULE_NAME,
module_docstr,
-1,
module_methods,
......@@ -240,23 +240,23 @@ static PyObject* create_module (void) {
# if PY_VERSION_HEX >= 0x03000000
PyObject* m = PyModule_Create(&module_definition);
# else
PyObject* m = Py_InitModule3(XBOB_EXT_MODULE_NAME, module_methods, module_docstr);
PyObject* m = Py_InitModule3(BOB_EXT_MODULE_NAME, module_methods, module_docstr);
# endif
if (!m) return 0;
auto m_ = make_safe(m); ///< protects against early returns
if (PyModule_AddStringConstant(m, "__version__", XBOB_EXT_MODULE_VERSION) < 0)
if (PyModule_AddStringConstant(m, "__version__", BOB_EXT_MODULE_VERSION) < 0)
return 0;
/* imports xbob.blitz C-API + dependencies */
if (import_xbob_blitz() < 0) return 0;
/* imports bob.blitz C-API + dependencies */
if (import_bob_blitz() < 0) return 0;
Py_INCREF(m);
return m;
}
PyMODINIT_FUNC XBOB_EXT_ENTRY_NAME (void) {
PyMODINIT_FUNC BOB_EXT_ENTRY_NAME (void) {
# if PY_VERSION_HEX >= 0x03000000
return
# endif
......
......@@ -8,8 +8,8 @@
*/
#include <xbob.blitz/cppapi.h>
#include <xbob.blitz/cleanup.h>
#include <bob.blitz/cppapi.h>
#include <bob.blitz/cleanup.h>
#include "drawing.h"
#include "utils.h"
......
......@@ -8,8 +8,8 @@
*/
#include <xbob.blitz/cppapi.h>
#include <xbob.blitz/cleanup.h>
#include <bob.blitz/cppapi.h>
#include <bob.blitz/cleanup.h>
#include "drawing.h"
#include "utils.h"
......
......@@ -17,8 +17,8 @@
#ifdef NO_IMPORT_ARRAY
#undef NO_IMPORT_ARRAY
#endif
#include <xbob.blitz/capi.h>
#include <xbob.blitz/cleanup.h>
#include <bob.blitz/capi.h>
#include <bob.blitz/cleanup.h>
static int dict_set(PyObject* d, const char* key, const char* value) {
PyObject* v = Py_BuildValue("s", value);
......@@ -87,10 +87,10 @@ static PyObject* numpy_version() {
}
/**
* xbob.blitz c/c++ api version
* bob.blitz c/c++ api version
*/
static PyObject* xbob_blitz_version() {
return Py_BuildValue("{ss}", "api", BOOST_PP_STRINGIZE(XBOB_BLITZ_API_VERSION));
static PyObject* bob_blitz_version() {
return Py_BuildValue("{ss}", "api", BOOST_PP_STRINGIZE(BOB_BLITZ_API_VERSION));
}
static PyObject* build_version_dictionary() {
......@@ -104,7 +104,7 @@ static PyObject* build_version_dictionary() {
if (!dict_steal(retval, "Compiler", compiler_version())) return 0;
if (!dict_steal(retval, "Python", python_version())) return 0;
if (!dict_steal(retval, "NumPy", numpy_version())) return 0;
if (!dict_steal(retval, "xbob.blitz", xbob_blitz_version())) return 0;
if (!dict_steal(retval, "bob.blitz", bob_blitz_version())) return 0;
Py_INCREF(retval);
return retval;
......@@ -121,7 +121,7 @@ PyDoc_STRVAR(module_docstr,
#if PY_VERSION_HEX >= 0x03000000
static PyModuleDef module_definition = {
PyModuleDef_HEAD_INIT,
XBOB_EXT_MODULE_NAME,
BOB_EXT_MODULE_NAME,
module_docstr,
-1,
module_methods,
......@@ -134,27 +134,27 @@ static PyObject* create_module (void) {
# if PY_VERSION_HEX >= 0x03000000
PyObject* m = PyModule_Create(&module_definition);
# else
PyObject* m = Py_InitModule3(XBOB_EXT_MODULE_NAME, module_methods, module_docstr);
PyObject* m = Py_InitModule3(BOB_EXT_MODULE_NAME, module_methods, module_docstr);
# endif
if (!m) return 0;
auto m_ = make_safe(m); ///< protects against early returns
/* register version numbers and constants */
if (PyModule_AddStringConstant(m, "module", XBOB_EXT_MODULE_VERSION) < 0)
if (PyModule_AddStringConstant(m, "module", BOB_EXT_MODULE_VERSION) < 0)
return 0;
PyObject* externals = build_version_dictionary();
if (!externals) return 0;
if (PyModule_AddObject(m, "externals", externals) < 0) return 0;
if (import_xbob_blitz() < 0) return 0;
if (import_bob_blitz() < 0) return 0;
Py_INCREF(m);
return m;
}
PyMODINIT_FUNC XBOB_EXT_ENTRY_NAME (void) {
PyMODINIT_FUNC BOB_EXT_ENTRY_NAME (void) {
# if PY_VERSION_HEX >= 0x03000000
return
# endif
......
......@@ -4,23 +4,23 @@
[buildout]
parts = scripts
eggs = xbob.ip.draw
extensions = xbob.buildout
eggs = bob.ip.draw
extensions = bob.buildout
mr.developer
auto-checkout = *
develop = src/xbob.extension
src/xbob.blitz
develop = src/bob.extension
src/bob.blitz
.
; options for xbob.buildout extension
; options for bob.buildout extension
debug = true
verbose = true
;prefixes = /idiap/group/torch5spro/nightlies/last/bob/linux-x86_64-release
; /Users/andre/work/bob/b/dbg/
prefixes = /idiap/group/torch5spro/releases/preview/install/linux-x86_64-release
/Users/andre/work/bob/b/dbg/
[sources]
xbob.extension = git https://github.com/bioidiap/xbob.extension branch=prototype
xbob.blitz = git https://github.com/bioidiap/xbob.blitz
bob.extension = git https://github.com/bioidiap/bob.extension
bob.blitz = git https://github.com/bioidiap/bob.blitz
[scripts]
recipe = xbob.buildout:scripts
recipe = bob.buildout:scripts
......@@ -58,12 +58,12 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
project = u'xbob.ip.draw'
project = u'bob.ip.draw'
import time
copyright = u'%s, Idiap Research Institute' % time.strftime('%Y')
# Grab the setup entry
distribution = pkg_resources.require('xbob.ip.draw')[0]
distribution = pkg_resources.require('bob.ip.draw')[0]
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
......@@ -129,7 +129,7 @@ if sphinx.__version__ >= "1.0":
#html_title = None
# A shorter title for the navigation bar. Default is the same as html_title.
#html_short_title = 'xbob_ip_draw'
#html_short_title = 'bob_ip_draw'
# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
......@@ -187,7 +187,7 @@ html_favicon = 'img/favicon.ico'
#html_file_suffix = None
# Output file base name for HTML help builder.
htmlhelp_basename = 'xbob_ip_draw_doc'
htmlhelp_basename = 'bob_ip_draw_doc'
# -- Options for LaTeX output --------------------------------------------------
......@@ -201,7 +201,7 @@ latex_font_size = '10pt'
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
('index', 'xbob_ip_draw.tex', u'Bob Image Drawing Utilities',
('index', 'bob_ip_draw.tex', u'Bob Image Drawing Utilities',
u'Biometrics Group, Idiap Research Institute', 'manual'),
]
......@@ -241,7 +241,7 @@ rst_epilog = """
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'xbob_ip_draw', u'Bob Image Drawing Utilities', [u'Idiap Research Institute'], 1)
('index', 'bob_ip_draw', u'Bob Image Drawing Utilities', [u'Idiap Research Institute'], 1)
]
# Default processing flags for sphinx
......
......@@ -7,8 +7,8 @@
============
This section includes information for using the pure Python API of
``xbob.ip.draw``.
``bob.ip.draw``.
.. automodule:: xbob.ip.draw
.. automodule:: bob.ip.draw
......@@ -4,18 +4,18 @@
# Thu 30 Jan 08:45:49 2014 CET
from setuptools import setup, find_packages, dist
dist.Distribution(dict(setup_requires=['xbob.blitz']))
from xbob.blitz.extension import Extension
dist.Distribution(dict(setup_requires=['bob.blitz']))
from bob.blitz.extension import Extension
packages = ['boost']
version = '2.0.0a0'
setup(
name='xbob.ip.draw',
name='bob.ip.draw',
version=version,
description='Line and Box drawing utilities',
url='http://github.com/bioidiap/xbob.ip.draw',
url='http://github.com/bioidiap/bob.ip.draw',
license='BSD',
author='Andre Anjos',
author_email='andre.anjos@idiap.ch',
......@@ -27,30 +27,30 @@ setup(
install_requires=[
'setuptools',
'xbob.blitz',
'bob.blitz',
],
namespace_packages=[
"xbob",
"xbob.ip",
"bob",
"bob.ip",
],
ext_modules = [
Extension("xbob.ip.draw.version",
Extension("bob.ip.draw.version",
[
"xbob/ip/draw/version.cpp",
"bob/ip/draw/version.cpp",
],
version = version,
packages = packages,
),
Extension("xbob.ip.draw._library",
Extension("bob.ip.draw._library",
[
"xbob/ip/draw/point.cpp",
"xbob/ip/draw/try_point.cpp",
"xbob/ip/draw/line.cpp",
"xbob/ip/draw/cross.cpp",
"xbob/ip/draw/box.cpp",
"xbob/ip/draw/main.cpp",
"bob/ip/draw/point.cpp",
"bob/ip/draw/try_point.cpp",
"bob/ip/draw/line.cpp",
"bob/ip/draw/cross.cpp",
"bob/ip/draw/box.cpp",
"bob/ip/draw/main.cpp",
],
packages = packages,
version = version,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment