Skip to content

Commit

Permalink
Merge pull request #73 from rgommers/metadata
Browse files Browse the repository at this point in the history
MAINT: documentation and metadata update for repo fork
  • Loading branch information
grlee77 committed Jul 27, 2015
2 parents 3a44095 + 5c444c9 commit 973b858
Show file tree
Hide file tree
Showing 9 changed files with 167 additions and 105 deletions.
58 changes: 47 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,59 @@
# After changing this file, check it on:
# http://lint.travis-ci.org/
language: python
sudo: false
matrix:
include:
- python: 2.7
env:
- PYFLAKES=1
- PEP8=1
- NUMPYSPEC=numpy
before_install:
- pip install pep8==1.5.1
- pip install pyflakes
script:
- PYFLAKES_NODOCTEST=1 pyflakes pywt demo | grep -E -v 'unable to detect undefined names|assigned to but never used|imported but unused|redefinition of unused' > test.out; cat test.out; test \! -s test.out
- pep8 pywt demo

python:
- 2.6
- 3.3
- python: 3.5-dev
env:
- NUMPYSPEC=numpy
- python: 3.4
env:
- NUMPYSPEC=numpy
- python: 3.3
env:
- NUMPYSPEC=numpy
- python: 2.6
env:
- OPTIMIZE=-OO
- NUMPYSPEC="numpy==1.6.2"
- python: 2.7
env:
- NUMPYSPEC="--upgrade git+git://github.com/numpy/numpy.git@v1.9.1"

addons:
apt:
packages:
- ccache
cache:
directories:
- $HOME/.ccache

before_install:
- export PATH=/usr/lib/ccache:$PATH
- uname -a
- free -m
- df -h
- ulimit -a
- pip install -q --use-mirrors Cython numpy
# For Python 2.6 we also need argparse
- pip install argparse
# Speed up install by not compiling Cython
- travis_retry pip install --install-option="--no-cython-compile" Cython==0.22
- travis_retry pip install $NUMPYSPEC
- travis_retry pip install nose
- pip install coverage
- pip install coveralls
- python -V
- set -o pipefail

script:
- python runtests.py -g -m full --coverage

after_success:
- coveralls
- python -u $OPTIMIZE runtests.py -g -m full --coverage
5 changes: 5 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
Changelog

0.3.0
A major refactoring, providing support for Python 3.x while maintaining
full backwards compatiblity.
Development has moved to https://github.com/rgommers/pywt

0.2.2
maintenance release:
- resolved setup and build issues
Expand Down
92 changes: 54 additions & 38 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,37 @@ PyWavelets is a free Open Source wavelet transform software for Python_
programming language. It is written in Python, Cython and C for a mix of easy
and powerful high-level interface and the best performance.

PyWavelets is very easy to start with and use, and currently is capable of:
PyWavelets is very easy to start with and use. Just install the package, open
the Python interactive shell and type:

* 1D and 2D Forward and Inverse Discrete Wavelet Transform (DWT and IDWT)
.. sourcecode:: python

>>> import pywt
>>> cA, cD = pywt.dwt([1, 2, 3, 4], 'db1')

Voilà! Computing wavelet transforms never before has been so simple :)

Main features
-------------

The main features of PyWavelets are:

* 1D, 2D and nD Forward and Inverse Discrete Wavelet Transform (DWT and IDWT)
* 1D and 2D Stationary Wavelet Transform (Undecimated Wavelet Transform)
* 1D and 2D Wavelet Packet decomposition and reconstruction
* Approximating wavelet and scaling functions
* Over seventy built-in wavelet filters and custom wavelets supported
* Over seventy `built-in wavelet filters`_
and custom wavelets supported
* Single and double precision calculations
* Results compatibility with Matlab Wavelet Toolbox (tm)

.. image::
https://secure.travis-ci.org/rgommers/pywt.png?branch=master
:alt: Build Status
:target: https://secure.travis-ci.org/rgommers/pywt

* Results compatible with Matlab Wavelet Toolbox |tm|

Requirements
------------

PyWavelets is a package for the Python programming language. It requires:

- Python_ 2.6, 2.7 or >=3.2
- Numpy_
- Python_ 2.6, 2.7 or >=3.3
- Numpy_ >= 1.6.2

Download
--------
Expand All @@ -36,18 +44,16 @@ The most recent *development* version can be found on GitHub at
https://github.com/rgommers/pywt.

Latest release, including source and binary package for Windows, is available
for download from the `Python Package Index`_. Note that the official release
is quite old and doesn't yet support Python 3.
for download from the `Python Package Index`_ or on
`https://github.com/rgommers/pywt/releases`__

Install
-------

In order to build PyWavelets from source, a working C compiler (GCC or MSVC)
and a recent version of Cython_ is required.

- To install PyWavelets open shell prompt and type
``pip install -e git+https://github.com/rgommers/pywt#egg=pywt`` (dev version)
or ``pip install PyWavelets`` (last official release)
- Install PyWavelets with ``pip install PyWavelets``.

- To build and install from source, navigate to downloaded PyWavelets source
code directory and type ``python setup.py install``.
Expand All @@ -59,6 +65,9 @@ Binary packages for several Linux distributors are maintained by Open Source
community contributors. Query your Linux package manager tool
for `python-wavelets`, `python-pywt` or similar package name.

.. seealso:: :ref:`Development notes <dev-index>` section contains more
information on building and installing from source code.

Documentation
-------------

Expand All @@ -68,26 +77,28 @@ http://pywavelets.readthedocs.org.

For more usage examples see the `demo`_ directory in the source package.

Contributing
------------
State of development & Contributing
-----------------------------------

PyWavelets started in 2006 as an academic project for a master thesis
on `Analysis and Classification of Medical Signals using Wavelet Transforms`
but seems to no longer be maintained by its `original developer`_.
This repo contains further development work by multiple contributors.
and was maintained until 2012 by its `original developer`_. In 2013
maintenance was taken over in a new repo (`https://github.com/rgommers/pywt`__)
by a larger development team - a move supported by the original developer.
The repo move doesn't mean that this is a fork - the package continues to be
developed under the name "PyWavelets", and released on PyPi and Github (see
`https://github.com/nigma/pywt/issues/13`__ for the discussion where that was
decided).

All contributions including bug reports, bug fixes, new feature implementations
and documentation improvements are welcome.
and documentation improvements are welcome. Moreover, developers with an
interest in PyWavelets are very welcome to join the development team!


Python 3
--------

Python 2.x and Python 3.x versions are working under the
same code base at https://github.com/rgommers/pywt, as well as the examples.
Check out the `changelog <https://github.com/rgommers/pywt>`_ for
info.

Issues should be reported on https://github.com/rgommers/pywt/issues.
Python 3.x is fully supported from release v0.3.0 on.

Contact
-------
Expand All @@ -100,21 +111,26 @@ License

PyWavelets is a free Open Source software released under the MIT license.

Commercial Support
------------------
Contents
--------

.. toctree::
:maxdepth: 1

For information on commercial support and development one can try to contact
the original developer at en@ig.ma.
ref/index
regression/index
dev/index
resources
contents


.. _built-in wavelet filters: http://wavelets.pybytes.com/
.. _Cython: http://cython.org/
.. _demo: https://github.com/nigma/pywt/tree/master/demo
.. _GitHub: https://github.com/rgommers/pywt/issues
.. _GitHub Issues: https://github.com/nigma/pywt/issues
.. _in-development version: https://github.com/nigma/pywt/tarball/develop#egg=PyWavelets-dev
.. _Numpy: http://numpy.scipy.org/
.. _demo: https://github.com/rgommers/pywt/tree/master/demo
.. _GitHub: https://github.com/rgommers/pywt
.. _GitHub Issues: https://github.com/rgommers/pywt/issues
.. _Numpy: http://www.numpy.org
.. _original developer: http://en.ig.ma
.. _Python: http://python.org/
.. _Python Package Index: http://pypi.python.org/pypi/PyWavelets/
.. _PyWavelets discussions group: http://groups.google.com/group/pywavelets

25 changes: 15 additions & 10 deletions doc/source/dev/testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ Testing
Continous integration with Travis-CI
------------------------------------

The project is using `Travis-CI <http://travis-ci.org/#!/nigma/pywt>`_ service
The project is using `Travis-CI <https://travis-ci.org/rgommers/pywt>`_ service
for continous integration and testing.

Current build status is:

.. image::
https://secure.travis-ci.org/nigma/pywt.png?branch=develop
https://secure.travis-ci.org/rgommers/pywt.png?branch=develop
:alt: Build Status
:target: https://secure.travis-ci.org/nigma/pywt
:target: https://secure.travis-ci.org/rgommers/pywt


If you are submitting a patch or pull request please make sure it
Expand All @@ -24,18 +24,23 @@ does not break the build.
Running tests locally
---------------------

Simply::
Tests are implemented with `nose`_, so use one of:

python setup.py test
$ nosetests pywt

>>> pywt.test()


Running tests with Tox
----------------------

There's also a config file for running tests with Tox (``pip install tox``)::
There's also a config file for running tests with `Tox`_ (``pip install tox``).
To for example run tests for Python 2.7 and Python 3.4 use::

tox -e py27,py34

For more information see the `Tox`_ documentation.

tox

It is not however very convenient at the moment because Tox recreates
the test environment (which is a good thing) and builds numpy from
source on every run (which takes a lot of time).
.. _nose: http://nose.readthedocs.org/en/latest/
.. _Tox: http://tox.testrun.org/
Loading

0 comments on commit 973b858

Please sign in to comment.