Merge branch 'develop'

.appveyor.yml

@@ -0,0 +1,11 @@
+build: off
+clone_depth: 5
+platform: x64
+configuration: Release
+
+environment:
+    PKG_NAME: optimix
+    PYTHON: "C:\\Python36-x64"
+
+install:
+    - powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/horta/ci/master/appveyor.bat', 'appveyor.bat')" && appveyor.bat

.travis.yml

@@ -1,43 +1,18 @@
+os: linux
 language: python
-services: docker
-git:
-  depth: 5
-matrix:
-  include:
-  - python: 2.7
-  - python: 3.6
-  - env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
-  - os: osx
-    language: generic
-    env: PYENV=py27
-  - os: osx
-    language: generic
-    env: PYENV=py36
-before_install:
-- travis_retry bash <(curl -s https://raw.githubusercontent.com/limix/travis-tools/master/get-travis-tools.sh)
-- travis_retry travis/before-install.sh
-install:
-- travis_retry travis/install.sh
+sudo: false
+python: 3.6
+env:
+  - PKG_NAME=optimix
+addons:
+  apt:
+    packages:
+    - pandoc
 script:
-- travis_retry travis/script.sh
-after_success:
-- travis_retry travis/after-success.sh
+  - bash <(curl -fsSL https://raw.githubusercontent.com/horta/ci/master/travis.sh)
 notifications:
   email:
     recipients:
     - danilo.horta@gmail.com
-    on_success: change
+    on_success: never
     on_failure: always
-deploy:
-  provider: pypi
-  user: dhorta
-  password:
-    secure: Fg6zTcl4I6WK4m29VzJJLKLMQ30nOIRPgiUAN0dHHN0XcxZYuLvtxM3me1AlaRnMC4ALM5w+NWzXZt/n3P0ZXI4KtCunv+d0M6HITZYjluJfG595o7BsLItA7ZLSU6+EHRpKpLXKaD7brQcjr4Hdjdy+ty2rZaTcJIfoe2zoI1Vap/wDrzwvx90ob83JY2ZoAA9nnR8Kk4UkkULLbkqh/V9vn9fRlo/R6e0WzkmDDObXFUxeYsJQWaTsZ70d2gvpeGq+u8mLYe2udm2zIW8xCfDpwH2M15tNRppMlzuDwJmP65zFI8AQcg20Wz22skMQ4fvSW6DUTEl5UXHEcc+RyZWr4Ek0L7CvzVkdxWV2H7rGt6vCIq/I8KJGcpJcM0/vibONp1evIPaqRtgzix8EbNw9ypejd2x57AUoDmke5mR/SrIx0f7aMFWMXpYax6eXRQHIALBo35wcjdZXMCCBEjiHpY5FkHZaSylhEKA42ZKjMSQJnUMCVvjLxXMWzvnZfNz3uPm+PAFrSRkgasWPEnQT9/51QCikjbm0gmGwP7mUD3l7z8EYpSYEKtZrOyLLZkRvpM/N+0ALeXKzeH11bC5fk1LpMzw3uqTapxcYUNvOvo6f82A99vt6Mmxir0v5Xkpe6I34qhuikZPgREPLe8KF3QB85321zsdg5zOpiF8=
-  on:
-    tags: true
-    repo: limix/scipy-sugar
-    branch: master
-env:
-  global:
-  - secure: enuW0ZSAo3Wpw58yk6lcSrLP6wgA9zT3/us5nosY/g6UF3//WjdslIB2qfuLv2gCZ5cH4Q2WDXRcXVijnqrruMHHjCpaXWWC5GGVjYWqtdc1OkIIFSKsxqKIVc8ykK7unONgH//vYmQc17M50li/bUveBz1tfnR8empQGtDttNuul313R5o6YLPtWzjJvd/FL1kX1ELa0DMha+pOCBhPLYZZMnxnYtaNqZQYUHnQKA+pnFYQ0icuSfCIbe0LsQShdz8zAuv6F0MXh+f0/kP1Hq74BZORA44zqlpJRARM98ov/jdj65TNA6+D8tVA3ksJlYzxlmA9dJ6LsIU6Y9cncfGis1UsEyP/j/MfJxw3O1KPoVDC+7QLWbbe7zLVK3HLRmhGZk6yWB+X+S01IiJdRqY++A1iJO7Jrkb3eFp/d9i8iDYiFgCHbItbHeKCY0f2RuR4TEwiaInBfpVsgINWJrOsw3W9Y/HFeF1RzvHVjqHFToruoz1i7ZPTZsUWJdVYG4qyEOs8BNdmPlQTzLp3lOtcULP91Bze+s8IlV4m3GPC4I6CXrIiI7+hbEsWhjpNJ1fsJIQVlGFnQzHT2F52jXWOrEKB7JeZx6emtZgOeQq8+dcXsMHU7x7SySalW7Tf+Qq4GjF1tYcH1q4KNuYUSuV7D7hI3yl8S0GKvLha5k0=
-  - PKG_NAME=scipy_sugar

LICENSE.txt → LICENSE.md

@@ -1,13 +1,14 @@
-MIT License
+The MIT License (MIT)
+=====================
 
-Copyright (c) 2017 Danilo Horta
+Copyright (c) `2018` `Danilo Horta`
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.

MANIFEST.in

@@ -1,4 +1,3 @@
-include LICENSE.txt
-include README.rst
-include requirements.txt
-include test-requirements.txt
+include LICENSE.md
+include README.md
+include version.py

README.md

@@ -0,0 +1,31 @@
+# scipy-sugar
+
+[![Travis](https://img.shields.io/travis/limix/scipy-sugar.svg?style=flat-square&label=linux%20%2F%20macos%20build)](https://travis-ci.org/limix/scipy-sugar) [![AppVeyor](https://img.shields.io/appveyor/ci/Horta/scipy-sugar.svg?style=flat-square&label=windows%20build)](https://ci.appveyor.com/project/Horta/scipy-sugar) [![Read the Docs (version)](https://img.shields.io/readthedocs/scipy-sugar/stable.svg?style=flat-square)](http://scipy-sugar.readthedocs.io/)
+
+Missing SciPy functionalities.
+
+## Install
+
+Enter
+
+```bash
+pip install scipy-sugar
+```
+
+from the command-line.
+
+## Running the tests
+
+Enter
+
+```python
+python -c "import scipy_sugar; scipy_sugar.test()"
+```
+
+## Authors
+
+* [Danilo Horta](https://github.com/horta)
+
+## License
+
+This project is licensed under the [MIT License](https://raw.githubusercontent.com/limix/scipy-sugar/master/LICENSE.md).

doc/Makefile

@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
+SPHINXBUILD   = python -msphinx
 SPHINXPROJ    = scipy-sugar
 SOURCEDIR     = .
 BUILDDIR      = _build
@@ -17,4 +17,4 @@ help:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

doc/conf.py

@@ -1,56 +1,65 @@
-from __future__ import unicode_literals
-
-import re
-from importlib import import_module
-from os import getenv
-from os.path import dirname, join, realpath
-from time import strftime
+import os
+import sys
 
 import sphinx_rtd_theme
-from setuptools import find_packages
 
+sys.path.insert(0, os.path.abspath('..'))
 
-def get_init_metadata(name):
-    expr = re.compile(r"__%s__ *= *\"(.*)\"" % name)
 
-    dir_path = dirname(realpath(__file__))
-    pkgname = find_packages(where=join(dir_path, '..'))[0]
+def get_version():
+    import scipy_sugar
+    return scipy_sugar.__version__
 
-    data = open(join("..", pkgname, "__init__.py")).read()
 
-    return re.search(expr, data).group(1).strip()
+extensions = [
+    'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.viewcode',
+    'sphinx.ext.intersphinx', 'sphinx.ext.napoleon'
+]
 
+templates_path = ['_templates']
 
-if getenv("READTHEDOCS", "False") == "True":
+source_suffix = '.rst'
 
-    prjname = getenv("READTHEDOCS_PROJECT", "unknown")
-    pkgname = prjname.replace("-", "_")
-    pkg = import_module(pkgname)
+master_doc = 'index'
 
-    project = pkg.__name__
-    version = pkg.__version__
-    author = pkg.__author__
-else:
-    project = get_init_metadata('name')
-    version = get_init_metadata('version')
-    author = get_init_metadata('author')
+project = 'ndarray-listener'
+copyright = '2018, Danilo Horta'
+author = 'Danilo Horta'
 
-extensions = [
-    'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx',
-    'sphinx.ext.coverage', 'sphinx.ext.viewcode', 'sphinx.ext.napoleon',
-    'sphinx.ext.mathjax'
-]
-napoleon_google_docstring = True
-master_doc = 'index'
-copyright = '%s, %s' % (strftime("%Y"), author)
+version = get_version()
 release = version
-language = "en"
+
+language = None
+
 exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', 'conf.py']
+
 pygments_style = 'sphinx'
+
+todo_include_todos = False
+
 html_theme = 'sphinx_rtd_theme'
 html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+
+html_sidebars = {
+    '**': [
+        'relations.html',
+        'searchbox.html',
+    ]
+}
+
+htmlhelp_basename = 'ndarray-listenerdoc'
+
+man_pages = [(master_doc, 'ndarray-listener', 'ndarray-listener Documentation',
+              [author], 1)]
+
+epub_title = project
+epub_author = author
+epub_publisher = author
+epub_copyright = copyright
+
+epub_exclude_files = ['search.html']
+
 intersphinx_mapping = {
     'python': ('http://docs.python.org/', None),
     'numpy': ('http://docs.scipy.org/doc/numpy/', None),
-    'pandas': ('http://pandas.pydata.org/pandas-docs/stable/', None)
 }

doc/make.bat

@@ -5,7 +5,7 @@ pushd %~dp0
 REM Command file for Sphinx documentation
 
 if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
+	set SPHINXBUILD=python -msphinx
 )
 set SOURCEDIR=.
 set BUILDDIR=_build
@@ -16,10 +16,10 @@ if "%1" == "" goto help
 %SPHINXBUILD% >NUL 2>NUL
 if errorlevel 9009 (
 	echo.
-	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-	echo.installed, then set the SPHINXBUILD environment variable to point
-	echo.to the full path of the 'sphinx-build' executable. Alternatively you
-	echo.may add the Sphinx directory to PATH.
+	echo.The Sphinx module was not found. Make sure you have Sphinx installed,
+	echo.then set the SPHINXBUILD environment variable to point to the full
+	echo.path of the 'sphinx-build' executable. Alternatively you may add the
+	echo.Sphinx directory to PATH.
 	echo.
 	echo.If you don't have Sphinx installed, grab it from
 	echo.http://sphinx-doc.org/

requirements.txt

@@ -1,2 +1,11 @@
-numpy
-scipy>=0.19.1
+numpy>=1.14.0
+optimix>=1.2.22
+pypandoc>=1.4
+pytest-pep8>=1.0.6
+pytest-runner>=3.0
+pytest>=3.2.5
+scipy>=1.0.0
+setuptools>=38.4.0
+sphinx_rtd_theme>=0.2.4
+sphinx>=1.6.6
+toolz>=0.9.0

scipy_sugar/__init__.py

@@ -3,12 +3,6 @@
 from . import stats
 from .testit import test
 
-__name__ = "scipy-sugar"
-__version__ = "1.0.4"
-__author__ = "Danilo Horta"
-__author_email__ = "horta@ebi.ac.uk"
+__version__ = "1.0.5"
 
-__all__ = [
-    "__name__", "__version__", "__author__", "__author_email__", "test",
-    "stats"
-]
+__all__ = ["__version__", "test", "stats"]