diff --git a/.readthedocs.yml b/.readthedocs.yml index c6869239..5cbbda17 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -5,5 +5,4 @@ python: version: 3 pip_install: true extra_requirements: - - alldeps - - doc + - dev diff --git a/.travis.yml b/.travis.yml index 9cf279cc..abc735d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 63604dcf..f2ed7790 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -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 diff --git a/doc/history.rst b/doc/history.rst index fa6cd4d6..d1a1c15a 100644 --- a/doc/history.rst +++ b/doc/history.rst @@ -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): diff --git a/postBuild b/postBuild index 6eb53a4d..e1530e8e 100755 --- a/postBuild +++ b/postBuild @@ -1,3 +1,3 @@ #!/bin/bash # Tell https://mybinder.org to simply install the package. -pip install .[alldeps] +pip install .[dev] diff --git a/setup.py b/setup.py index e1b6419f..3fd7e2cb 100644 --- a/setup.py +++ b/setup.py @@ -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. @@ -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', ],