diff --git a/.gitignore b/.gitignore index a83421039f..0c1eb709f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.coverage *.linkinfo *.o *.orig diff --git a/.travis.yml b/.travis.yml index 1513f0c7be..d3129a32be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,15 +59,16 @@ before_install: install: - conda create --yes -q -n pyenv python=$TRAVIS_PYTHON_VERSION - conda activate pyenv - - conda install --yes -q mkl numpy scipy pip flake8 six pep8 pyflakes sphinx mkl-service graphviz cython - - python -m pip install -q pydot-ng sphinx_rtd_theme pytest pytest-cov>=2.6.1 coveralls sympy - - python -m pip install --no-deps --upgrade -e . + - conda install --yes -q mkl numpy scipy pip mkl-service graphviz cython libgpuarray pygpu + - pip install -q -r requirements.txt + - conda list && pip freeze + - python -c 'import theano; print(theano.config.__str__(print_doc=False))' + - python -c 'import theano; assert(theano.config.blas.ldflags != "")' jobs: include: - stage: lint script: - - pip install black - black -t py36 --check theano/ tests/ setup.py - flake8 - &normaltest @@ -92,19 +93,8 @@ script: - export MKL_THREADING_LAYER=GNU - export MKL_NUM_THREADS=1 - export OMP_NUM_THREADS=1 - - which python - - python --version - - uname -a - - free -m - - df -h - - ulimit -a - echo "$PART" - # Print information to help debug problems - - python -c 'import numpy; print(numpy.__version__)' - - python -c 'import theano; print(theano.__version__)' - - python -c 'import theano; print(theano.config.__str__(print_doc=False))' - - python -c 'import theano; assert(theano.config.blas.ldflags != "")' - - pytest -x -r A --verbose --runslow --cov=theano/ --cov-append --no-cov-on-fail $PART || travis_terminate 1 + - pytest -x -r A --verbose --runslow --cov=theano/ --cov-append --no-cov-on-fail $PART after_success: - coveralls diff --git a/doc/install_generic.inc b/doc/install_generic.inc index 6f5a3f3f2a..a20a32c4fa 100644 --- a/doc/install_generic.inc +++ b/doc/install_generic.inc @@ -44,9 +44,9 @@ Install the latest stable version of Theano with: - Use :blue:`user` for a user installation without admin rights. It will install Theano in your local site-packages. -- [test] will install the requirements for testing. +- Use `pip install -r requirements.txt` to install the requirements for testing. -- [doc] will install the requirements in order to generate the documentation. +- Use `pip install -r requirements-rtd.txt` install the requirements for generating the documentation. If you encountered any trouble, head to the :ref:`troubleshooting` page. diff --git a/requirement-rtd.txt b/requirements-rtd.txt similarity index 70% rename from requirement-rtd.txt rename to requirements-rtd.txt index adc77e921d..97eb1a6c44 100644 --- a/requirement-rtd.txt +++ b/requirements-rtd.txt @@ -1,9 +1,12 @@ +-e ./ sphinx>=1.3.0 +sphinx_rtd_theme pygments pytest numpy gnumpy pydot pydot2 +pydot-ng Cython scipy==0.13 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000000..da36791565 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,12 @@ +-e ./ +flake8 +pep8 +pyflakes +black==20.8b1 +pytest-cov>=2.6.1 +coverage>=5.1 +pytest +coveralls +cython +sympy +versioneer diff --git a/setup.py b/setup.py index b803f50f95..bbed9ddfcb 100755 --- a/setup.py +++ b/setup.py @@ -107,10 +107,6 @@ def do_setup(): packages=find_packages(), cmdclass=versioneer.get_cmdclass(), install_requires=["numpy>=1.9.1", "scipy>=0.14", "six>=1.9.0"], - extras_require={ - "test": ["pytest", "flake8", "black"], - "doc": ["Sphinx>=0.5.1", "pygments"], - }, package_data={ "": [ "*.txt",