Permalink
Browse files

Updated everything for 1.3

  • Loading branch information...
1 parent 133fed8 commit 87ecbd5d6b8e912a245ce142c4ffcf42780a9d88 @xamox xamox committed Jul 31, 2012
Showing with 8 additions and 63 deletions.
  1. +1 −1 SimpleCV/__init__.py
  2. +3 −55 doc/conf.py
  3. +4 −7 setup.py
View
@@ -1,4 +1,4 @@
-__version__ = '1.2.0'
+__version__ = '1.3.0'
from SimpleCV.base import *
from SimpleCV.Camera import *
View
@@ -14,58 +14,6 @@
import sys,os
-#added for Readthedocs support, this is used to trick out imports
-#that depend on the C libraries.
-class Mock(object):
- def __init__(self, *args, **kwargs):
- pass
-
- def __call__(self, *args, **kwargs):
- return Mock()
-
- @classmethod
- def __getattr__(self, name):
- if name in ('__file__', '__path__'):
- return '/dev/null'
- elif name[0] == name[0].upper():
- return type(name, (), {})
- else:
- return Mock()
-
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-if on_rtd:
- MOCK_MODULES = [
- 'cv2',
- 'cv',
- 'cv2.cv',
- 'numpy',
- 'pygame',
- 'scipy',
- 'scipy.spatial',
- 'scipy.spatial.distance',
- 'scipy.ndimage',
- 'scipy.stats.stats',
- 'distance',
- 'scipy.cluster',
- 'scipy.cluster.vq',
- 'cluster.vq',
- 'vq',
- 'scipy.interpolate',
- 'interpolate',
- 'Image',
- 'zxing',
- 'freenect',
- 'tesseract',
- 'orange',
- 'orngTest',
- 'orngStat',
- 'orngEnsemble',
- 'stats.stats',
- ]
-
- for mod_name in MOCK_MODULES:
- sys.modules[mod_name] = Mock()
-
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
@@ -95,16 +43,16 @@ def __getattr__(self, name):
# General information about the project.
project = u'SimpleCV'
-copyright = u'2011, Ingeuitas'
+copyright = u'2011, Sight Machine'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
-version = '1.2'
+version = '1.3'
# The full version, including alpha/beta/rc tags.
-release = '1.2'
+release = '1.3'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
View
@@ -1,13 +1,11 @@
from setuptools import setup, find_packages
import os, sys, glob, fnmatch
-#from SimpleCV import __version__
-
setup(name="SimpleCV",
- version=1.2,
- download_url='http://sourceforge.net/projects/simplecv/files/1.2/SimpleCV-1.2.tar.gz',
+ version=1.3,
+ download_url='https://github.com/ingenuitas/SimpleCV/zipball/1.3',
description="Make Computers See with SimpleCV, the Python Framework for Machine Vision",
- long_description="""Super-library for machine vision wrappers in Python, providing a unified, pythonic interface to image aquisition, conversion, manipulation, and feature extraction.""",
+ long_description="""Framework for computer (machine) vision in Python, providing a unified, pythonic interface to image aquisition, conversion, manipulation, and feature extraction.""",
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
@@ -22,7 +20,7 @@
'Topic :: Software Development :: Libraries :: Python Modules'],
keywords='opencv, cv, machine vision, computer vision, image recognition, kinect, freenect',
author='Sight Machine Inc',
- author_email='support@ingenuitas.com',
+ author_email='support@sightmachine.com',
url='http://simplecv.org',
license='BSD',
packages = find_packages(exclude=['ez_setup']),
@@ -40,7 +38,6 @@
'examples/tracking/*'
],
},
- #~ scripts=['scripts/simplecv'],
entry_points={
'console_scripts': [
'simplecv = SimpleCV.Shell:main',

0 comments on commit 87ecbd5

Please sign in to comment.