Merge remote branch 'upstream/master'

Conflicts:
	pocketsphinx
	setup.py
	sphinxbase

Author: nshmyrev

.gitignore

@@ -1,4 +1,5 @@
 .idea
+venv
 build
 dist
 MANIFEST

.travis.yml

@@ -0,0 +1,26 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.5-dev"
+  - "nightly"
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq build-essential swig
+install:
+  - python setup.py bdist_wheel build
+  - python setup.py bdist_wheel build
+  - pip install ./dist/pocketsphinx-*.whl
+script:
+  - cd pocketsphinx/swig/python/test
+  - python ./config_test.py
+  - python ./decoder_test.py
+  - python ./fsg_test.py
+  - python ./jsgf_test.py
+  - python ./kws_test.py
+  - python ./lattice_test.py
+  - python ./lm_test.py

MANIFEST.in

@@ -4,7 +4,6 @@ recursive-include sphinxbase/include *.h
 recursive-include sphinxbase/src *.c
 recursive-include sphinxbase/src *.h
 recursive-include sphinxbase/swig *.i
-prune sphinxbase/include/s60
 prune sphinxbase/include/wince
 prune sphinxbase/include/android
 prune sphinxbase/src/sphinx_adtools

example.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 from os import environ, path
 
 from pocketsphinx.pocketsphinx import *

pocketsphinx

@@ -1,8 +1,27 @@
 #!/usr/bin/env bash
+rm -rf venv dist build *.egg-info
+rm -rf ./sphinxbase/swig/python/sphinxbase.py
+rm -rf ./pocketsphinx/swig/python/pocketsphinx.py
 
-python2.7 setup.py bdist_egg upload
-python3.4 setup.py bdist_egg upload
-python2.7 setup.py bdist_wheel upload
-python3.4 setup.py bdist_wheel upload
-python2.7 setup.py sdist --formats=gztar upload
-python2.7 setup.py sdist --formats=zip upload
+virtualenv -p /usr/bin/python2.7 venv
+source venv/bin/activate
+python setup.py bdist_egg build
+python setup.py bdist_egg upload
+python setup.py sdist build
+python setup.py sdist --formats=gztar upload
+python setup.py sdist --formats=zip upload
+deactivate
+
+rm -rf venv dist build *.egg-info
+rm -rf ./sphinxbase/swig/python/sphinxbase.py
+rm -rf ./pocketsphinx/swig/python/pocketsphinx.py
+
+virtualenv -p /usr/bin/python3.5 venv
+source venv/bin/activate
+python setup.py bdist_egg build
+python setup.py bdist_egg upload
+deactivate
+
+rm -rf venv dist build *.egg-info
+rm -rf ./sphinxbase/swig/python/sphinxbase.py
+rm -rf ./pocketsphinx/swig/python/pocketsphinx.py

pypi.sh

@@ -1,6 +1,8 @@
 pocketsphinx-python
 ===================
 
+[![Build Status](https://travis-ci.org/bambocher/pocketsphinx-python.svg?branch=master)](https://travis-ci.org/bambocher/pocketsphinx-python)
+
 Python interface to CMU SphinxBase and PocketSphinx libraries created with SWIG.
 Pocketsphinx packages include python support, however, it is based on Automake and
 not well supported on Windows.
@@ -72,6 +74,7 @@ Basic usage
 -----------
 
 ```python
+#!/usr/bin/env python
 from os import environ, path
 
 from pocketsphinx.pocketsphinx import *

readme.md

@@ -83,10 +83,11 @@
     sb_include_dirs.extend(['include'])
     extra_compile_args.extend([
         '-Wno-unused-label',
-        '-Wno-maybe-uninitialized',
+        '-Wno-strict-prototypes',
         '-Wno-parentheses',
         '-Wno-unused-but-set-variable',
-        '-Wno-unused-variable'
+        '-Wno-unused-variable',
+        '-Wno-unused-result'
     ])
 elif sys.platform.startswith('win'):
     sb_include_dirs.extend(['sphinxbase/include/win32'])
@@ -136,7 +137,7 @@
 
 setup(
     name='pocketsphinx',
-    version='0.0.5',
+    version='0.0.8',
     description='Python interface to CMU SphinxBase and PocketSphinx libraries',
     long_description=__doc__,
     author='Dmitry Prazdnichnov',
@@ -171,8 +172,14 @@
         'License :: OSI Approved :: BSD License',
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: C'
     ],
     license='BSD',