Skip to content

Commit

Permalink
merge all the extra requirements in a single dev requirement
Browse files Browse the repository at this point in the history
  • Loading branch information
mdeff committed Feb 25, 2019
1 parent 1e1a55f commit 294a227
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 17 deletions.
3 changes: 1 addition & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ python:
version: 3
pip_install: true
extra_requirements:
- alldeps
- doc
- dev
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ addons:
- libqt5gui5 # pyqt5>5.11 fails to load the xcb platform plugin without it

install:
- pip install -U --upgrade-strategy eager .[alldeps,test,doc]
# Update dependencies (e.g. numpy formatting changed in v1.14).
- pip install --upgrade --upgrade-strategy eager .[dev]
# Upgrade to test with the latest version of our dependencies.

script:
# - make lint
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The package can be set up (ideally in a virtual environment) for local
development with the following::

$ git clone https://github.com/epfl-lts2/pygsp.git
$ pip install -U -e pygsp[alldeps,test,doc,pkg]
$ pip install -U -e pygsp[dev]

You can improve or add functionality in the ``pygsp`` folder, along with
corresponding unit tests in ``pygsp/tests/test_*.py`` (with reasonable
Expand Down
1 change: 1 addition & 0 deletions doc/history.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ History
* New implementation of the Sensor graph that is simpler and scales better.
* A new learning module with three functions to solve standard semi-supervised
classification and regression problems.
* Merged all the extra requirements in a single dev requirement.

Experimental filter API (to be tested and validated):

Expand Down
2 changes: 1 addition & 1 deletion postBuild
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
# Tell https://mybinder.org to simply install the package.
pip install .[alldeps]
pip install .[dev]
17 changes: 6 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@
'scipy',
],
extras_require={
# Optional dependencies for some functionalities.
'alldeps': (
# Optional dependencies for development. Some bring additional
# functionalities, others are for testing, documentation, or packaging.
'dev': [
# Import and export.
'networkx',
# Construct patch graphs from images.
Expand All @@ -51,22 +52,16 @@
'PyQt5; python_version >= "3.5"',
# No source package for PyQt5 on PyPI, fall back to PySide.
'PySide; python_version < "3.5"',
),
# Testing dependencies.
'test': [
# Run the tests.
'flake8',
'coverage',
'coveralls',
],
# Dependencies to build the documentation.
'doc': [
# Build the documentation.
'sphinx',
'numpydoc',
'sphinxcontrib-bibtex',
'sphinx-rtd-theme',
],
# Dependencies to build and upload packages.
'pkg': [
# Build and upload packages.
'wheel',
'twine',
],
Expand Down

0 comments on commit 294a227

Please sign in to comment.