From da18bb074a20d6a469c6d6c8a827d063fa60e0bb Mon Sep 17 00:00:00 2001 From: Dinos Kousidis Date: Thu, 19 Apr 2018 14:10:18 +0200 Subject: [PATCH] global: addition of requirements-dev.txt * ADDS requirements-dev.txt and modifies .travis.yml to use requirements-builder Signed-off-by: Dinos Kousidis --- .travis.yml | 14 ++++++++++++-- requirements-dev.txt | 23 +++++++++++++++++++++++ setup.cfg | 3 +++ setup.py | 4 ++-- 4 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 requirements-dev.txt diff --git a/.travis.yml b/.travis.yml index 2c7fea7e..0ac6007f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,11 @@ language: python cache: - pip +env: + - REQUIREMENTS=lowest EXTRAS=all + - REQUIREMENTS=release EXTRAS=all + - REQUIREMENTS=devel EXTRAS=all + python: - "2.7" @@ -36,10 +41,15 @@ matrix: before_install: - travis_retry pip install --upgrade pip setuptools py - - travis_retry pip install twine wheel coveralls + - travis_retry pip install twine wheel coveralls requirements-builder + - requirements-builder -e $EXTRAS --level=min setup.py > .travis-lowest-requirements.txt + - requirements-builder -e $EXTRAS --level=pypi setup.py > .travis-release-requirements.txt + - requirements-builder -e $EXTRAS --level=dev --req requirements-dev.txt setup.py > .travis-devel-requirements.txt install: - - travis_retry pip install -e .[all] + - pip install -r requirements-dev.txt + - travis_retry pip install -r .travis-${REQUIREMENTS}-requirements.txt + - travis_retry pip install -e .[$EXTRAS] script: - ./run-tests.sh diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 00000000..319160ad --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# +# This file is part of REANA. +# Copyright (C) 2018 CERN. +# +# REANA is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# REANA is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# REANA; if not, write to the Free Software Foundation, Inc., 59 Temple Place, +# Suite 330, Boston, MA 02111-1307, USA. +# +# In applying this license, CERN does not waive the privileges and immunities +# granted to it by virtue of its status as an Intergovernmental Organization or +# submit itself to any jurisdiction. + +-e git+git://github.com/reanahub/reana-commons.git#egg=reana-commons diff --git a/setup.cfg b/setup.cfg index a2eaa1e5..eebe5eb1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,3 +28,6 @@ all_files = 1 [bdist_wheel] universal = 1 + +[pydocstyle] +add_ignore = D401 diff --git a/setup.py b/setup.py index 27bb9cd1..2d8b55b3 100644 --- a/setup.py +++ b/setup.py @@ -35,6 +35,7 @@ tests_require = [ 'check-manifest>=0.25', 'coverage>=4.0', + 'docutils==0.12', 'httpretty>=0.8', 'isort>=4.2.2', 'pydocstyle>=1.0.0', @@ -66,14 +67,13 @@ install_requires = [ 'bravado>=9.0.6', 'click>=6.7', - 'cwltool', + 'cwltool==1.0.20180326152342', 'yadage-schemas==0.7.16', 'pyOpenSSL==17.3.0', # FIXME remove once yadage-schemas solves deps. 'rfc3987==1.3.7', # FIXME remove once yadage-schemas solves deps. 'strict-rfc3339==0.7', # FIXME remove once yadage-schemas solves deps. 'tablib>=0.12.1', 'webcolors==1.7', # FIXME remove once yadage-schemas solves deps. - 'reana-commons', ] packages = find_packages()