From a598edd8b677dfddc968a9e155423d0b9e42b1ce Mon Sep 17 00:00:00 2001 From: guzman-raphael Date: Fri, 4 Oct 2019 15:03:08 -0500 Subject: [PATCH 1/9] Disable nosetests. --- .travis.yml | 96 ++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/.travis.yml b/.travis.yml index c25fe003f..305c98453 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,54 +16,54 @@ main: &main - docker-compose -f LNX-docker-compose.yml up --build --exit-code-from dj jobs: include: - - <<: *main - env: - - PY_VER: "3.8-rc" - - MYSQL_VER: "5.7" - - <<: *main - env: - - PY_VER: "3.7" - - MYSQL_VER: "5.7" - - <<: *main - env: - - PY_VER: "3.6" - - MYSQL_VER: "5.7" - - <<: *main - env: - - PY_VER: "3.5" - - MYSQL_VER: "5.7" - - <<: *main - env: - - PY_VER: "3.8-rc" - - MYSQL_VER: "8.0" - - <<: *main - env: - - PY_VER: "3.7" - - MYSQL_VER: "8.0" - - <<: *main - env: - - PY_VER: "3.6" - - MYSQL_VER: "8.0" - - <<: *main - env: - - PY_VER: "3.5" - - MYSQL_VER: "8.0" - - <<: *main - env: - - PY_VER: "3.8-rc" - - MYSQL_VER: "5.6" - - <<: *main - env: - - PY_VER: "3.7" - - MYSQL_VER: "5.6" - - <<: *main - env: - - PY_VER: "3.6" - - MYSQL_VER: "5.6" - - <<: *main - env: - - PY_VER: "3.5" - - MYSQL_VER: "5.6" + # - <<: *main + # env: + # - PY_VER: "3.8-rc" + # - MYSQL_VER: "5.7" + # - <<: *main + # env: + # - PY_VER: "3.7" + # - MYSQL_VER: "5.7" + # - <<: *main + # env: + # - PY_VER: "3.6" + # - MYSQL_VER: "5.7" + # - <<: *main + # env: + # - PY_VER: "3.5" + # - MYSQL_VER: "5.7" + # - <<: *main + # env: + # - PY_VER: "3.8-rc" + # - MYSQL_VER: "8.0" + # - <<: *main + # env: + # - PY_VER: "3.7" + # - MYSQL_VER: "8.0" + # - <<: *main + # env: + # - PY_VER: "3.6" + # - MYSQL_VER: "8.0" + # - <<: *main + # env: + # - PY_VER: "3.5" + # - MYSQL_VER: "8.0" + # - <<: *main + # env: + # - PY_VER: "3.8-rc" + # - MYSQL_VER: "5.6" + # - <<: *main + # env: + # - PY_VER: "3.7" + # - MYSQL_VER: "5.6" + # - <<: *main + # env: + # - PY_VER: "3.6" + # - MYSQL_VER: "5.6" + # - <<: *main + # env: + # - PY_VER: "3.5" + # - MYSQL_VER: "5.6" - stage: Coverage os: linux language: shell From f1626de5dd9397cdd68f8c3fbf76913e03f5b522 Mon Sep 17 00:00:00 2001 From: guzman-raphael Date: Fri, 4 Oct 2019 15:10:38 -0500 Subject: [PATCH 2/9] Update image for coveralls. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 305c98453..e86156c3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,8 +65,8 @@ jobs: # - PY_VER: "3.5" # - MYSQL_VER: "5.6" - stage: Coverage - os: linux - language: shell + dist: xenial + language: python script: - sudo pip install python-coveralls - coverage run --source=datajoint setup.py tests From 90221b8a113c2a3c75b8856e860a9bf667639e73 Mon Sep 17 00:00:00 2001 From: guzman-raphael Date: Fri, 4 Oct 2019 15:14:18 -0500 Subject: [PATCH 3/9] Fix typo. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e86156c3a..be281c3c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,5 +69,5 @@ jobs: language: python script: - sudo pip install python-coveralls - - coverage run --source=datajoint setup.py tests + - coverage run --source=datajoint setup.py test - coveralls From b3fd260099cf2581e4790b14e1dbda50fa6b1538 Mon Sep 17 00:00:00 2001 From: guzman-raphael Date: Fri, 4 Oct 2019 15:26:25 -0500 Subject: [PATCH 4/9] Modify coverall package. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index be281c3c1..6fa46e8f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,6 +68,6 @@ jobs: dist: xenial language: python script: - - sudo pip install python-coveralls - - coverage run --source=datajoint setup.py test + - pip install --user coveralls + # - coverage run --source=datajoint setup.py test - coveralls From bf7c1fb3db75df813c9b3cfde06adc2f81d539f4 Mon Sep 17 00:00:00 2001 From: guzman-raphael Date: Fri, 4 Oct 2019 15:28:59 -0500 Subject: [PATCH 5/9] Modify coverall package again. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6fa46e8f6..84af8fcc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,6 +68,6 @@ jobs: dist: xenial language: python script: - - pip install --user coveralls + - pip install coveralls # - coverage run --source=datajoint setup.py test - coveralls From 0c8d1505810439bcda93fe43ca67464b8bc01a1d Mon Sep 17 00:00:00 2001 From: guzman-raphael Date: Fri, 4 Oct 2019 15:34:16 -0500 Subject: [PATCH 6/9] Add coverage job. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 84af8fcc0..9b1ce675c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,5 +69,5 @@ jobs: language: python script: - pip install coveralls - # - coverage run --source=datajoint setup.py test + - coverage run --source=datajoint setup.py test - coveralls From 5cc0f0dac798494d16f91fe5df5bfec5276927f9 Mon Sep 17 00:00:00 2001 From: guzman-raphael Date: Fri, 4 Oct 2019 15:40:28 -0500 Subject: [PATCH 7/9] Update to Python3.7. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9b1ce675c..18536a874 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,6 +67,7 @@ jobs: - stage: Coverage dist: xenial language: python + python: 3.7 script: - pip install coveralls - coverage run --source=datajoint setup.py test From 024364631e96839a13718393f32255b15e87d782 Mon Sep 17 00:00:00 2001 From: guzman-raphael Date: Fri, 4 Oct 2019 15:49:21 -0500 Subject: [PATCH 8/9] Move coveralls to each test. --- .travis.yml | 104 +++++++++++++++++++---------------------- LNX-docker-compose.yml | 3 +- 2 files changed, 50 insertions(+), 57 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18536a874..5045a4896 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,59 +16,51 @@ main: &main - docker-compose -f LNX-docker-compose.yml up --build --exit-code-from dj jobs: include: - # - <<: *main - # env: - # - PY_VER: "3.8-rc" - # - MYSQL_VER: "5.7" - # - <<: *main - # env: - # - PY_VER: "3.7" - # - MYSQL_VER: "5.7" - # - <<: *main - # env: - # - PY_VER: "3.6" - # - MYSQL_VER: "5.7" - # - <<: *main - # env: - # - PY_VER: "3.5" - # - MYSQL_VER: "5.7" - # - <<: *main - # env: - # - PY_VER: "3.8-rc" - # - MYSQL_VER: "8.0" - # - <<: *main - # env: - # - PY_VER: "3.7" - # - MYSQL_VER: "8.0" - # - <<: *main - # env: - # - PY_VER: "3.6" - # - MYSQL_VER: "8.0" - # - <<: *main - # env: - # - PY_VER: "3.5" - # - MYSQL_VER: "8.0" - # - <<: *main - # env: - # - PY_VER: "3.8-rc" - # - MYSQL_VER: "5.6" - # - <<: *main - # env: - # - PY_VER: "3.7" - # - MYSQL_VER: "5.6" - # - <<: *main - # env: - # - PY_VER: "3.6" - # - MYSQL_VER: "5.6" - # - <<: *main - # env: - # - PY_VER: "3.5" - # - MYSQL_VER: "5.6" - - stage: Coverage - dist: xenial - language: python - python: 3.7 - script: - - pip install coveralls - - coverage run --source=datajoint setup.py test - - coveralls + - <<: *main + env: + - PY_VER: "3.8-rc" + - MYSQL_VER: "5.7" + - <<: *main + env: + - PY_VER: "3.7" + - MYSQL_VER: "5.7" + - <<: *main + env: + - PY_VER: "3.6" + - MYSQL_VER: "5.7" + - <<: *main + env: + - PY_VER: "3.5" + - MYSQL_VER: "5.7" + - <<: *main + env: + - PY_VER: "3.8-rc" + - MYSQL_VER: "8.0" + - <<: *main + env: + - PY_VER: "3.7" + - MYSQL_VER: "8.0" + - <<: *main + env: + - PY_VER: "3.6" + - MYSQL_VER: "8.0" + - <<: *main + env: + - PY_VER: "3.5" + - MYSQL_VER: "8.0" + - <<: *main + env: + - PY_VER: "3.8-rc" + - MYSQL_VER: "5.6" + - <<: *main + env: + - PY_VER: "3.7" + - MYSQL_VER: "5.6" + - <<: *main + env: + - PY_VER: "3.6" + - MYSQL_VER: "5.6" + - <<: *main + env: + - PY_VER: "3.5" + - MYSQL_VER: "5.6" diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml index cf2c9902a..c72b4e540 100644 --- a/LNX-docker-compose.yml +++ b/LNX-docker-compose.yml @@ -29,9 +29,10 @@ services: command: > /bin/sh -c " - pip install --user nose nose-cov .; + pip install --user nose nose-cov coveralls .; pip freeze | grep datajoint; nosetests -vsw tests --with-coverage --cover-package=datajoint; + coveralls; # jupyter notebook; " # ports: From b3be5fffc43119999e7c870ea644c9949dabcf45 Mon Sep 17 00:00:00 2001 From: guzman-raphael Date: Fri, 4 Oct 2019 16:01:19 -0500 Subject: [PATCH 9/9] Update coveralls env vars. --- .coveralls.yml | 1 - LNX-docker-compose.yml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 2eeede133..000000000 --- a/.coveralls.yml +++ /dev/null @@ -1 +0,0 @@ -repo_token: fd0BoXG46TPReEem0uMy7BJO5j0w1MQiY \ No newline at end of file diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml index c72b4e540..34085bf5f 100644 --- a/LNX-docker-compose.yml +++ b/LNX-docker-compose.yml @@ -25,6 +25,8 @@ services: - PYTHON_USER=dja - JUPYTER_PASSWORD=datajoint - DISPLAY + - COVERALLS_SERVICE_NAME=travis-ci + - COVERALLS_REPO_TOKEN=fd0BoXG46TPReEem0uMy7BJO5j0w1MQiY working_dir: /src command: > /bin/sh -c