From 15d5a425fd3aef8af570b98ea7a1b20135b6b7ea Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 08:02:32 -0300 Subject: [PATCH 01/30] adding more CI envs --- .travis.yml | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55d3b4e..f2e2486 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,22 @@ language: python -os: -- linux -# - osx -python: -# - '2.7' due to configparser problem -- '3.5' -- '3.6' -# - '3.7' +matrix: + include: + - name: "Python 3.5 on Linux" + python: 3.5 # this works for Linux but is ignored on macOS or Windows + - name: "Python 3.6 on Linux" + python: 3.6 # this works for Linux but is ignored on macOS or Windows + - name: "Python 3.7.1 on Xenial Linux" + python: 3.7 # this works for Linux but is ignored on macOS or Windows + dist: xenial # required for Python >= 3.7 + - name: "Python 3.7.2 on macOS" + os: osx + osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3 + language: shell # 'language: python' is an error on Travis CI macOS + - name: "Python 3.7.3 on Windows" + os: windows # Windows 10.0.17134 N/A Build 17134 + language: shell # 'language: python' is an error on Travis CI Windows + before_install: choco install python + env: PATH=/c/Python37:/c/Python37/Scripts:$PATH cache: - pip - npm @@ -21,6 +31,7 @@ addons: packages: - node before_install: +- pip install -U pip - pip install pipenv install: - sed -i 's/black = "\*"//g' Pipfile From 46c7738bf31be614350f284d9ff1d6f14c256f7a Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 08:14:19 -0300 Subject: [PATCH 02/30] adding more CI envs --- .travis.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2e2486..1c42085 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: python matrix: include: - - name: "Python 3.5 on Linux" - python: 3.5 # this works for Linux but is ignored on macOS or Windows + # - name: "Python 3.5 on Linux" + # python: 3.5 # this works for Linux but is ignored on macOS or Windows - name: "Python 3.6 on Linux" python: 3.6 # this works for Linux but is ignored on macOS or Windows - name: "Python 3.7.1 on Xenial Linux" @@ -12,10 +12,10 @@ matrix: os: osx osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3 language: shell # 'language: python' is an error on Travis CI macOS - - name: "Python 3.7.3 on Windows" + - name: "Python 3.6 on Windows" os: windows # Windows 10.0.17134 N/A Build 17134 language: shell # 'language: python' is an error on Travis CI Windows - before_install: choco install python + # before_install: choco install python env: PATH=/c/Python37:/c/Python37/Scripts:$PATH cache: - pip @@ -30,11 +30,18 @@ addons: update: true packages: - node + # - gnu-sed + choco: + update: true + packages: + - nodejs + - python3 --version 3.6.5 + # - sed before_install: - pip install -U pip - pip install pipenv install: -- sed -i 's/black = "\*"//g' Pipfile +# - sed -i 's/black = "\*"//g' Pipfile - npm install before_script: - pip install . From 2f5e1023a782cea4a3e7129bc4a49783e82bb2a0 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 08:27:59 -0300 Subject: [PATCH 03/30] adding more CI envs --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c42085..d811348 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,13 +38,13 @@ addons: - python3 --version 3.6.5 # - sed before_install: -- pip install -U pip -- pip install pipenv +- pip3 install -U pip +- pip3 install pipenv install: # - sed -i 's/black = "\*"//g' Pipfile - npm install before_script: -- pip install . +- pip3 install . script: - hooks4git -t ci after_success: From 5cf292676cfd6a0150176bd5af9203e8175898c9 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 08:36:56 -0300 Subject: [PATCH 04/30] adding more CI envs --- .travis.yml | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index d811348..f6ea9c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,45 +1,46 @@ language: python +cache: +- pip +- npm +addons: + apt: + update: true + packages: + - nodejs + - npm + homebrew: + update: true + packages: + - node + # - gnu-sed + # choco: + # update: true + # packages: + # - nodejs + # - python3 --version 3.6.5 + # - sed matrix: include: # - name: "Python 3.5 on Linux" # python: 3.5 # this works for Linux but is ignored on macOS or Windows - name: "Python 3.6 on Linux" python: 3.6 # this works for Linux but is ignored on macOS or Windows + before_install: pip3 install -U pip pipenv - name: "Python 3.7.1 on Xenial Linux" python: 3.7 # this works for Linux but is ignored on macOS or Windows dist: xenial # required for Python >= 3.7 + before_install: pip3 install -U pip pipenv - name: "Python 3.7.2 on macOS" os: osx osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3 + before_install: pip install -U pip pipenv language: shell # 'language: python' is an error on Travis CI macOS - name: "Python 3.6 on Windows" os: windows # Windows 10.0.17134 N/A Build 17134 language: shell # 'language: python' is an error on Travis CI Windows - # before_install: choco install python + before_install: choco install python nodejs env: PATH=/c/Python37:/c/Python37/Scripts:$PATH -cache: -- pip -- npm -addons: - apt: - update: true - packages: - - nodejs - - npm - homebrew: - update: true - packages: - - node - # - gnu-sed - choco: - update: true - packages: - - nodejs - - python3 --version 3.6.5 - # - sed -before_install: -- pip3 install -U pip -- pip3 install pipenv +# before_install: pip3 install -U pip pipenv install: # - sed -i 's/black = "\*"//g' Pipfile - npm install From 45ca3c18aefe1aeb994c67b06676196b26a5d8fd Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 08:46:31 -0300 Subject: [PATCH 05/30] adding more CI envs --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index f6ea9c9..18c83b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ addons: update: true packages: - node + - python # - gnu-sed # choco: # update: true @@ -42,6 +43,7 @@ matrix: env: PATH=/c/Python37:/c/Python37/Scripts:$PATH # before_install: pip3 install -U pip pipenv install: +- ls -lasR / # - sed -i 's/black = "\*"//g' Pipfile - npm install before_script: From 402a91bc3c4e2c63cd8ab2b41b8ca697fe348f9a Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 08:55:32 -0300 Subject: [PATCH 06/30] adding more CI envs --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18c83b6..47b65a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ addons: update: true packages: - node - - python + - python3 # - gnu-sed # choco: # update: true @@ -43,7 +43,6 @@ matrix: env: PATH=/c/Python37:/c/Python37/Scripts:$PATH # before_install: pip3 install -U pip pipenv install: -- ls -lasR / # - sed -i 's/black = "\*"//g' Pipfile - npm install before_script: From 21109066c5be77ac6f65cbaeec3b6281727c6072 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 09:09:13 -0300 Subject: [PATCH 07/30] better travis yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 47b65a5..8dce980 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ addons: update: true packages: - node - - python3 + - python # - gnu-sed # choco: # update: true @@ -43,6 +43,7 @@ matrix: env: PATH=/c/Python37:/c/Python37/Scripts:$PATH # before_install: pip3 install -U pip pipenv install: +- python --version # - sed -i 's/black = "\*"//g' Pipfile - npm install before_script: From aa7f2722385acc9216573b88c9a319db3582d1e2 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 09:34:14 -0300 Subject: [PATCH 08/30] better travis yml --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8dce980..2805fbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ addons: update: true packages: - node - - python + - python3 # - gnu-sed # choco: # update: true @@ -34,16 +34,17 @@ matrix: - name: "Python 3.7.2 on macOS" os: osx osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3 - before_install: pip install -U pip pipenv + before_install: pip3 install -U pip pipenv language: shell # 'language: python' is an error on Travis CI macOS - name: "Python 3.6 on Windows" os: windows # Windows 10.0.17134 N/A Build 17134 language: shell # 'language: python' is an error on Travis CI Windows before_install: choco install python nodejs - env: PATH=/c/Python37:/c/Python37/Scripts:$PATH + env: PATH=/c/Program\ Files/nodejs:/c/Python37:/c/Python37/Scripts:$PATH # before_install: pip3 install -U pip pipenv install: - python --version +- python3 --version # - sed -i 's/black = "\*"//g' Pipfile - npm install before_script: From 9318e95d2848e65ecfbcacb719cc1de556b373f3 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 09:35:52 -0300 Subject: [PATCH 09/30] better travis yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2805fbe..a055782 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: os: windows # Windows 10.0.17134 N/A Build 17134 language: shell # 'language: python' is an error on Travis CI Windows before_install: choco install python nodejs - env: PATH=/c/Program\ Files/nodejs:/c/Python37:/c/Python37/Scripts:$PATH + env: PATH=/c/Program Files/nodejs:/c/Python37:/c/Python37/Scripts:$PATH # before_install: pip3 install -U pip pipenv install: - python --version From 534190783066778a76dc0e9c7add9b76ce02a503 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 09:38:18 -0300 Subject: [PATCH 10/30] better travis yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a055782..2baed7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: os: windows # Windows 10.0.17134 N/A Build 17134 language: shell # 'language: python' is an error on Travis CI Windows before_install: choco install python nodejs - env: PATH=/c/Program Files/nodejs:/c/Python37:/c/Python37/Scripts:$PATH + env: "PATH=/c/Program Files/nodejs:/c/Python37:/c/Python37/Scripts:$PATH" # before_install: pip3 install -U pip pipenv install: - python --version From a900f7a1b6536582fae0b0075a21911d33080e3b Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 09:41:14 -0300 Subject: [PATCH 11/30] better travis yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2baed7a..217073b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: os: windows # Windows 10.0.17134 N/A Build 17134 language: shell # 'language: python' is an error on Travis CI Windows before_install: choco install python nodejs - env: "PATH=/c/Program Files/nodejs:/c/Python37:/c/Python37/Scripts:$PATH" + env: "PATH=/c/Progra~1/nodejs:/c/Python37:/c/Python37/Scripts:$PATH" # before_install: pip3 install -U pip pipenv install: - python --version From 1db63c8be621a9f56b7763f868b8ef5a2d5f9097 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 09:50:38 -0300 Subject: [PATCH 12/30] better travis yml --- .travis.yml | 21 ++++++++++++++------- Pipfile | 3 --- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 217073b..0de159a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,29 +22,36 @@ addons: # - sed matrix: include: - # - name: "Python 3.5 on Linux" - # python: 3.5 # this works for Linux but is ignored on macOS or Windows + - name: "Python 3.5 on Linux" + python: 3.5 # this works for Linux but is ignored on macOS or Windows + before_install: + - pip3 install -U pip pipenv - name: "Python 3.6 on Linux" python: 3.6 # this works for Linux but is ignored on macOS or Windows - before_install: pip3 install -U pip pipenv + before_install: + - pip3 install -U pip pipenv - name: "Python 3.7.1 on Xenial Linux" python: 3.7 # this works for Linux but is ignored on macOS or Windows dist: xenial # required for Python >= 3.7 - before_install: pip3 install -U pip pipenv + before_install: + - pip3 install -U pip pipenv - name: "Python 3.7.2 on macOS" os: osx osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3 - before_install: pip3 install -U pip pipenv + before_install: + - pip3 install -U pip pipenv language: shell # 'language: python' is an error on Travis CI macOS - name: "Python 3.6 on Windows" os: windows # Windows 10.0.17134 N/A Build 17134 language: shell # 'language: python' is an error on Travis CI Windows - before_install: choco install python nodejs + before_install: + - choco install python nodejs + - pip install -U pip pipenv env: "PATH=/c/Progra~1/nodejs:/c/Python37:/c/Python37/Scripts:$PATH" # before_install: pip3 install -U pip pipenv install: - python --version -- python3 --version +# - python3 --version # - sed -i 's/black = "\*"//g' Pipfile - npm install before_script: diff --git a/Pipfile b/Pipfile index 7479d57..e2bc53c 100644 --- a/Pipfile +++ b/Pipfile @@ -18,8 +18,5 @@ pipenv-to-requirements = "*" [packages] colorama = "*" -[requires] -python_version = "3.6" - [pipenv] allow_prereleases = true From 64378f4969214518a9c6cedaaa7c5455ffa0ec55 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 09:59:43 -0300 Subject: [PATCH 13/30] better travis yml --- .hooks4git.ini | 8 ++++---- .travis.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.hooks4git.ini b/.hooks4git.ini index 0279db1..b875f32 100644 --- a/.hooks4git.ini +++ b/.hooks4git.ini @@ -2,13 +2,13 @@ STAGED_FILES_IF_ANY = h4g/get_staged_files --format csv --prefix "--filename=" --suffix "" [scripts] -flake8 = flake8 --max-line-length=119 --exclude .git,build,dist ${STAGED_FILES_IF_ANY} -pytest = python -m pytest --cov=hooks4git tests/ +flake8 = pipenv run flake8 --max-line-length=119 --exclude .git,build,dist ${STAGED_FILES_IF_ANY} +pytest = pipenv run python -m pytest --cov=hooks4git tests/ travis_linter = ./node_modules/.bin/travis-lint .travis.yml md_linter = ./node_modules/.bin/markdownlint README.md -bandit = bandit -r hooks4git +bandit = pipenv run bandit -r hooks4git checkbranch = h4g/check_branch_name "^(feature|bugfix|hotfix|fix)\/.+" -black = black . --line-length=119 --check -t py36 +black = pipenv run black . --line-length=119 --check -t py36 make_reqs = pipenv run pipenv_to_requirements -f pipenv = pipenv install --dev diff --git a/.travis.yml b/.travis.yml index 0de159a..264cce2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ matrix: - name: "Python 3.5 on Linux" python: 3.5 # this works for Linux but is ignored on macOS or Windows before_install: + - sed -i 's/black = "\*"//g' Pipfile - pip3 install -U pip pipenv - name: "Python 3.6 on Linux" python: 3.6 # this works for Linux but is ignored on macOS or Windows @@ -46,13 +47,12 @@ matrix: language: shell # 'language: python' is an error on Travis CI Windows before_install: - choco install python nodejs - - pip install -U pip pipenv + - pip install -U pip pipenv --user env: "PATH=/c/Progra~1/nodejs:/c/Python37:/c/Python37/Scripts:$PATH" # before_install: pip3 install -U pip pipenv install: - python --version # - python3 --version -# - sed -i 's/black = "\*"//g' Pipfile - npm install before_script: - pip3 install . From acf1a6f1b0b78925886a22851da14fbe313ec057 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 10:06:28 -0300 Subject: [PATCH 14/30] better travis yml --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 264cce2..d2f6055 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,12 +31,12 @@ matrix: python: 3.6 # this works for Linux but is ignored on macOS or Windows before_install: - pip3 install -U pip pipenv - - name: "Python 3.7.1 on Xenial Linux" + - name: "Python 3.7 on Linux" python: 3.7 # this works for Linux but is ignored on macOS or Windows dist: xenial # required for Python >= 3.7 before_install: - pip3 install -U pip pipenv - - name: "Python 3.7.2 on macOS" + - name: "Python 3.7 on macOS" os: osx osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3 before_install: @@ -51,8 +51,9 @@ matrix: env: "PATH=/c/Progra~1/nodejs:/c/Python37:/c/Python37/Scripts:$PATH" # before_install: pip3 install -U pip pipenv install: -- python --version -# - python3 --version +- python --version || true +- python2 --version || true +- python3 --version || true - npm install before_script: - pip3 install . From 53501ed25e792ee812f5d1c3a878635002677d5e Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 10:19:42 -0300 Subject: [PATCH 15/30] better travis yml --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2f6055..cb3b316 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,27 +22,27 @@ addons: # - sed matrix: include: - - name: "Python 3.5 on Linux" + - name: "Python 3.5.6 on Linux" python: 3.5 # this works for Linux but is ignored on macOS or Windows before_install: - sed -i 's/black = "\*"//g' Pipfile - pip3 install -U pip pipenv - - name: "Python 3.6 on Linux" + - name: "Python 3.6.3 on Linux" python: 3.6 # this works for Linux but is ignored on macOS or Windows before_install: - pip3 install -U pip pipenv - - name: "Python 3.7 on Linux" + - name: "Python 3.7.1 on Linux" python: 3.7 # this works for Linux but is ignored on macOS or Windows dist: xenial # required for Python >= 3.7 before_install: - pip3 install -U pip pipenv - - name: "Python 3.7 on macOS" + - name: "Python 3.7.3 on macOS" os: osx osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3 before_install: - pip3 install -U pip pipenv language: shell # 'language: python' is an error on Travis CI macOS - - name: "Python 3.6 on Windows" + - name: "Python 3.7.3 on Windows" os: windows # Windows 10.0.17134 N/A Build 17134 language: shell # 'language: python' is an error on Travis CI Windows before_install: @@ -56,7 +56,7 @@ install: - python3 --version || true - npm install before_script: -- pip3 install . +- pip3 install . --user script: - hooks4git -t ci after_success: From 29bac043918eecba7d58e9da710d36c1fb8e15fe Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 10:25:32 -0300 Subject: [PATCH 16/30] better travis yml --- .travis.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index cb3b316..758c3f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,12 +14,6 @@ addons: - node - python3 # - gnu-sed - # choco: - # update: true - # packages: - # - nodejs - # - python3 --version 3.6.5 - # - sed matrix: include: - name: "Python 3.5.6 on Linux" @@ -27,20 +21,24 @@ matrix: before_install: - sed -i 's/black = "\*"//g' Pipfile - pip3 install -U pip pipenv + - pip3 install . - name: "Python 3.6.3 on Linux" python: 3.6 # this works for Linux but is ignored on macOS or Windows before_install: - pip3 install -U pip pipenv + - pip3 install . - name: "Python 3.7.1 on Linux" python: 3.7 # this works for Linux but is ignored on macOS or Windows dist: xenial # required for Python >= 3.7 before_install: - pip3 install -U pip pipenv + - pip3 install . - name: "Python 3.7.3 on macOS" os: osx osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3 before_install: - pip3 install -U pip pipenv + - pip3 install . language: shell # 'language: python' is an error on Travis CI macOS - name: "Python 3.7.3 on Windows" os: windows # Windows 10.0.17134 N/A Build 17134 @@ -48,16 +46,15 @@ matrix: before_install: - choco install python nodejs - pip install -U pip pipenv --user + - pip3 install . --user env: "PATH=/c/Progra~1/nodejs:/c/Python37:/c/Python37/Scripts:$PATH" # before_install: pip3 install -U pip pipenv install: +- npm install +script: - python --version || true - python2 --version || true - python3 --version || true -- npm install -before_script: -- pip3 install . --user -script: - hooks4git -t ci after_success: - coveralls From b805d097b72be713886a097796feb6c8298dd59f Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 10:36:40 -0300 Subject: [PATCH 17/30] better travis yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 758c3f1..2cac5dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,11 +43,11 @@ matrix: - name: "Python 3.7.3 on Windows" os: windows # Windows 10.0.17134 N/A Build 17134 language: shell # 'language: python' is an error on Travis CI Windows + env: "PATH=/c/Progra~1/nodejs:/c/Python37:/c/Python37/Scripts:/c/Users/travis/AppData/Roaming/Python/Python37/Scripts:$PATH" before_install: - choco install python nodejs - - pip install -U pip pipenv --user - - pip3 install . --user - env: "PATH=/c/Progra~1/nodejs:/c/Python37:/c/Python37/Scripts:$PATH" + - pip3 install -U pip pipenv + - pip3 install . # before_install: pip3 install -U pip pipenv install: - npm install From 12e3b30173bbbc599522354d9df2ce18a9fe295f Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 10:41:55 -0300 Subject: [PATCH 18/30] better travis yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2cac5dc..292a032 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,8 +46,8 @@ matrix: env: "PATH=/c/Progra~1/nodejs:/c/Python37:/c/Python37/Scripts:/c/Users/travis/AppData/Roaming/Python/Python37/Scripts:$PATH" before_install: - choco install python nodejs - - pip3 install -U pip pipenv - - pip3 install . + - pip3 install -U pip pipenv --user + - pip3 install . --user # before_install: pip3 install -U pip pipenv install: - npm install From 7fe19424dfa89a15c1acf193f4c05b9884628d1d Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 11:02:05 -0300 Subject: [PATCH 19/30] better travis yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 292a032..db37ef8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ matrix: - name: "Python 3.7.3 on Windows" os: windows # Windows 10.0.17134 N/A Build 17134 language: shell # 'language: python' is an error on Travis CI Windows - env: "PATH=/c/Progra~1/nodejs:/c/Python37:/c/Python37/Scripts:/c/Users/travis/AppData/Roaming/Python/Python37/Scripts:$PATH" + env: "PATH=/c/Python37:/c/Python37/Scripts:/c/Users/travis/AppData/Roaming/Python/Python37/Scripts:/c/Progra~1/nodejs:$PATH" before_install: - choco install python nodejs - pip3 install -U pip pipenv --user From a7b49a9d96cf00f72c5060ba327258824f8c65dc Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 11:21:20 -0300 Subject: [PATCH 20/30] better travis yml --- .travis.yml | 51 +++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index db37ef8..1db1b48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,36 +16,37 @@ addons: # - gnu-sed matrix: include: - - name: "Python 3.5.6 on Linux" - python: 3.5 # this works for Linux but is ignored on macOS or Windows - before_install: - - sed -i 's/black = "\*"//g' Pipfile - - pip3 install -U pip pipenv - - pip3 install . - - name: "Python 3.6.3 on Linux" - python: 3.6 # this works for Linux but is ignored on macOS or Windows - before_install: - - pip3 install -U pip pipenv - - pip3 install . - - name: "Python 3.7.1 on Linux" - python: 3.7 # this works for Linux but is ignored on macOS or Windows - dist: xenial # required for Python >= 3.7 - before_install: - - pip3 install -U pip pipenv - - pip3 install . - - name: "Python 3.7.3 on macOS" - os: osx - osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3 - before_install: - - pip3 install -U pip pipenv - - pip3 install . - language: shell # 'language: python' is an error on Travis CI macOS + # - name: "Python 3.5.6 on Linux" + # python: 3.5 # this works for Linux but is ignored on macOS or Windows + # before_install: + # - sed -i 's/black = "\*"//g' Pipfile + # - pip3 install -U pip pipenv + # - pip3 install . + # - name: "Python 3.6.3 on Linux" + # python: 3.6 # this works for Linux but is ignored on macOS or Windows + # before_install: + # - pip3 install -U pip pipenv + # - pip3 install . + # - name: "Python 3.7.1 on Linux" + # python: 3.7 # this works for Linux but is ignored on macOS or Windows + # dist: xenial # required for Python >= 3.7 + # before_install: + # - pip3 install -U pip pipenv + # - pip3 install . + # - name: "Python 3.7.3 on macOS" + # os: osx + # osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3 + # before_install: + # - pip3 install -U pip pipenv + # - pip3 install . + # language: shell # 'language: python' is an error on Travis CI macOS - name: "Python 3.7.3 on Windows" os: windows # Windows 10.0.17134 N/A Build 17134 language: shell # 'language: python' is an error on Travis CI Windows env: "PATH=/c/Python37:/c/Python37/Scripts:/c/Users/travis/AppData/Roaming/Python/Python37/Scripts:/c/Progra~1/nodejs:$PATH" before_install: - choco install python nodejs + - ln -s $(which python) /c/Users/travis/AppData/Roaming/Python/Python37/Scripts/python3 - pip3 install -U pip pipenv --user - pip3 install . --user # before_install: pip3 install -U pip pipenv @@ -55,6 +56,8 @@ script: - python --version || true - python2 --version || true - python3 --version || true +- which hooks4git +- hooks4git -h - hooks4git -t ci after_success: - coveralls From a7f95645c5361c413a45f0cebd05598348475cff Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 11:26:36 -0300 Subject: [PATCH 21/30] better travis yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1db1b48..8f88347 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,10 @@ matrix: - name: "Python 3.7.3 on Windows" os: windows # Windows 10.0.17134 N/A Build 17134 language: shell # 'language: python' is an error on Travis CI Windows - env: "PATH=/c/Python37:/c/Python37/Scripts:/c/Users/travis/AppData/Roaming/Python/Python37/Scripts:/c/Progra~1/nodejs:$PATH" + env: "PATH=/c/Temp:/c/Python37:/c/Python37/Scripts:/c/Users/travis/AppData/Roaming/Python/Python37/Scripts:/c/Progra~1/nodejs:$PATH" before_install: - choco install python nodejs - - ln -s $(which python) /c/Users/travis/AppData/Roaming/Python/Python37/Scripts/python3 + - ln -s $(which python) /c/Temp/python3 - pip3 install -U pip pipenv --user - pip3 install . --user # before_install: pip3 install -U pip pipenv From 19d90732af2c01e2369868dbacc7dae7e6b8dc72 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 11:30:28 -0300 Subject: [PATCH 22/30] better travis yml --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f88347..750a0a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,11 @@ matrix: - name: "Python 3.7.3 on Windows" os: windows # Windows 10.0.17134 N/A Build 17134 language: shell # 'language: python' is an error on Travis CI Windows - env: "PATH=/c/Temp:/c/Python37:/c/Python37/Scripts:/c/Users/travis/AppData/Roaming/Python/Python37/Scripts:/c/Progra~1/nodejs:$PATH" + env: "PATH=/c:/c/Python37:/c/Python37/Scripts:/c/Users/travis/AppData/Roaming/Python/Python37/Scripts:/c/Progra~1/nodejs:$PATH" before_install: - choco install python nodejs - - ln -s $(which python) /c/Temp/python3 + - $(which python) + - copy $(which python) /c/python3 - pip3 install -U pip pipenv --user - pip3 install . --user # before_install: pip3 install -U pip pipenv From 625afccf7c54577bac368c9364b88dba90129b40 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 11:31:44 -0300 Subject: [PATCH 23/30] better travis yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 750a0a1..05ba641 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ matrix: before_install: - choco install python nodejs - $(which python) - - copy $(which python) /c/python3 + - cp $(which python) /c/python3 - pip3 install -U pip pipenv --user - pip3 install . --user # before_install: pip3 install -U pip pipenv From 58f740943045336a2bb0022c3bfe89a3ce6e27e0 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 11:36:17 -0300 Subject: [PATCH 24/30] better travis yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 05ba641..c4bb554 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ matrix: env: "PATH=/c:/c/Python37:/c/Python37/Scripts:/c/Users/travis/AppData/Roaming/Python/Python37/Scripts:/c/Progra~1/nodejs:$PATH" before_install: - choco install python nodejs - - $(which python) + - which python - cp $(which python) /c/python3 - pip3 install -U pip pipenv --user - pip3 install . --user From 9ee474529823df20855a5097de9f75b0fca65f22 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 11:45:48 -0300 Subject: [PATCH 25/30] better travis yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c4bb554..a389ea7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,6 @@ matrix: env: "PATH=/c:/c/Python37:/c/Python37/Scripts:/c/Users/travis/AppData/Roaming/Python/Python37/Scripts:/c/Progra~1/nodejs:$PATH" before_install: - choco install python nodejs - - which python - cp $(which python) /c/python3 - pip3 install -U pip pipenv --user - pip3 install . --user @@ -59,6 +58,7 @@ script: - python3 --version || true - which hooks4git - hooks4git -h +- pwd - hooks4git -t ci after_success: - coveralls From c5a9a4873c4cd5b8d18585fca1d8f98cd8336f31 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 12:57:10 -0300 Subject: [PATCH 26/30] better travis yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index a389ea7..4aaa27f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,7 @@ matrix: - cp $(which python) /c/python3 - pip3 install -U pip pipenv --user - pip3 install . --user + - pwd # before_install: pip3 install -U pip pipenv install: - npm install @@ -59,6 +60,7 @@ script: - which hooks4git - hooks4git -h - pwd +- ls -las - hooks4git -t ci after_success: - coveralls From 1c289219d7ee74ee3a949247265fef7473acfb33 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 13:11:18 -0300 Subject: [PATCH 27/30] better travis yml --- .travis.yml | 1 + hooks4git/hook.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4aaa27f..a9ce2f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,6 +61,7 @@ script: - hooks4git -h - pwd - ls -las +- git rev-parse --show-toplevel - hooks4git -t ci after_success: - coveralls diff --git a/hooks4git/hook.py b/hooks4git/hook.py index 8077dab..d9c388d 100755 --- a/hooks4git/hook.py +++ b/hooks4git/hook.py @@ -124,7 +124,10 @@ def run_hook_cmd(command, files): def main(cmd): git_root = os_call("git rev-parse --show-toplevel")[1].replace("\n", "") + if len(git_root) == 0: + git_root = "." configfile = "%s/.hooks4git.ini" % git_root + print(configfile) config = configparser.ConfigParser() cfg = {} exception_message = "" From 5c37b2dcd5f33e185f6efe0daabadc054cdfcc68 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 13:11:38 -0300 Subject: [PATCH 28/30] better travis yml --- hooks4git/hook.py | 1 - 1 file changed, 1 deletion(-) diff --git a/hooks4git/hook.py b/hooks4git/hook.py index d9c388d..66ec633 100755 --- a/hooks4git/hook.py +++ b/hooks4git/hook.py @@ -127,7 +127,6 @@ def main(cmd): if len(git_root) == 0: git_root = "." configfile = "%s/.hooks4git.ini" % git_root - print(configfile) config = configparser.ConfigParser() cfg = {} exception_message = "" From 3f0d7d2e584c2145d88b2cdaa43156ec151ca5c8 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 13:39:33 -0300 Subject: [PATCH 29/30] better travis yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a9ce2f2..5fefdb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,7 @@ matrix: - cp $(which python) /c/python3 - pip3 install -U pip pipenv --user - pip3 install . --user + - ls -lasR /c/Users/travis/AppData/Roaming/Python/Python37/Scripts - pwd # before_install: pip3 install -U pip pipenv install: @@ -62,7 +63,7 @@ script: - pwd - ls -las - git rev-parse --show-toplevel -- hooks4git -t ci +- hooks4git -t ci --ci after_success: - coveralls deploy: From 85cd4368b5e28ef40a9db67a6c3c6ae54593c584 Mon Sep 17 00:00:00 2001 From: Marco Lovato Date: Mon, 20 May 2019 13:47:59 -0300 Subject: [PATCH 30/30] better travis yml --- .travis.yml | 70 ++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5fefdb1..a0ab95f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,42 +16,39 @@ addons: # - gnu-sed matrix: include: - # - name: "Python 3.5.6 on Linux" - # python: 3.5 # this works for Linux but is ignored on macOS or Windows - # before_install: - # - sed -i 's/black = "\*"//g' Pipfile - # - pip3 install -U pip pipenv - # - pip3 install . - # - name: "Python 3.6.3 on Linux" - # python: 3.6 # this works for Linux but is ignored on macOS or Windows - # before_install: - # - pip3 install -U pip pipenv - # - pip3 install . - # - name: "Python 3.7.1 on Linux" - # python: 3.7 # this works for Linux but is ignored on macOS or Windows - # dist: xenial # required for Python >= 3.7 - # before_install: - # - pip3 install -U pip pipenv - # - pip3 install . - # - name: "Python 3.7.3 on macOS" - # os: osx - # osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3 - # before_install: - # - pip3 install -U pip pipenv - # - pip3 install . - # language: shell # 'language: python' is an error on Travis CI macOS - - name: "Python 3.7.3 on Windows" - os: windows # Windows 10.0.17134 N/A Build 17134 - language: shell # 'language: python' is an error on Travis CI Windows - env: "PATH=/c:/c/Python37:/c/Python37/Scripts:/c/Users/travis/AppData/Roaming/Python/Python37/Scripts:/c/Progra~1/nodejs:$PATH" + - name: "Python 3.5.6 on Linux" + python: 3.5 # this works for Linux but is ignored on macOS or Windows before_install: - - choco install python nodejs - - cp $(which python) /c/python3 - - pip3 install -U pip pipenv --user - - pip3 install . --user - - ls -lasR /c/Users/travis/AppData/Roaming/Python/Python37/Scripts - - pwd -# before_install: pip3 install -U pip pipenv + - sed -i 's/black = "\*"//g' Pipfile + - pip3 install -U pip pipenv + - pip3 install . + - name: "Python 3.6.3 on Linux" + python: 3.6 # this works for Linux but is ignored on macOS or Windows + before_install: + - pip3 install -U pip pipenv + - pip3 install . + - name: "Python 3.7.1 on Linux" + python: 3.7 # this works for Linux but is ignored on macOS or Windows + dist: xenial # required for Python >= 3.7 + before_install: + - pip3 install -U pip pipenv + - pip3 install . + - name: "Python 3.7.3 on macOS" + os: osx + osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3 + before_install: + - pip3 install -U pip pipenv + - pip3 install . + language: shell # 'language: python' is an error on Travis CI macOS + # - name: "Python 3.7.3 on Windows" + # os: windows # Windows 10.0.17134 N/A Build 17134 + # language: shell # 'language: python' is an error on Travis CI Windows + # env: "PATH=/c:/c/Python37:/c/Python37/Scripts:/c/Users/travis/AppData/Roaming/Python/Python37/Scripts:/c/Progra~1/nodejs:$PATH" + # before_install: + # - choco install python nodejs + # - cp $(which python) /c/python3 + # - pip3 install -U pip pipenv --user + # - pip3 install . --user install: - npm install script: @@ -60,9 +57,6 @@ script: - python3 --version || true - which hooks4git - hooks4git -h -- pwd -- ls -las -- git rev-parse --show-toplevel - hooks4git -t ci --ci after_success: - coveralls