From de80bd6acfe80fd1c5c144d57740b1833baea609 Mon Sep 17 00:00:00 2001 From: jnozsc Date: Sun, 12 Jan 2020 21:35:23 -0800 Subject: [PATCH 1/6] [travis] enforce travis --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 14d95fa84..118105bc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,4 +42,7 @@ matrix: - env: JYTHON=true; YTDL_TEST_SET=download before_install: - if [ "$JYTHON" == "true" ]; then ./devscripts/install_jython.sh; export PATH="$HOME/jython/bin:$PATH"; fi -script: ./devscripts/run_tests.sh +script: + - pip install flake8 + - flake8 . + - ./devscripts/run_tests.sh From 43e6deb562f713df48887d2b9d4e068d0b29da03 Mon Sep 17 00:00:00 2001 From: jnozsc Date: Sun, 12 Jan 2020 22:29:21 -0800 Subject: [PATCH 2/6] [travis] only install flake8 on supported python --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 118105bc1..f0f26627e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,6 @@ matrix: before_install: - if [ "$JYTHON" == "true" ]; then ./devscripts/install_jython.sh; export PATH="$HOME/jython/bin:$PATH"; fi script: - - pip install flake8 + - pip install "flake8; python_version >= '2.7' and python_version != '3.0' and python_version != '3.1' and python_version != '3.2' and python_version != '3.3'" - flake8 . - ./devscripts/run_tests.sh From 22e8da5f3e779b7de8a8473c1a8cb15089a2555d Mon Sep 17 00:00:00 2001 From: jnozsc Date: Sun, 12 Jan 2020 23:11:18 -0800 Subject: [PATCH 3/6] [travis] fix condition --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f0f26627e..29676d9fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ dist: trusty env: - YTDL_TEST_SET=core - YTDL_TEST_SET=download -matrix: +jobs: include: - python: 3.7 dist: xenial @@ -44,5 +44,5 @@ before_install: - if [ "$JYTHON" == "true" ]; then ./devscripts/install_jython.sh; export PATH="$HOME/jython/bin:$PATH"; fi script: - pip install "flake8; python_version >= '2.7' and python_version != '3.0' and python_version != '3.1' and python_version != '3.2' and python_version != '3.3'" - - flake8 . + - if flake8 2>/dev/null; then flake8 . ; fi - ./devscripts/run_tests.sh From f2b222e0aa923f41ea6b957baaee23f3e0c23b00 Mon Sep 17 00:00:00 2001 From: jnozsc Date: Sun, 12 Jan 2020 23:36:03 -0800 Subject: [PATCH 4/6] [travis] use correct statement to run the test --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 29676d9fb..59a0100ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,5 +44,5 @@ before_install: - if [ "$JYTHON" == "true" ]; then ./devscripts/install_jython.sh; export PATH="$HOME/jython/bin:$PATH"; fi script: - pip install "flake8; python_version >= '2.7' and python_version != '3.0' and python_version != '3.1' and python_version != '3.2' and python_version != '3.3'" - - if flake8 2>/dev/null; then flake8 . ; fi + - if [ -x "$(command -v flake8)" ]; then flake8 . ;fi - ./devscripts/run_tests.sh From 5e97615a8599d15e5476d47af5817610572ef2b0 Mon Sep 17 00:00:00 2001 From: jnozsc Date: Mon, 13 Jan 2020 09:12:00 -0800 Subject: [PATCH 5/6] [travis] run flake8 only once --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59a0100ae..a62c88685 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,9 @@ jobs: env: YTDL_TEST_SET=download - env: JYTHON=true; YTDL_TEST_SET=core - env: JYTHON=true; YTDL_TEST_SET=download + - python: 3.8 + install: pip install flake8 + script: flake8 . fast_finish: true allow_failures: - env: YTDL_TEST_SET=download @@ -42,7 +45,4 @@ jobs: - env: JYTHON=true; YTDL_TEST_SET=download before_install: - if [ "$JYTHON" == "true" ]; then ./devscripts/install_jython.sh; export PATH="$HOME/jython/bin:$PATH"; fi -script: - - pip install "flake8; python_version >= '2.7' and python_version != '3.0' and python_version != '3.1' and python_version != '3.2' and python_version != '3.3'" - - if [ -x "$(command -v flake8)" ]; then flake8 . ;fi - - ./devscripts/run_tests.sh +script: ./devscripts/run_tests.sh From 05406174336bc2538129cc020e13f6a960cd4f7a Mon Sep 17 00:00:00 2001 From: jnozsc Date: Mon, 13 Jan 2020 09:19:49 -0800 Subject: [PATCH 6/6] [travis] fix env --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a62c88685..51afd469a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,9 @@ jobs: env: YTDL_TEST_SET=download - env: JYTHON=true; YTDL_TEST_SET=core - env: JYTHON=true; YTDL_TEST_SET=download - - python: 3.8 + - name: flake8 + python: 3.8 + dist: xenial install: pip install flake8 script: flake8 . fast_finish: true