Skip to content

Commit

Permalink
setup: use extras_require instead of requirements.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
mdeff committed Sep 3, 2017
1 parent c2f693a commit e8ac827
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 42 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ addons:

install:
- pip install -U pip setuptools
- pip install -U -r requirements.txt
- pip install .
- pip install -U .[test,doc]

script:
# - make lint
Expand Down
6 changes: 2 additions & 4 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ tests for any new code.
The package can be set up (ideally in a virtual environment) for local
development with the following::

$ git clone git@github.com:epfl-lts2/pygsp.git
$ pip install -U -r pygsp/requirements.txt
$ pip install -e pygsp
$ git clone https://github.com/epfl-lts2/pygsp.git
$ pip install -U -e pygsp[test,doc,pkg]

You can improve or add functionality in the ``pygsp`` folder, along with
corresponding unit tests in ``pygsp/tests/test_*.py`` (with reasonable
Expand Down Expand Up @@ -45,7 +44,6 @@ Repository organization
LICENSE.txt Project license
*.rst Important documentation
Makefile Targets for make
requirements.txt List of packages installed by pip (strong dep in setup.py)
setup.py Meta information about package (published on PyPI)
.gitignore Files ignored by the git revision control system
.travis.yml Defines testing on Travis continuous integration
Expand Down
31 changes: 0 additions & 31 deletions requirements.txt

This file was deleted.

29 changes: 24 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
long_description=open('README.rst').read(),
author='EPFL LTS2',
url='https://github.com/epfl-lts2/pygsp',
packages=['pygsp',
'pygsp.graphs',
'pygsp.graphs.nngraphs',
'pygsp.filters',
'pygsp.tests'],
packages=[
'pygsp',
'pygsp.graphs',
'pygsp.graphs.nngraphs',
'pygsp.filters',
'pygsp.tests',
],
package_data={'pygsp': ['data/pointclouds/*.mat']},
test_suite='pygsp.tests.test_all.suite',
install_requires=[
Expand All @@ -32,6 +34,23 @@
'pyflann; python_version == "2.*"',
'pyflann3; python_version == "3.*"',
],
extras_require={
'test': [
'flake8',
'coverage',
'coveralls',
],
'doc': [
'sphinx',
'numpydoc',
'sphinxcontrib-bibtex',
'sphinx-rtd-theme',
],
'pkg': [
'wheel',
'twine',
],
},
license="BSD",
keywords='graph signal processing',
platforms='any',
Expand Down

0 comments on commit e8ac827

Please sign in to comment.