Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-6-add-tox-and-travis-files [created] e267021bf


ARIA-6 Add tox.ini and .travis files for CI

The files actually existed but were out of date.
Both are now up to date. Tox will take care of installing both
code requirements and tests requirements before running the tests.

Additional changes:

 - several setup.py changes (set version to 0.1.0; updated email)

 - minor changes to tests' requirements (removed tox, froze mock)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/e267021b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/e267021b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/e267021b

Branch: refs/heads/ARIA-6-add-tox-and-travis-files
Commit: e267021bfe0a62f97f7550daa3906e20c9022b70
Parents: f380043
Author: Ran Ziv <[email protected]>
Authored: Tue Oct 25 17:47:35 2016 +0300
Committer: Ran Ziv <[email protected]>
Committed: Tue Oct 25 17:47:35 2016 +0300

----------------------------------------------------------------------
 .travis.yml            | 31 +++++++++++++++++++++++--------
 setup.py               |  6 +++---
 tests/requirements.txt |  3 +--
 tox.ini                | 38 +++++++++++++++++++++++++++++++-------
 4 files changed, 58 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e267021b/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 381cf43..3f07b8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,29 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 sudo: false
 language: python
 python:
-    - "2.7"
+  - "2.7"
 env:
-    - TOX_ENV=pylint_package
-    - TOX_ENV=pylint_tests
-    - TOX_ENV=py26
-    - TOX_ENV=py27
+- TOX_ENV=pylint_code
+- TOX_ENV=pylint_tests
+- TOX_ENV=py27
+- TOX_ENV=py26
 install:
-    - pip install tox==1.6.1
+  - pip install --upgrade pip
+  - pip install tox
 script:
-    - tox -e $TOX_ENV
-
+  - pip --version
+  - tox --version
+  - tox -e $TOX_ENV

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e267021b/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index b7978fe..811810b 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ if (sys.version_info[0], sys.version_info[1]) not in 
_PYTHON_SUPPORTED_VERSIONS:
         '{0} Package support Python version 2.6 & 2.7 Only'.format(
             _PACKAGE_NAME))
 
-version = '0.0.1'
+version = '0.1.0'
 execfile(os.path.join('.', _PACKAGE_NAME, 'VERSION.py'))
 
 
@@ -45,10 +45,10 @@ setup(
     name=_PACKAGE_NAME,
     version=version,
     author='aria-core',
-    author_email='[email protected]',
+    author_email='[email protected]',
     packages=find_packages(exclude=('*tests*',)),
     license='LICENSE',
-    description='Aria Project',
+    description='ARIA Project',
     zip_safe=False,
     install_requires=install_requires,
     entry_points={

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e267021b/tests/requirements.txt
----------------------------------------------------------------------
diff --git a/tests/requirements.txt b/tests/requirements.txt
index f3443d1..d9b5527 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,6 +1,5 @@
-mock>=1.0.1
 testtools
-tox==1.6.1
+mock==1.0.1
 pylint==1.5.5
 pytest==3.0.2
 pytest-cov==2.3.1

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/e267021b/tox.ini
----------------------------------------------------------------------
diff --git a/tox.ini b/tox.ini
index bc7fb8f..8c3718a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,39 @@
-# content of: tox.ini , put in same dir as setup.py
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 [tox]
-envlist=pylint_package,pylint_tests,py27
+envlist=py27,py26,pylint_code,pylint_tests
 
 [testenv]
-deps =-r{toxinidir}/tests/requirements.txt
+deps =
+    -rrequirements.txt
+    -r{toxinidir}/tests/requirements.txt
+basepython =
+  py26: python2.6
+  py27: python2.7
 
 [testenv:py27]
-commands=py.test tests --cov-report term-missing --cov aria
+commands=pytest aria/tests --cov-report term-missing --cov aria
+
+[testenv:py26]
+commands=pytest aria/tests --cov-report term-missing --cov aria
 
-[testenv:pylint_package]
-commands=pylint aria --rcfile=.pylintrc --disable=cyclic-import,fixme
+[testenv:pylint_code]
+deps =
+    pylint
+commands=pylint aria --rcfile=aria/.pylintrc
 
 [testenv:pylint_tests]
-commands=pylint tests --rcfile=.pylintrc 
--disable=invalid-name,too-many-statements,too-few-public-methods,too-many-lines,too-many-public-methods,unused-argument,line-too-long,no-member,too-many-locals,duplicate-code,too-many-branches,too-many-arguments,fixme
+deps =
+    pylint
+commands=pylint tests --rcfile=tests/.pylintrc

Reply via email to