From d8bb8206b980fddd65f6c2719515eee679d2bf6e Mon Sep 17 00:00:00 2001 From: Jason Paryani Date: Tue, 5 Nov 2013 15:37:51 -0800 Subject: [PATCH] fix up small typos --- capnp/capnp.pyx | 2 +- setup.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/capnp/capnp.pyx b/capnp/capnp.pyx index be014ed..a40a684 100644 --- a/capnp/capnp.pyx +++ b/capnp/capnp.pyx @@ -1885,7 +1885,7 @@ def add_import_hook(additional_paths=[]): import capnp capnp.add_import_hook() - import addressbook + import addressbook_capnp # equivalent to capnp.load('addressbook.capnp', 'addressbook', sys.path), except it will search for 'addressbook.capnp' in all directories of sys.path :type additional_paths: list diff --git a/setup.py b/setup.py index 95a2fe5..bf2ed7d 100644 --- a/setup.py +++ b/setup.py @@ -11,15 +11,15 @@ if Cython.__version__ < '0.19.1': import pkg_resources setuptools_version = pkg_resources.get_distribution("setuptools").version if setuptools_version < '0.8': - raise RuntimeError('Old setuptools installed (%s). Please run `pip install -U setuptools`. Running `pip install capnp` will not work alone, since setuptools needs to be upgraded before installing anything else.' % setuptools_version) + raise RuntimeError('Old setuptools installed (%s). Please run `pip install -U setuptools`. Running `pip install pycapnp` will not work alone, since setuptools needs to be upgraded before installing anything else.' % setuptools_version) from distutils.core import setup import os MAJOR = 0 -MINOR = 3 -MICRO = 14 -VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO) +MINOR = 4 +MICRO = 0 +VERSION = '%d.%d.%d-dev' % (MAJOR, MINOR, MICRO) def write_version_py(filename=None): cnt = """\ @@ -54,7 +54,7 @@ setup( 'cython > 0.19', 'setuptools >= 0.8'], # PyPi info - description='A cython wrapping of the C++ capnproto library', + description="A cython wrapping of the C++ Cap'n Proto library", long_description=long_description, license='BSD', author="Jason Paryani",