From 51a5a8af377ee41d25dcd5bc81ead49b83b3e021 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 10:14:05 +0100 Subject: [PATCH 001/329] Created dev branch --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index e3b96dd96..aaec3ce76 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ pip-log.txt # ipython notebook checkpoints .ipynb_checkpoints + +*.iml From 52cc4e88412e32f82c354b90ce3e268847a7ac4d Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 10:51:21 +0100 Subject: [PATCH 002/329] started to create the yml file for the build pipeline --- azure-pipelines.yml | 82 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000..698ac8acd --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,82 @@ + +pool: + vmImage: 'ubuntu-latest' + +jobs: + - job: Build + strategy: + matrix: + check: + os: linux + python: '3.6' + lint: + os: linux + python: '3.6' + docs_build: + os: linux + python: '3.6' + docs_linkcheck: + os: linux + python: '3.6' + condarecipe: + os: linux + python: '3.6' + py27-notebook: + os: linux + python: '2.7' + py36-notebook54: + os: linux + python: '3.6' + py36-notebook55: + os: linux + python: '3.6' + py36-notebook44: + os: linux + python: '3.6' + py36-notebook: + os: linux + python: '3.6' + py36-appveyorartifacts: + os: linux + python: '3.6' + +resources: + containers: + - container: global + env: { LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so + SEGFAULT_SIGNALS: all} + +- script: | + uname -a + id -un + id -Gn + # stuff for conda recipe + 'if [[ ${TOXENV} == "condarecipe" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi' + 'if [[ ${TOXENV} == "condarecipe" ]]; then bash miniconda.sh -b -p $HOME/miniconda; fi' + 'if [[ ${TOXENV} == "condarecipe" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi' + 'if [[ ${TOXENV} == "condarecipe" ]]; then hash -r; fi' + 'if [[ ${TOXENV} == "condarecipe" ]]; then conda config --set always_yes yes --set changeps1 no; fi' + 'if [[ ${TOXENV} == "condarecipe" ]]; then conda info -a; fi # Useful for debugging any issues with conda' + 'if [[ ${TOXENV} == "condarecipe" ]]; then conda install conda-build; fi' + 'if [[ ${TOXENV} == "condarecipe" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults' + 'if [[ ${TOXENV} == "condarecipe" ]]; then git fetch --unshallow; fi' + displayName: 'Before Install' + continueOnError: false + +- script: | + pip install tox + virtualenv --version + displauName: 'Install' + continueOnError: false + +steps: + - script: tox -v -e ${Build} + - 'if ! [[ ${TOXENV} =~ ^(appveyorartifacts|check|condarecipe|docs|lint)$ ]]; then tox -e coveralls,codecov; fi' + displayName: Script + + + + + + + From 314ccb373d7fc087ebf27355fcced85abb19763d Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 10:56:08 +0100 Subject: [PATCH 003/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 698ac8acd..731d03e81 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,11 +40,11 @@ jobs: os: linux python: '3.6' -resources: - containers: - - container: global - env: { LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so - SEGFAULT_SIGNALS: all} +# resources: +# containers: +# - container: global +# env: { LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so +# SEGFAULT_SIGNALS: all} - script: | uname -a From 663a22e839db465ecb89fc9409e2fd33cdd7683f Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 11:14:19 +0100 Subject: [PATCH 004/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 100 ++++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 731d03e81..5df1e4c12 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,43 +2,42 @@ pool: vmImage: 'ubuntu-latest' -jobs: - - job: Build - strategy: - matrix: - check: - os: linux - python: '3.6' - lint: - os: linux - python: '3.6' - docs_build: - os: linux - python: '3.6' - docs_linkcheck: - os: linux - python: '3.6' - condarecipe: - os: linux - python: '3.6' - py27-notebook: - os: linux - python: '2.7' - py36-notebook54: - os: linux - python: '3.6' - py36-notebook55: - os: linux - python: '3.6' - py36-notebook44: - os: linux - python: '3.6' - py36-notebook: - os: linux - python: '3.6' - py36-appveyorartifacts: - os: linux - python: '3.6' + +strategy: + matrix: + check: + # os: linux + python: '3.6' + lint: + # os: linux + python: '3.6' + docs_build: + # os: linux + python: '3.6' + docs_linkcheck: + # os: linux + python: '3.6' + condarecipe: + # os: linux + python: '3.6' + py27-notebook: + # os: linux + python: '2.7' + py36-notebook54: + # os: linux + python: '3.6' + py36-notebook55: + # os: linux + python: '3.6' + py36-notebook44: + # os: linux + python: '3.6' + py36-notebook: + # os: linux + python: '3.6' + py36-appveyorartifacts: + # os: linux + python: '3.6' # resources: # containers: @@ -51,15 +50,15 @@ jobs: id -un id -Gn # stuff for conda recipe - 'if [[ ${TOXENV} == "condarecipe" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi' - 'if [[ ${TOXENV} == "condarecipe" ]]; then bash miniconda.sh -b -p $HOME/miniconda; fi' - 'if [[ ${TOXENV} == "condarecipe" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi' - 'if [[ ${TOXENV} == "condarecipe" ]]; then hash -r; fi' - 'if [[ ${TOXENV} == "condarecipe" ]]; then conda config --set always_yes yes --set changeps1 no; fi' - 'if [[ ${TOXENV} == "condarecipe" ]]; then conda info -a; fi # Useful for debugging any issues with conda' - 'if [[ ${TOXENV} == "condarecipe" ]]; then conda install conda-build; fi' - 'if [[ ${TOXENV} == "condarecipe" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults' - 'if [[ ${TOXENV} == "condarecipe" ]]; then git fetch --unshallow; fi' + 'if [[ $(python) == "3.6" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi' + 'if [[ $(python) == "3.6" ]]; then bash miniconda.sh -b -p $HOME/miniconda; fi' + 'if [[ $(python) == "3.6" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi' + 'if [[ $(python) == "3.6" ]]; then hash -r; fi' + 'if [[ $(python) == "3.6" ]]; then conda config --set always_yes yes --set changeps1 no; fi' + 'if [[ $(python) == "3.6" ]]; then conda info -a; fi # Useful for debugging any issues with conda' + 'if [[ $(python) == "3.6" ]]; then conda install conda-build; fi' + 'if [[ $(python) == "3.6" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults' + 'if [[ $(python) == "3.6" ]]; then git fetch --unshallow; fi' displayName: 'Before Install' continueOnError: false @@ -69,10 +68,11 @@ jobs: displauName: 'Install' continueOnError: false -steps: - - script: tox -v -e ${Build} - - 'if ! [[ ${TOXENV} =~ ^(appveyorartifacts|check|condarecipe|docs|lint)$ ]]; then tox -e coveralls,codecov; fi' - displayName: Script +- script: | + tox -v -e $(python) + 'if ! [[ $(python) == "3.6" ]]; then tox -e coveralls,codecov; fi' + displayName: 'Script' + continueOnError: false From 2880178ea48c258cffc0ebefa186244a030fd742 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 11:15:22 +0100 Subject: [PATCH 005/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5df1e4c12..98ce21331 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,7 +2,6 @@ pool: vmImage: 'ubuntu-latest' - strategy: matrix: check: @@ -39,12 +38,7 @@ strategy: # os: linux python: '3.6' -# resources: -# containers: -# - container: global -# env: { LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so -# SEGFAULT_SIGNALS: all} - +steps: - script: | uname -a id -un From 418456f97f1a5743c288ddd36fff465450b6a1ac Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 11:15:51 +0100 Subject: [PATCH 006/329] Update azure-pipelines.yml for Azure Pipelines Fixed typo --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 98ce21331..c6e6eff4d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -59,7 +59,7 @@ steps: - script: | pip install tox virtualenv --version - displauName: 'Install' + displayName: 'Install' continueOnError: false - script: | From 541a45a45fdf5c644eb34eb92464cf0117c0b03c Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 11:19:47 +0100 Subject: [PATCH 007/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c6e6eff4d..d7aeb38e3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -44,8 +44,8 @@ steps: id -un id -Gn # stuff for conda recipe - 'if [[ $(python) == "3.6" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi' - 'if [[ $(python) == "3.6" ]]; then bash miniconda.sh -b -p $HOME/miniconda; fi' + 'if [[ $(python) == "3.6" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh; fi' + 'if [[ $(python) == "3.6" ]]; then bash Miniconda3-latest-Linux-x86_64 -b -p $HOME/miniconda; fi' 'if [[ $(python) == "3.6" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi' 'if [[ $(python) == "3.6" ]]; then hash -r; fi' 'if [[ $(python) == "3.6" ]]; then conda config --set always_yes yes --set changeps1 no; fi' From 2ef542f098636e56a9ced66077dcd7cce433b46c Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 11:21:56 +0100 Subject: [PATCH 008/329] Update azure-pipelines.yml for Azure Pipelines Removed quotation marks --- azure-pipelines.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d7aeb38e3..ad053e342 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -44,15 +44,15 @@ steps: id -un id -Gn # stuff for conda recipe - 'if [[ $(python) == "3.6" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh; fi' - 'if [[ $(python) == "3.6" ]]; then bash Miniconda3-latest-Linux-x86_64 -b -p $HOME/miniconda; fi' - 'if [[ $(python) == "3.6" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi' - 'if [[ $(python) == "3.6" ]]; then hash -r; fi' - 'if [[ $(python) == "3.6" ]]; then conda config --set always_yes yes --set changeps1 no; fi' - 'if [[ $(python) == "3.6" ]]; then conda info -a; fi # Useful for debugging any issues with conda' - 'if [[ $(python) == "3.6" ]]; then conda install conda-build; fi' - 'if [[ $(python) == "3.6" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults' - 'if [[ $(python) == "3.6" ]]; then git fetch --unshallow; fi' + if [[ $(python) == "3.6" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh; fi + if [[ $(python) == "3.6" ]]; then bash Miniconda3-latest-Linux-x86_64 -b -p $HOME/miniconda; fi + if [[ $(python) == "3.6" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi + if [[ $(python) == "3.6" ]]; then hash -r; fi + if [[ $(python) == "3.6" ]]; then conda config --set always_yes yes --set changeps1 no; fi + if [[ $(python) == "3.6" ]]; then conda info -a; fi # Useful for debugging any issues with conda + if [[ $(python) == "3.6" ]]; then conda install conda-build; fi + if [[ $(python) == "3.6" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults + if [[ $(python) == "3.6" ]]; then git fetch --unshallow; fi displayName: 'Before Install' continueOnError: false From 6052558d2e3446222bfc819e6a4213648d0c1767 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 11:25:12 +0100 Subject: [PATCH 009/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad053e342..f87f6724f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -52,7 +52,7 @@ steps: if [[ $(python) == "3.6" ]]; then conda info -a; fi # Useful for debugging any issues with conda if [[ $(python) == "3.6" ]]; then conda install conda-build; fi if [[ $(python) == "3.6" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults - if [[ $(python) == "3.6" ]]; then git fetch --unshallow; fi + if [[ $(python) == "3.6" ]]; then git fetch; fi displayName: 'Before Install' continueOnError: false @@ -64,7 +64,7 @@ steps: - script: | tox -v -e $(python) - 'if ! [[ $(python) == "3.6" ]]; then tox -e coveralls,codecov; fi' + if ! [[ $(python) == "3.6" ]]; then tox -e coveralls,codecov; fi displayName: 'Script' continueOnError: false From b57edfa94e4e313249a4425d299cead49e5c2e3c Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 11:28:13 +0100 Subject: [PATCH 010/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f87f6724f..e02a572e4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -57,6 +57,8 @@ steps: continueOnError: false - script: | + pip install virtualenv + sudo /usr/bin/easy_install virtualenv pip install tox virtualenv --version displayName: 'Install' From 76cf1c9393302c4a6d165b73fad9efa7598cea8c Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 11:32:19 +0100 Subject: [PATCH 011/329] Update azure-pipelines.yml for Azure Pipelines Debugging --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e02a572e4..bf24a4b59 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -59,6 +59,8 @@ steps: - script: | pip install virtualenv sudo /usr/bin/easy_install virtualenv + pip install wheel + python setup.py bdist_wheel pip install tox virtualenv --version displayName: 'Install' From be78f47fa9f6002dbc54ff0921d869270731f691 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 11:36:48 +0100 Subject: [PATCH 012/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bf24a4b59..ff696a684 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -67,8 +67,8 @@ steps: continueOnError: false - script: | - tox -v -e $(python) - if ! [[ $(python) == "3.6" ]]; then tox -e coveralls,codecov; fi + ~/.local/bin/tox -v -e $(python) + if ! [[ $(python) == "3.6" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi displayName: 'Script' continueOnError: false From c1bfbd8d98f63e6885c82586f9494a7337b428d0 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 11:40:20 +0100 Subject: [PATCH 013/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 58 ++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ff696a684..ce1128167 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,38 +5,38 @@ pool: strategy: matrix: check: - # os: linux + name: check python: '3.6' lint: - # os: linux - python: '3.6' - docs_build: - # os: linux - python: '3.6' - docs_linkcheck: - # os: linux - python: '3.6' - condarecipe: - # os: linux - python: '3.6' - py27-notebook: - # os: linux - python: '2.7' - py36-notebook54: - # os: linux - python: '3.6' - py36-notebook55: - # os: linux - python: '3.6' - py36-notebook44: - # os: linux - python: '3.6' - py36-notebook: - # os: linux - python: '3.6' - py36-appveyorartifacts: - # os: linux + name: lint python: '3.6' + # docs_build: + # # os: linux + # python: '3.6' + # docs_linkcheck: + # # os: linux + # python: '3.6' + # condarecipe: + # # os: linux + # python: '3.6' + # py27-notebook: + # # os: linux + # python: '2.7' + # py36-notebook54: + # # os: linux + # python: '3.6' + # py36-notebook55: + # # os: linux + # python: '3.6' + # py36-notebook44: + # # os: linux + # python: '3.6' + # py36-notebook: + # # os: linux + # python: '3.6' + # py36-appveyorartifacts: + # # os: linux + # python: '3.6' steps: - script: | From a54d866b91ce1ac271ead19f2bfae6d2b4a87ac3 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 11:40:37 +0100 Subject: [PATCH 014/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ce1128167..2923e2e85 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -67,7 +67,7 @@ steps: continueOnError: false - script: | - ~/.local/bin/tox -v -e $(python) + ~/.local/bin/tox -v -e $(name) if ! [[ $(python) == "3.6" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi displayName: 'Script' continueOnError: false From 2055b2c6f4fb3313d08dbb6671554f5e77d8c933 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 11:47:02 +0100 Subject: [PATCH 015/329] added some tweaks to the azure pipeline and manifest files --- MANIFEST.in | 1 + azure-pipelines.yml | 60 ++++++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 400ddb238..9c2f214ab 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -11,6 +11,7 @@ exclude .travis.yml exclude appveyor.yml exclude codecov.yml exclude readthedocs.yml +exclude azure-pipelines.yml # directory includes graft docs diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2923e2e85..5cfb4b2dd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,33 +10,33 @@ strategy: lint: name: lint python: '3.6' - # docs_build: - # # os: linux - # python: '3.6' - # docs_linkcheck: - # # os: linux - # python: '3.6' - # condarecipe: - # # os: linux - # python: '3.6' - # py27-notebook: - # # os: linux - # python: '2.7' - # py36-notebook54: - # # os: linux - # python: '3.6' - # py36-notebook55: - # # os: linux - # python: '3.6' - # py36-notebook44: - # # os: linux - # python: '3.6' - # py36-notebook: - # # os: linux - # python: '3.6' - # py36-appveyorartifacts: - # # os: linux - # python: '3.6' + docs_build: + name: docs_build + python: '3.6' + docs_linkcheck: + name: docs_linkcheck + python: '3.6' + condarecipe: + name: condarecipe + python: '3.6' + py27-notebook: + name: py27-notebook + python: '2.7' + py36-notebook54: + name: py36-notebook54 + python: '3.6' + py36-notebook55: + name: py36-notebook55 + python: '3.6' + py36-notebook44: + name: py36-notebook44 + python: '3.6' + py36-notebook: + name: py36-notebook + python: '3.6' + py36-appveyorartifacts: + name: py36-appveyorartifacts + python: '3.6' steps: - script: | @@ -68,10 +68,14 @@ steps: - script: | ~/.local/bin/tox -v -e $(name) - if ! [[ $(python) == "3.6" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi displayName: 'Script' continueOnError: false +- script: | + if ! [[ $(python) == "3.6" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi + displayName: 'After Script' + continueOnError: false + From 8200d0844de5c22d9b77e95a40c02a8732a570f8 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 11:48:37 +0100 Subject: [PATCH 016/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 54 ++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5cfb4b2dd..eb7e2cdc4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,33 +10,33 @@ strategy: lint: name: lint python: '3.6' - docs_build: - name: docs_build - python: '3.6' - docs_linkcheck: - name: docs_linkcheck - python: '3.6' - condarecipe: - name: condarecipe - python: '3.6' - py27-notebook: - name: py27-notebook - python: '2.7' - py36-notebook54: - name: py36-notebook54 - python: '3.6' - py36-notebook55: - name: py36-notebook55 - python: '3.6' - py36-notebook44: - name: py36-notebook44 - python: '3.6' - py36-notebook: - name: py36-notebook - python: '3.6' - py36-appveyorartifacts: - name: py36-appveyorartifacts - python: '3.6' + docs_build: + name: docs_build + python: '3.6' + docs_linkcheck: + name: docs_linkcheck + python: '3.6' + condarecipe: + name: condarecipe + python: '3.6' + py27-notebook: + name: py27-notebook + python: '2.7' + py36-notebook54: + name: py36-notebook54 + python: '3.6' + py36-notebook55: + name: py36-notebook55 + python: '3.6' + py36-notebook44: + name: py36-notebook44 + python: '3.6' + py36-notebook: + name: py36-notebook + python: '3.6' + py36-appveyorartifacts: + name: py36-appveyorartifacts + python: '3.6' steps: - script: | From 43de07a4afecccf8ebfb770a71237d4e3b4151eb Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 12:39:06 +0100 Subject: [PATCH 017/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eb7e2cdc4..6c57eeaec 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -57,11 +57,18 @@ steps: continueOnError: false - script: | - pip install virtualenv + if [[ $(python) == "3.6" ]]; then pip3 install virtualenv; fi + if [[ $(python) == "2.7" ]]; then pip install virtualenv; fi sudo /usr/bin/easy_install virtualenv - pip install wheel - python setup.py bdist_wheel - pip install tox + + if [[ $(python) == "3.6" ]]; then pip3 install wheel; fi + if [[ $(python) == "2.7" ]]; then pip install wheel; fi + + if [[ $(python) == "3.6" ]]; then python3 setup.py bdist_wheel; fi + if [[ $(python) == "2.7" ]]; then python setup.py bdist_wheel; fi + + if [[ $(python) == "3.6" ]]; then pip3 install tox; fi + if [[ $(python) == "2.7" ]]; then pip install tox; fi virtualenv --version displayName: 'Install' continueOnError: false From d6c41e7ec29a9a37b19df95d8cf50a4dbf734752 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 12:43:41 +0100 Subject: [PATCH 018/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6c57eeaec..c1b2ee089 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -57,6 +57,7 @@ steps: continueOnError: false - script: | + if [[ $(python) == "3.6" ]]; then pip3 install --upgrade pip setuptools; fi if [[ $(python) == "3.6" ]]; then pip3 install virtualenv; fi if [[ $(python) == "2.7" ]]; then pip install virtualenv; fi sudo /usr/bin/easy_install virtualenv From aa14a971d4f701ec8834bf8ce05c148f0d56d428 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 12:46:27 +0100 Subject: [PATCH 019/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c1b2ee089..c396b0d04 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -57,7 +57,7 @@ steps: continueOnError: false - script: | - if [[ $(python) == "3.6" ]]; then pip3 install --upgrade pip setuptools; fi + if [[ $(python) == "3.6" ]]; then pip3 install setuptools; fi if [[ $(python) == "3.6" ]]; then pip3 install virtualenv; fi if [[ $(python) == "2.7" ]]; then pip install virtualenv; fi sudo /usr/bin/easy_install virtualenv From 39c7485fc06e53b8050de79f8d2ef7f48f2e5764 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 12:49:33 +0100 Subject: [PATCH 020/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c396b0d04..8fd0c02f4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -58,8 +58,7 @@ steps: - script: | if [[ $(python) == "3.6" ]]; then pip3 install setuptools; fi - if [[ $(python) == "3.6" ]]; then pip3 install virtualenv; fi - if [[ $(python) == "2.7" ]]; then pip install virtualenv; fi + pip install virtualenv sudo /usr/bin/easy_install virtualenv if [[ $(python) == "3.6" ]]; then pip3 install wheel; fi From 942e05cd761d38307346c868ca609785c6bbf5f8 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 12:51:19 +0100 Subject: [PATCH 021/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8fd0c02f4..54879d71f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -58,7 +58,7 @@ steps: - script: | if [[ $(python) == "3.6" ]]; then pip3 install setuptools; fi - pip install virtualenv + pip3 install virtualenv sudo /usr/bin/easy_install virtualenv if [[ $(python) == "3.6" ]]; then pip3 install wheel; fi From e83606b83f91302c47f2382a16faaf1b52144bbe Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 12:53:46 +0100 Subject: [PATCH 022/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 54879d71f..ba652393e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -59,7 +59,7 @@ steps: - script: | if [[ $(python) == "3.6" ]]; then pip3 install setuptools; fi pip3 install virtualenv - sudo /usr/bin/easy_install virtualenv + # sudo /usr/bin/easy_install virtualenv if [[ $(python) == "3.6" ]]; then pip3 install wheel; fi if [[ $(python) == "2.7" ]]; then pip install wheel; fi From bb7cefd10ff0ef52e47362d089b0ecd8f2ba02e6 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 12:56:05 +0100 Subject: [PATCH 023/329] Update azure-pipelines.yml for Azure Pipelines Fix for problem with virtualenv --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ba652393e..5f7bc0335 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -58,7 +58,7 @@ steps: - script: | if [[ $(python) == "3.6" ]]; then pip3 install setuptools; fi - pip3 install virtualenv + python3 -m pip install --user virtualenv # sudo /usr/bin/easy_install virtualenv if [[ $(python) == "3.6" ]]; then pip3 install wheel; fi From a58011206e13ceb7e435d0a693e048693f85de9e Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 12:58:09 +0100 Subject: [PATCH 024/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5f7bc0335..afebc13ae 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -69,7 +69,7 @@ steps: if [[ $(python) == "3.6" ]]; then pip3 install tox; fi if [[ $(python) == "2.7" ]]; then pip install tox; fi - virtualenv --version + # virtualenv --version displayName: 'Install' continueOnError: false From d78dd13b9d36bca430efbeaef43c0eca23f7f917 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 14:25:47 +0100 Subject: [PATCH 025/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index afebc13ae..1a2555803 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -57,19 +57,12 @@ steps: continueOnError: false - script: | - if [[ $(python) == "3.6" ]]; then pip3 install setuptools; fi - python3 -m pip install --user virtualenv - # sudo /usr/bin/easy_install virtualenv - - if [[ $(python) == "3.6" ]]; then pip3 install wheel; fi - if [[ $(python) == "2.7" ]]; then pip install wheel; fi - - if [[ $(python) == "3.6" ]]; then python3 setup.py bdist_wheel; fi - if [[ $(python) == "2.7" ]]; then python setup.py bdist_wheel; fi - - if [[ $(python) == "3.6" ]]; then pip3 install tox; fi - if [[ $(python) == "2.7" ]]; then pip install tox; fi - # virtualenv --version + python -m pip install --user virtualenv + sudo /usr/bin/easy_install virtualenv + pip install wheel + python setup.py bdist_wheel + pip install tox + virtualenv --version displayName: 'Install' continueOnError: false From c7001eecc3ab80947acc5a7c6192ade06055172c Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 14:31:47 +0100 Subject: [PATCH 026/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1a2555803..a64859a7f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,37 +6,37 @@ strategy: matrix: check: name: check - python: '3.6' + python: '3.7' lint: name: lint - python: '3.6' + python: '3.7' docs_build: name: docs_build - python: '3.6' + python: '3.7' docs_linkcheck: name: docs_linkcheck - python: '3.6' + python: '3.7' condarecipe: name: condarecipe - python: '3.6' + python: '3.7' py27-notebook: name: py27-notebook python: '2.7' py36-notebook54: name: py36-notebook54 - python: '3.6' + python: '3.7' py36-notebook55: name: py36-notebook55 - python: '3.6' + python: '3.7' py36-notebook44: name: py36-notebook44 - python: '3.6' + python: '3.7' py36-notebook: name: py36-notebook - python: '3.6' + python: '3.7' py36-appveyorartifacts: name: py36-appveyorartifacts - python: '3.6' + python: '3.7' steps: - script: | @@ -44,15 +44,15 @@ steps: id -un id -Gn # stuff for conda recipe - if [[ $(python) == "3.6" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh; fi - if [[ $(python) == "3.6" ]]; then bash Miniconda3-latest-Linux-x86_64 -b -p $HOME/miniconda; fi - if [[ $(python) == "3.6" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi - if [[ $(python) == "3.6" ]]; then hash -r; fi - if [[ $(python) == "3.6" ]]; then conda config --set always_yes yes --set changeps1 no; fi - if [[ $(python) == "3.6" ]]; then conda info -a; fi # Useful for debugging any issues with conda - if [[ $(python) == "3.6" ]]; then conda install conda-build; fi - if [[ $(python) == "3.6" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults - if [[ $(python) == "3.6" ]]; then git fetch; fi + if [[ $(python) == "3.7" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh; fi + if [[ $(python) == "3.7" ]]; then bash Miniconda3-latest-Linux-x86_64 -b -p $HOME/miniconda; fi + if [[ $(python) == "3.7" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi + if [[ $(python) == "3.7" ]]; then hash -r; fi + if [[ $(python) == "3.7" ]]; then conda config --set always_yes yes --set changeps1 no; fi + if [[ $(python) == "3.7" ]]; then conda info -a; fi # Useful for debugging any issues with conda + if [[ $(python) == "3.7" ]]; then conda install conda-build; fi + if [[ $(python) == "3.7" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults + if [[ $(python) == "3.7" ]]; then git fetch; fi displayName: 'Before Install' continueOnError: false @@ -72,7 +72,7 @@ steps: continueOnError: false - script: | - if ! [[ $(python) == "3.6" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi + if ! [[ $(python) == "3.7" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi displayName: 'After Script' continueOnError: false From 7365953771e03a972f79f9702dc467769bcc9d98 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 14:34:27 +0100 Subject: [PATCH 027/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a64859a7f..370541c69 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,20 +22,20 @@ strategy: py27-notebook: name: py27-notebook python: '2.7' - py36-notebook54: - name: py36-notebook54 + py37-notebook54: + name: py37-notebook54 python: '3.7' - py36-notebook55: - name: py36-notebook55 + py37-notebook55: + name: py37-notebook55 python: '3.7' - py36-notebook44: - name: py36-notebook44 + py37-notebook44: + name: py37-notebook44 python: '3.7' - py36-notebook: - name: py36-notebook + py37-notebook: + name: py37-notebook python: '3.7' - py36-appveyorartifacts: - name: py36-appveyorartifacts + py37-appveyorartifacts: + name: py37-appveyorartifacts python: '3.7' steps: From 98bb6621a973ee1a2e14ab078167f4b8ae847037 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 14:36:44 +0100 Subject: [PATCH 028/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 370541c69..825b98380 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,37 +6,37 @@ strategy: matrix: check: name: check - python: '3.7' + python: '3.6' lint: name: lint - python: '3.7' + python: '3.6' docs_build: name: docs_build - python: '3.7' + python: '3.6' docs_linkcheck: name: docs_linkcheck - python: '3.7' + python: '3.6' condarecipe: name: condarecipe - python: '3.7' + python: '3.6' py27-notebook: name: py27-notebook python: '2.7' - py37-notebook54: - name: py37-notebook54 - python: '3.7' - py37-notebook55: - name: py37-notebook55 - python: '3.7' - py37-notebook44: - name: py37-notebook44 - python: '3.7' - py37-notebook: - name: py37-notebook - python: '3.7' - py37-appveyorartifacts: - name: py37-appveyorartifacts - python: '3.7' + py36-notebook54: + name: py36-notebook54 + python: '3.6' + py36-notebook55: + name: py36-notebook55 + python: '3.6' + py36-notebook44: + name: py36-notebook44 + python: '3.6' + py36-notebook: + name: py36-notebook + python: '3.6' + py36-appveyorartifacts: + name: py36-appveyorartifacts + python: '3.6' steps: - script: | From 87eddc684f510ab39e99baabb4c01cdee054fd2e Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 14:42:12 +0100 Subject: [PATCH 029/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 825b98380..25ee25ee3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -44,15 +44,15 @@ steps: id -un id -Gn # stuff for conda recipe - if [[ $(python) == "3.7" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh; fi - if [[ $(python) == "3.7" ]]; then bash Miniconda3-latest-Linux-x86_64 -b -p $HOME/miniconda; fi - if [[ $(python) == "3.7" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi - if [[ $(python) == "3.7" ]]; then hash -r; fi - if [[ $(python) == "3.7" ]]; then conda config --set always_yes yes --set changeps1 no; fi - if [[ $(python) == "3.7" ]]; then conda info -a; fi # Useful for debugging any issues with conda - if [[ $(python) == "3.7" ]]; then conda install conda-build; fi - if [[ $(python) == "3.7" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults - if [[ $(python) == "3.7" ]]; then git fetch; fi + if [[ $(python) == "3.6" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh; fi + if [[ $(python) == "3.6" ]]; then bash Miniconda3-latest-Linux-x86_64 -b -p $HOME/miniconda; fi + if [[ $(python) == "3.6" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi + if [[ $(python) == "3.6" ]]; then hash -r; fi + if [[ $(python) == "3.6" ]]; then conda config --set always_yes yes --set changeps1 no; fi + if [[ $(python) == "3.6" ]]; then conda info -a; fi # Useful for debugging any issues with conda + if [[ $(python) == "3.6" ]]; then conda install conda-build; fi + if [[ $(python) == "3.6" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults + if [[ $(python) == "3.6" ]]; then git fetch; fi displayName: 'Before Install' continueOnError: false @@ -63,6 +63,7 @@ steps: python setup.py bdist_wheel pip install tox virtualenv --version + if [[ $(python) == "3.6" ]]; then pyenv global 3.6.8; fi displayName: 'Install' continueOnError: false @@ -72,7 +73,7 @@ steps: continueOnError: false - script: | - if ! [[ $(python) == "3.7" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi + if ! [[ $(python) == "3.6" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi displayName: 'After Script' continueOnError: false From 86719d269fc00701010faafa06472b21b8a26da5 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 16:27:50 +0100 Subject: [PATCH 030/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 25ee25ee3..d3489854a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,7 +63,7 @@ steps: python setup.py bdist_wheel pip install tox virtualenv --version - if [[ $(python) == "3.6" ]]; then pyenv global 3.6.8; fi + if [[ $(python) == "3.6" ]]; then virtualenv venv --python=/usr/local/bin/python3; fi displayName: 'Install' continueOnError: false From c900c1dc2253b6a9376dc9ef8cd37fa1715135d2 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 16:30:16 +0100 Subject: [PATCH 031/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d3489854a..2a1029247 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,7 +63,7 @@ steps: python setup.py bdist_wheel pip install tox virtualenv --version - if [[ $(python) == "3.6" ]]; then virtualenv venv --python=/usr/local/bin/python3; fi + if [[ $(python) == "3.6" ]]; then virtualenv venv -p `which python3`; fi displayName: 'Install' continueOnError: false From 7d309c968d774f12b419f53a78726d72ce849591 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 16:33:56 +0100 Subject: [PATCH 032/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2a1029247..f61d600fd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,7 +63,7 @@ steps: python setup.py bdist_wheel pip install tox virtualenv --version - if [[ $(python) == "3.6" ]]; then virtualenv venv -p `which python3`; fi + if [[ $(python) == "3.6" ]]; then virtualenv venv -p `which python3.6`; fi displayName: 'Install' continueOnError: false From 93526c136f53586efce30e11d2ff60727882dc80 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 16:38:01 +0100 Subject: [PATCH 033/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f61d600fd..a449c3a02 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,7 +63,7 @@ steps: python setup.py bdist_wheel pip install tox virtualenv --version - if [[ $(python) == "3.6" ]]; then virtualenv venv -p `which python3.6`; fi + if [[ $(python) == "3.6" ]]; then virtualenv --python=python3.6`; fi displayName: 'Install' continueOnError: false From 668aef92e0e59ab37203f8a2f821f6bb469bab69 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 16:40:36 +0100 Subject: [PATCH 034/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a449c3a02..b8b4a968f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,7 +63,7 @@ steps: python setup.py bdist_wheel pip install tox virtualenv --version - if [[ $(python) == "3.6" ]]; then virtualenv --python=python3.6`; fi + if [[ $(python) == "3.6" ]]; then virtualenv --python=python3.6; fi displayName: 'Install' continueOnError: false From d0ee1916082429974494b073f27524f206155cd6 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 16:47:26 +0100 Subject: [PATCH 035/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b8b4a968f..1a2555803 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,7 +63,6 @@ steps: python setup.py bdist_wheel pip install tox virtualenv --version - if [[ $(python) == "3.6" ]]; then virtualenv --python=python3.6; fi displayName: 'Install' continueOnError: false From 9d8585e68c885836e7caea1ab8be603efa9f9286 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 16:55:39 +0100 Subject: [PATCH 036/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1a2555803..81b9063b8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,37 +5,37 @@ pool: strategy: matrix: check: - name: check + name: 'check' python: '3.6' lint: - name: lint + name: 'lint' python: '3.6' docs_build: - name: docs_build + name: 'docs_build' python: '3.6' docs_linkcheck: - name: docs_linkcheck + name: 'docs_linkcheck' python: '3.6' condarecipe: - name: condarecipe + name: 'condarecipe' python: '3.6' py27-notebook: - name: py27-notebook + name: 'py27-notebook' python: '2.7' py36-notebook54: - name: py36-notebook54 + name: 'py36-notebook54' python: '3.6' py36-notebook55: - name: py36-notebook55 + name: 'py36-notebook55' python: '3.6' py36-notebook44: - name: py36-notebook44 + name: 'py36-notebook44' python: '3.6' py36-notebook: - name: py36-notebook + name: 'py36-notebook' python: '3.6' py36-appveyorartifacts: - name: py36-appveyorartifacts + name: 'py36-appveyorartifacts' python: '3.6' steps: From ac0e2779c4ecd1ab23f7742cb4e9c15e23561a4b Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 17:03:31 +0100 Subject: [PATCH 037/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 81b9063b8..9333789a7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -39,6 +39,12 @@ strategy: python: '3.6' steps: +- task: UsePythonVersion@0 + inputs: + versionSpec: '3.6' + addToPath: true + architecture: 'x64' + - script: | uname -a id -un From 8f029faf774d244c585e77a38a3a745b75f42985 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 17:06:12 +0100 Subject: [PATCH 038/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9333789a7..254c7afe5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -39,12 +39,6 @@ strategy: python: '3.6' steps: -- task: UsePythonVersion@0 - inputs: - versionSpec: '3.6' - addToPath: true - architecture: 'x64' - - script: | uname -a id -un @@ -63,10 +57,10 @@ steps: continueOnError: false - script: | - python -m pip install --user virtualenv - sudo /usr/bin/easy_install virtualenv - pip install wheel - python setup.py bdist_wheel + # python -m pip install --user virtualenv + # sudo /usr/bin/easy_install virtualenv + # pip install wheel + # python setup.py bdist_wheel pip install tox virtualenv --version displayName: 'Install' From b2db923f9735a95ecd07eaf2c8029bc4f9c76e67 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 17:07:59 +0100 Subject: [PATCH 039/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 254c7afe5..30e38a81e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -57,8 +57,8 @@ steps: continueOnError: false - script: | - # python -m pip install --user virtualenv - # sudo /usr/bin/easy_install virtualenv + python3 -m pip install --user virtualenv + sudo /usr/bin/easy_install virtualenv # pip install wheel # python setup.py bdist_wheel pip install tox From 6175ba94cf9dad6a1ea686b546bfc682f0a0ac69 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 17:09:51 +0100 Subject: [PATCH 040/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 30e38a81e..9f676984f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -57,11 +57,11 @@ steps: continueOnError: false - script: | - python3 -m pip install --user virtualenv + python -m pip install --user virtualenv sudo /usr/bin/easy_install virtualenv - # pip install wheel - # python setup.py bdist_wheel - pip install tox + pip install wheel + python setup.py bdist_wheel + pip3 install tox virtualenv --version displayName: 'Install' continueOnError: false From 333efb0b49fb74b1de5e2cce8889d2748ca80181 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 17:13:43 +0100 Subject: [PATCH 041/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9f676984f..4fa1b71ef 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,6 +63,7 @@ steps: python setup.py bdist_wheel pip3 install tox virtualenv --version + sudo apt-get install python3-setuptools displayName: 'Install' continueOnError: false From 5b173cb1c4e9fed3da763f06b7f62bdaf290258e Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 17:30:15 +0100 Subject: [PATCH 042/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4fa1b71ef..cb259f074 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,37 +5,37 @@ pool: strategy: matrix: check: - name: 'check' + env: 'check' python: '3.6' lint: - name: 'lint' + env: 'lint' python: '3.6' docs_build: - name: 'docs_build' + env: 'docs_build' python: '3.6' docs_linkcheck: - name: 'docs_linkcheck' + env: 'docs_linkcheck' python: '3.6' condarecipe: - name: 'condarecipe' + env: 'condarecipe' python: '3.6' py27-notebook: - name: 'py27-notebook' + env: 'py27-notebook' python: '2.7' py36-notebook54: - name: 'py36-notebook54' + env: 'py36-notebook54' python: '3.6' py36-notebook55: - name: 'py36-notebook55' + env: 'py36-notebook55' python: '3.6' py36-notebook44: - name: 'py36-notebook44' + env: 'py36-notebook44' python: '3.6' py36-notebook: - name: 'py36-notebook' + env: 'py36-notebook' python: '3.6' py36-appveyorartifacts: - name: 'py36-appveyorartifacts' + env: 'py36-appveyorartifacts' python: '3.6' steps: @@ -68,7 +68,7 @@ steps: continueOnError: false - script: | - ~/.local/bin/tox -v -e $(name) + ~/.local/bin/tox -v -e $(env) displayName: 'Script' continueOnError: false From 23470e8e358cd55baa53afdf0dbbf355bf41aae0 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 17:54:41 +0100 Subject: [PATCH 043/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cb259f074..315ebfffa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -57,12 +57,12 @@ steps: continueOnError: false - script: | - python -m pip install --user virtualenv - sudo /usr/bin/easy_install virtualenv + # python -m pip install --user virtualenv + # sudo /usr/bin/easy_install virtualenv pip install wheel python setup.py bdist_wheel pip3 install tox - virtualenv --version + # virtualenv --version sudo apt-get install python3-setuptools displayName: 'Install' continueOnError: false From 31eb243a341b45d04f2a4baefe076f94a7fd3b18 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 18:35:42 +0100 Subject: [PATCH 044/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 146 +++++++++++++++++++++++--------------------- 1 file changed, 75 insertions(+), 71 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 315ebfffa..95ef5bd0b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,83 +2,87 @@ pool: vmImage: 'ubuntu-latest' -strategy: - matrix: - check: - env: 'check' - python: '3.6' - lint: - env: 'lint' - python: '3.6' - docs_build: - env: 'docs_build' - python: '3.6' - docs_linkcheck: - env: 'docs_linkcheck' - python: '3.6' - condarecipe: - env: 'condarecipe' - python: '3.6' - py27-notebook: - env: 'py27-notebook' - python: '2.7' - py36-notebook54: - env: 'py36-notebook54' - python: '3.6' - py36-notebook55: - env: 'py36-notebook55' - python: '3.6' - py36-notebook44: - env: 'py36-notebook44' - python: '3.6' - py36-notebook: - env: 'py36-notebook' - python: '3.6' - py36-appveyorartifacts: - env: 'py36-appveyorartifacts' - python: '3.6' +# strategy: +# matrix: +# check: +# env: 'check' +# python: '3.6' +# lint: +# env: 'lint' +# python: '3.6' +# docs_build: +# env: 'docs_build' +# python: '3.6' +# docs_linkcheck: +# env: 'docs_linkcheck' +# python: '3.6' +# condarecipe: +# env: 'condarecipe' +# python: '3.6' +# py27-notebook: +# env: 'py27-notebook' +# python: '2.7' +# py36-notebook54: +# env: 'py36-notebook54' +# python: '3.6' +# py36-notebook55: +# env: 'py36-notebook55' +# python: '3.6' +# py36-notebook44: +# env: 'py36-notebook44' +# python: '3.6' +# py36-notebook: +# env: 'py36-notebook' +# python: '3.6' +# py36-appveyorartifacts: +# env: 'py36-appveyorartifacts' +# python: '3.6' steps: -- script: | - uname -a - id -un - id -Gn - # stuff for conda recipe - if [[ $(python) == "3.6" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh; fi - if [[ $(python) == "3.6" ]]; then bash Miniconda3-latest-Linux-x86_64 -b -p $HOME/miniconda; fi - if [[ $(python) == "3.6" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi - if [[ $(python) == "3.6" ]]; then hash -r; fi - if [[ $(python) == "3.6" ]]; then conda config --set always_yes yes --set changeps1 no; fi - if [[ $(python) == "3.6" ]]; then conda info -a; fi # Useful for debugging any issues with conda - if [[ $(python) == "3.6" ]]; then conda install conda-build; fi - if [[ $(python) == "3.6" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults - if [[ $(python) == "3.6" ]]; then git fetch; fi - displayName: 'Before Install' - continueOnError: false +# - script: | +# uname -a +# id -un +# id -Gn +# # stuff for conda recipe +# if [[ $(python) == "3.6" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh; fi +# if [[ $(python) == "3.6" ]]; then bash Miniconda3-latest-Linux-x86_64 -b -p $HOME/miniconda; fi +# if [[ $(python) == "3.6" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi +# if [[ $(python) == "3.6" ]]; then hash -r; fi +# if [[ $(python) == "3.6" ]]; then conda config --set always_yes yes --set changeps1 no; fi +# if [[ $(python) == "3.6" ]]; then conda info -a; fi # Useful for debugging any issues with conda +# if [[ $(python) == "3.6" ]]; then conda install conda-build; fi +# if [[ $(python) == "3.6" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults +# if [[ $(python) == "3.6" ]]; then git fetch; fi +# displayName: 'Before Install' +# continueOnError: false -- script: | - # python -m pip install --user virtualenv - # sudo /usr/bin/easy_install virtualenv - pip install wheel - python setup.py bdist_wheel - pip3 install tox - # virtualenv --version - sudo apt-get install python3-setuptools - displayName: 'Install' - continueOnError: false - -- script: | - ~/.local/bin/tox -v -e $(env) - displayName: 'Script' - continueOnError: false - -- script: | - if ! [[ $(python) == "3.6" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi - displayName: 'After Script' - continueOnError: false +# - script: | +# # python -m pip install --user virtualenv +# # sudo /usr/bin/easy_install virtualenv +# pip install wheel +# python setup.py bdist_wheel +# pip3 install tox +# # virtualenv --version +# sudo apt-get install python3-setuptools +# displayName: 'Install' +# continueOnError: false +# - script: | +# ~/.local/bin/tox -v -e $(env) +# displayName: 'Script' +# continueOnError: false +# - script: | +# if ! [[ $(python) == "3.6" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi +# displayName: 'After Script' +# continueOnError: false +- script: | + git clone https://github.com/uclixnjupyternbaccessibility/jupyter_contrib_nbextensions.githttps://github.com/uclixnjupyternbaccessibility/jupyter_contrib_nbextensions.git + cd jupyter_contrib_nbextensions + tox + displayName: 'Run Tests' + continueOnError: false From 745d5c3119290a9e0ebb537e7adaae528e665caf Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 18:37:51 +0100 Subject: [PATCH 045/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 95ef5bd0b..a72f9aaeb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -78,8 +78,9 @@ steps: # continueOnError: false - script: | - git clone https://github.com/uclixnjupyternbaccessibility/jupyter_contrib_nbextensions.githttps://github.com/uclixnjupyternbaccessibility/jupyter_contrib_nbextensions.git + git clone https://github.com/uclixnjupyternbaccessibility/jupyter_contrib_nbextensions.git cd jupyter_contrib_nbextensions + pip install tox tox displayName: 'Run Tests' continueOnError: false From 50e7e64757f5fdcae8223373f191792ceed83026 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 18:39:44 +0100 Subject: [PATCH 046/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a72f9aaeb..ab6b138de 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -80,8 +80,10 @@ steps: - script: | git clone https://github.com/uclixnjupyternbaccessibility/jupyter_contrib_nbextensions.git cd jupyter_contrib_nbextensions - pip install tox - tox + pip3 install wheel + python3 setup.py bdist_wheel + pip3 install tox + ~/.local/bin/tox displayName: 'Run Tests' continueOnError: false From 6b182ce8bc705783112a12183f254e6e1001671c Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 18:41:30 +0100 Subject: [PATCH 047/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ab6b138de..a40ad06f0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -82,6 +82,7 @@ steps: cd jupyter_contrib_nbextensions pip3 install wheel python3 setup.py bdist_wheel + sudo apt-get install python3-setuptools pip3 install tox ~/.local/bin/tox displayName: 'Run Tests' From 2b55e4d8820281ba573988ac8162d81fdd3db6f2 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 18:50:17 +0100 Subject: [PATCH 048/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a40ad06f0..8f911749c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -78,8 +78,7 @@ steps: # continueOnError: false - script: | - git clone https://github.com/uclixnjupyternbaccessibility/jupyter_contrib_nbextensions.git - cd jupyter_contrib_nbextensions + sudo apt-get install python3.6 pip3 install wheel python3 setup.py bdist_wheel sudo apt-get install python3-setuptools From a502d1b15ce3e879500a6d562752dc0fbb13289a Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 18:56:59 +0100 Subject: [PATCH 049/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8f911749c..3687fbb3a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -76,9 +76,13 @@ steps: # if ! [[ $(python) == "3.6" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi # displayName: 'After Script' # continueOnError: false +- task: UsePythonVersion@0 + inputs: + versionSpec: '3.6' + addToPath: true + architecture: 'x64' - script: | - sudo apt-get install python3.6 pip3 install wheel python3 setup.py bdist_wheel sudo apt-get install python3-setuptools From 3e216fc70711ba5270c12448383c1670a8730ed7 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 19:01:05 +0100 Subject: [PATCH 050/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3687fbb3a..31070a7ef 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -76,13 +76,11 @@ steps: # if ! [[ $(python) == "3.6" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi # displayName: 'After Script' # continueOnError: false -- task: UsePythonVersion@0 - inputs: - versionSpec: '3.6' - addToPath: true - architecture: 'x64' - script: | + sudo add-apt-repository ppa:deadsnakes/ppa + sudo apt update + sudo apt install python3.6 pip3 install wheel python3 setup.py bdist_wheel sudo apt-get install python3-setuptools From 452226062e949306c7160e1339c92a4890da4007 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 19:14:00 +0100 Subject: [PATCH 051/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 163 ++++++++++++++++++++++---------------------- 1 file changed, 83 insertions(+), 80 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 31070a7ef..40a610e96 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,92 +2,95 @@ pool: vmImage: 'ubuntu-latest' -# strategy: -# matrix: -# check: -# env: 'check' -# python: '3.6' -# lint: -# env: 'lint' -# python: '3.6' -# docs_build: -# env: 'docs_build' -# python: '3.6' -# docs_linkcheck: -# env: 'docs_linkcheck' -# python: '3.6' -# condarecipe: -# env: 'condarecipe' -# python: '3.6' -# py27-notebook: -# env: 'py27-notebook' -# python: '2.7' -# py36-notebook54: -# env: 'py36-notebook54' -# python: '3.6' -# py36-notebook55: -# env: 'py36-notebook55' -# python: '3.6' -# py36-notebook44: -# env: 'py36-notebook44' -# python: '3.6' -# py36-notebook: -# env: 'py36-notebook' -# python: '3.6' -# py36-appveyorartifacts: -# env: 'py36-appveyorartifacts' -# python: '3.6' +strategy: + matrix: + check: + env: 'check' + python: '3.6' + lint: + env: 'lint' + python: '3.6' + docs_build: + env: 'docs_build' + python: '3.6' + docs_linkcheck: + env: 'docs_linkcheck' + python: '3.6' + condarecipe: + env: 'condarecipe' + python: '3.6' + py27-notebook: + env: 'py27-notebook' + python: '2.7' + py36-notebook54: + env: 'py36-notebook54' + python: '3.6' + py36-notebook55: + env: 'py36-notebook55' + python: '3.6' + py36-notebook44: + env: 'py36-notebook44' + python: '3.6' + py36-notebook: + env: 'py36-notebook' + python: '3.6' + py36-appveyorartifacts: + env: 'py36-appveyorartifacts' + python: '3.6' steps: -# - script: | -# uname -a -# id -un -# id -Gn -# # stuff for conda recipe -# if [[ $(python) == "3.6" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh; fi -# if [[ $(python) == "3.6" ]]; then bash Miniconda3-latest-Linux-x86_64 -b -p $HOME/miniconda; fi -# if [[ $(python) == "3.6" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi -# if [[ $(python) == "3.6" ]]; then hash -r; fi -# if [[ $(python) == "3.6" ]]; then conda config --set always_yes yes --set changeps1 no; fi -# if [[ $(python) == "3.6" ]]; then conda info -a; fi # Useful for debugging any issues with conda -# if [[ $(python) == "3.6" ]]; then conda install conda-build; fi -# if [[ $(python) == "3.6" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults -# if [[ $(python) == "3.6" ]]; then git fetch; fi -# displayName: 'Before Install' -# continueOnError: false - -# - script: | -# # python -m pip install --user virtualenv -# # sudo /usr/bin/easy_install virtualenv -# pip install wheel -# python setup.py bdist_wheel -# pip3 install tox -# # virtualenv --version -# sudo apt-get install python3-setuptools -# displayName: 'Install' -# continueOnError: false +- script: | + uname -a + id -un + id -Gn + # stuff for conda recipe + if [[ $(python) == "3.6" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh; fi + if [[ $(python) == "3.6" ]]; then bash Miniconda3-latest-Linux-x86_64 -b -p $HOME/miniconda; fi + if [[ $(python) == "3.6" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi + if [[ $(python) == "3.6" ]]; then hash -r; fi + if [[ $(python) == "3.6" ]]; then conda config --set always_yes yes --set changeps1 no; fi + if [[ $(python) == "3.6" ]]; then conda info -a; fi # Useful for debugging any issues with conda + if [[ $(python) == "3.6" ]]; then conda install conda-build; fi + if [[ $(python) == "3.6" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults + if [[ $(python) == "3.6" ]]; then git fetch; fi + displayName: 'Before Install' + continueOnError: false -# - script: | -# ~/.local/bin/tox -v -e $(env) -# displayName: 'Script' -# continueOnError: false +- script: | + sudo add-apt-repository ppa:deadsnakes/ppa + sudo apt update + sudo apt install python3.6 + # python -m pip install --user virtualenv + # sudo /usr/bin/easy_install virtualenv + pip install wheel + python setup.py bdist_wheel + pip3 install tox + virtualenv --version + sudo apt-get install python3-setuptools + displayName: 'Install' + continueOnError: false -# - script: | -# if ! [[ $(python) == "3.6" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi -# displayName: 'After Script' -# continueOnError: false +- script: | + ~/.local/bin/tox -v -e $(env) + displayName: 'Script' + continueOnError: false - script: | - sudo add-apt-repository ppa:deadsnakes/ppa - sudo apt update - sudo apt install python3.6 - pip3 install wheel - python3 setup.py bdist_wheel - sudo apt-get install python3-setuptools - pip3 install tox - ~/.local/bin/tox - displayName: 'Run Tests' - continueOnError: false + if ! [[ $(python) == "3.6" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi + displayName: 'After Script' + continueOnError: false + +# - script: | +# sudo add-apt-repository ppa:deadsnakes/ppa +# sudo apt update +# sudo apt install python3.6 +# pip3 install wheel +# python3 setup.py bdist_wheel +# sudo apt-get install python3-setuptools +# pip3 install tox +# ~/.local/bin/tox +# displayName: 'Run Tests' +# continueOnError: false From 3a592bc3ccde413341af060b88e7b27399cc3d4a Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 19:19:34 +0100 Subject: [PATCH 052/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 99 ++++++--------------------------------------- 1 file changed, 12 insertions(+), 87 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 40a610e96..88288af1a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,95 +2,20 @@ pool: vmImage: 'ubuntu-latest' -strategy: - matrix: - check: - env: 'check' - python: '3.6' - lint: - env: 'lint' - python: '3.6' - docs_build: - env: 'docs_build' - python: '3.6' - docs_linkcheck: - env: 'docs_linkcheck' - python: '3.6' - condarecipe: - env: 'condarecipe' - python: '3.6' - py27-notebook: - env: 'py27-notebook' - python: '2.7' - py36-notebook54: - env: 'py36-notebook54' - python: '3.6' - py36-notebook55: - env: 'py36-notebook55' - python: '3.6' - py36-notebook44: - env: 'py36-notebook44' - python: '3.6' - py36-notebook: - env: 'py36-notebook' - python: '3.6' - py36-appveyorartifacts: - env: 'py36-appveyorartifacts' - python: '3.6' - steps: - script: | - uname -a - id -un - id -Gn - # stuff for conda recipe - if [[ $(python) == "3.6" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh; fi - if [[ $(python) == "3.6" ]]; then bash Miniconda3-latest-Linux-x86_64 -b -p $HOME/miniconda; fi - if [[ $(python) == "3.6" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi - if [[ $(python) == "3.6" ]]; then hash -r; fi - if [[ $(python) == "3.6" ]]; then conda config --set always_yes yes --set changeps1 no; fi - if [[ $(python) == "3.6" ]]; then conda info -a; fi # Useful for debugging any issues with conda - if [[ $(python) == "3.6" ]]; then conda install conda-build; fi - if [[ $(python) == "3.6" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults - if [[ $(python) == "3.6" ]]; then git fetch; fi - displayName: 'Before Install' - continueOnError: false - -- script: | - sudo add-apt-repository ppa:deadsnakes/ppa - sudo apt update - sudo apt install python3.6 - # python -m pip install --user virtualenv - # sudo /usr/bin/easy_install virtualenv - pip install wheel - python setup.py bdist_wheel - pip3 install tox - virtualenv --version - sudo apt-get install python3-setuptools - displayName: 'Install' - continueOnError: false - -- script: | - ~/.local/bin/tox -v -e $(env) - displayName: 'Script' - continueOnError: false - -- script: | - if ! [[ $(python) == "3.6" ]]; then ~/.local/bin/tox -e coveralls,codecov; fi - displayName: 'After Script' - continueOnError: false - -# - script: | -# sudo add-apt-repository ppa:deadsnakes/ppa -# sudo apt update -# sudo apt install python3.6 -# pip3 install wheel -# python3 setup.py bdist_wheel -# sudo apt-get install python3-setuptools -# pip3 install tox -# ~/.local/bin/tox -# displayName: 'Run Tests' -# continueOnError: false + sudo add-apt-repository ppa:deadsnakes/ppa + sudo apt update + sudo apt install python3.6 + sudo apt-get install pandoc + sudo apt-get install inkscape + pip3 install wheel + python3 setup.py bdist_wheel + sudo apt-get install python3-setuptools + pip3 install tox + ~/.local/bin/tox + displayName: 'Run Tests' + continueOnError: false From 141d039b95a13fe86d71cd737fcc723300117172 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 21:30:35 +0100 Subject: [PATCH 053/329] Update azure-pipelines.yml for Azure Pipelines After debugging changed overall format --- azure-pipelines.yml | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 88288af1a..c27dbfee9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,10 +13,35 @@ steps: python3 setup.py bdist_wheel sudo apt-get install python3-setuptools pip3 install tox - ~/.local/bin/tox - displayName: 'Run Tests' - continueOnError: false + displayName: 'Setup Tests' + continueOnError: false +- script: | + ~/.local/bin/tox -v -e check + ~/.local/bin/tox -v -e lint + ~/.local/bin/tox -v -e docs_build + ~/.local/bin/tox -v -e docs_linkcheck + ~/.local/bin/tox -v -e py27-notebook + ~/.local/bin/tox -v -e py36-notebook54 + ~/.local/bin/tox -v -e py36-notebook55 + ~/.local/bin/tox -v -e py36-notebook44 + ~/.local/bin/tox -v -e py36-notebook + ~/.local/bin/tox -v -e appveyorartifacts + displayName: 'Run Tests' + continueOnError: false +- script: | + wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh + bash miniconda.sh -b -p $HOME/miniconda + export PATH="$HOME/miniconda/bin:$PATH" + hash -r + conda config --set always_yes yes --set changeps1 no + conda info -a + conda install conda-build + conda config --append channels conda-forge + git fetch --unshallow + ~/.local/bin/tox -v -e condarecipe + displayName: 'Run condarecipe' + continueOnError: false From e8e70279e6545c7b82e7aef23c60c5a5368b761f Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 21:35:49 +0100 Subject: [PATCH 054/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c27dbfee9..125c69f95 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,7 +18,7 @@ steps: - script: | ~/.local/bin/tox -v -e check - ~/.local/bin/tox -v -e lint + # ~/.local/bin/tox -v -e lint ~/.local/bin/tox -v -e docs_build ~/.local/bin/tox -v -e docs_linkcheck ~/.local/bin/tox -v -e py27-notebook From ffdd3f3f70b99d325fa077233f34d095ce81ce95 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 21:52:30 +0100 Subject: [PATCH 055/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 71 ++++++++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 125c69f95..192dbe6ee 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,6 +2,42 @@ pool: vmImage: 'ubuntu-latest' +strategy: + matrix: + check: + env: 'check' + python: '3.6' + # lint: + # env: 'lint' + # python: '3.6' + docs_build: + env: 'docs_build' + python: '3.6' + # docs_linkcheck: + # env: 'docs_linkcheck' + # python: '3.6' + condarecipe: + env: 'condarecipe' + python: '3.6' + py27-notebook: + env: 'py27-notebook' + python: '2.7' + py36-notebook54: + env: 'py36-notebook54' + python: '3.6' + py36-notebook55: + env: 'py36-notebook55' + python: '3.6' + py36-notebook44: + env: 'py36-notebook44' + python: '3.6' + py36-notebook: + env: 'py36-notebook' + python: '3.6' + # py36-appveyorartifacts: + # env: 'py36-appveyorartifacts' + # python: '3.6' + steps: - script: | sudo add-apt-repository ppa:deadsnakes/ppa @@ -13,35 +49,22 @@ steps: python3 setup.py bdist_wheel sudo apt-get install python3-setuptools pip3 install tox + # stuff for conda recipe + if [[ $(env) == "condarecipe" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh; fi + if [[ $(env) == "condarecipe" ]]; then bash Miniconda3-latest-Linux-x86_64 -b -p $HOME/miniconda; fi + if [[ $(env) == "condarecipe" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi + if [[ $(env) == "condarecipe" ]]; then hash -r; fi + if [[ $(env) == "condarecipe" ]]; then conda config --set always_yes yes --set changeps1 no; fi + if [[ $(env) == "condarecipe" ]]; then conda info -a; fi # Useful for debugging any issues with conda + if [[ $(env) == "condarecipe" ]]; then conda install conda-build; fi + if [[ $(env) == "condarecipe" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults + if [[ $(env) == "condarecipe" ]]; then git fetch; fi displayName: 'Setup Tests' continueOnError: false - script: | - ~/.local/bin/tox -v -e check - # ~/.local/bin/tox -v -e lint - ~/.local/bin/tox -v -e docs_build - ~/.local/bin/tox -v -e docs_linkcheck - ~/.local/bin/tox -v -e py27-notebook - ~/.local/bin/tox -v -e py36-notebook54 - ~/.local/bin/tox -v -e py36-notebook55 - ~/.local/bin/tox -v -e py36-notebook44 - ~/.local/bin/tox -v -e py36-notebook - ~/.local/bin/tox -v -e appveyorartifacts + ~/.local/bin/tox -v -e $(env) displayName: 'Run Tests' continueOnError: false -- script: | - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh - bash miniconda.sh -b -p $HOME/miniconda - export PATH="$HOME/miniconda/bin:$PATH" - hash -r - conda config --set always_yes yes --set changeps1 no - conda info -a - conda install conda-build - conda config --append channels conda-forge - git fetch --unshallow - ~/.local/bin/tox -v -e condarecipe - displayName: 'Run condarecipe' - continueOnError: false - From e56f540f0c26cac341433122e8e01ddf03c88d20 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 21:58:33 +0100 Subject: [PATCH 056/329] Update azure-pipelines.yml for Azure Pipelines Added summary to end of tests --- azure-pipelines.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 192dbe6ee..524a4a5c2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -67,4 +67,10 @@ steps: displayName: 'Run Tests' continueOnError: false +- script: | + more .tox/log/* | cat + more .tox/*/log/* | cat + displayName: 'Generate Summary' + continueOnError: true + From 9843a814c6a0afb63ef3d51e1d4659e6c17ad4f0 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 22:07:00 +0100 Subject: [PATCH 057/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 524a4a5c2..f6e7e5881 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -65,12 +65,4 @@ steps: - script: | ~/.local/bin/tox -v -e $(env) displayName: 'Run Tests' - continueOnError: false - -- script: | - more .tox/log/* | cat - more .tox/*/log/* | cat - displayName: 'Generate Summary' - continueOnError: true - - + continueOnError: false \ No newline at end of file From 6e019e33b2c15c9efe00b0dbe055d67c5dd4422b Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 22:10:07 +0100 Subject: [PATCH 058/329] Update azure-pipelines.yml for Azure Pipelines Added coverage tests --- azure-pipelines.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f6e7e5881..67f3ae6b4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -65,4 +65,9 @@ steps: - script: | ~/.local/bin/tox -v -e $(env) displayName: 'Run Tests' - continueOnError: false \ No newline at end of file + continueOnError: false + +- script: | + if ! [[ ${TOXENV} =~ ^(appveyorartifacts|check|condarecipe|docs|lint)$ ]]; then tox -e coveralls,codecov + displayName: 'Run Coverage Tests' + continueOnError: false \ No newline at end of file From 6f3d676b79fd1c26ed1e44f41d4dd9bdbad03c29 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 22:12:51 +0100 Subject: [PATCH 059/329] Update azure-pipelines.yml for Azure Pipelines Fixed small bug in pipeline --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 67f3ae6b4..088d1296a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -68,6 +68,6 @@ steps: continueOnError: false - script: | - if ! [[ ${TOXENV} =~ ^(appveyorartifacts|check|condarecipe|docs|lint)$ ]]; then tox -e coveralls,codecov + if ! [[ ${env} =~ ^(appveyorartifacts|check|condarecipe|docs|lint)$ ]]; then tox -e coveralls,codecov displayName: 'Run Coverage Tests' continueOnError: false \ No newline at end of file From fa18c8e1de797405fdd38ead53354f79b799b8d7 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 22:16:15 +0100 Subject: [PATCH 060/329] Update azure-pipelines.yml for Azure Pipelines Added missing closing brackets --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 088d1296a..6eedf3106 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -68,6 +68,6 @@ steps: continueOnError: false - script: | - if ! [[ ${env} =~ ^(appveyorartifacts|check|condarecipe|docs|lint)$ ]]; then tox -e coveralls,codecov + if ! [[ ${env} =~ ^(appveyorartifacts|check|condarecipe|docs|lint)$ ]]; then tox -e coveralls,codecov; fi displayName: 'Run Coverage Tests' continueOnError: false \ No newline at end of file From 13ed210da8dbd6d3198a2c7145e209020da64a98 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 22:19:25 +0100 Subject: [PATCH 061/329] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6eedf3106..b8e9399b2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -68,6 +68,6 @@ steps: continueOnError: false - script: | - if ! [[ ${env} =~ ^(appveyorartifacts|check|condarecipe|docs|lint)$ ]]; then tox -e coveralls,codecov; fi + if ! [[ ${env} =~ ^(appveyorartifacts|check|condarecipe|docs|lint)$ ]]; then ~/.local/bin/tox -e coveralls,codecov; fi displayName: 'Run Coverage Tests' continueOnError: false \ No newline at end of file From 6691cfb128da6d617ca24d43487cc717327fb907 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Wed, 3 Jul 2019 22:23:47 +0100 Subject: [PATCH 062/329] Update azure-pipelines.yml for Azure Pipelines Removed failing tests --- azure-pipelines.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b8e9399b2..273e374e5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -66,8 +66,3 @@ steps: ~/.local/bin/tox -v -e $(env) displayName: 'Run Tests' continueOnError: false - -- script: | - if ! [[ ${env} =~ ^(appveyorartifacts|check|condarecipe|docs|lint)$ ]]; then ~/.local/bin/tox -e coveralls,codecov; fi - displayName: 'Run Coverage Tests' - continueOnError: false \ No newline at end of file From c36ce5d20c3d3ea05944413171dabdf58eb2f67b Mon Sep 17 00:00:00 2001 From: fabihaahmed Date: Thu, 4 Jul 2019 01:08:15 +0100 Subject: [PATCH 063/329] Started working on the accessibility toolbar --- .../accessibility_toolbar/README.md | 13 +++++ .../accessibility_toolbar.yaml | 7 +++ .../accessibility_toolbar/main.js | 58 +++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/README.md create mode 100644 src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/accessibility_toolbar.yaml create mode 100644 src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js diff --git a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/README.md b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/README.md new file mode 100644 index 000000000..3a8e0763c --- /dev/null +++ b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/README.md @@ -0,0 +1,13 @@ +Accessibility Toolbar +============== + +Adds a toolbar that provides accessibility features such as: +1. Text format - which allows users to change the text size, colour, spacing etc. to make the text as readable/accessible as possible for users +2. Code spell checker - Live syntax checking of code as the user types underlining when a syntax error has occurred +3. Voice control - Allow some commonly used functionality such as running a notebook, restarting the kernel etc. be carried out using voice control +4. Planner - a planner that is displayed down the side of a page allowing the user to plan out and write notes about their notebook +5. Accessible themes - various themes such as high contrast/dark mode which will make the notebook more easily readable + + + + diff --git a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/accessibility_toolbar.yaml b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/accessibility_toolbar.yaml new file mode 100644 index 000000000..9b7480c21 --- /dev/null +++ b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/accessibility_toolbar.yaml @@ -0,0 +1,7 @@ +Type: Jupyter Notebook Extension +Name: Accessibility Toolbar +Description: Adds a toolbar that provides accessibility features. + Helpful for people with dyslexia or visual impairment. +Link: README.md +Main: main.js +Compatibility: 3.x, 4.x, 5.x, 6.x diff --git a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js new file mode 100644 index 000000000..bbe3fba4e --- /dev/null +++ b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js @@ -0,0 +1,58 @@ + +define([ + 'base/js/namespace', + 'jquery', + 'require', + 'base/js/events', + 'base/js/utils', +], function(Jupyter, $, requirejs, events, utils) { + "use strict"; + + var load_ipython_extension = function() { + Jupyter.toolbar.add_buttons_group([ + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Customise font', + 'icon' : 'fas fa-font', + 'handler': function () { + //TODO + } + }, 'customise-font', 'toolbar'), + + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Spell Checker', + 'icon' : 'fas fa-check', + 'handler': function () { + //TODO + } + }, 'spell-checker', 'toolbar'), + + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Voice Control', + 'icon' : 'fas fa-microphone', + 'handler': function () { + //TODO + } + }, 'voice-control', 'toolbar'), + + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Planner', + 'icon' : 'fas fa-sticky-note', + 'handler': function () { + //TODO + } + }, 'planner', 'toolbar'), + + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Custom themes', + 'icon' : 'fas fa-clone', + 'handler': function () { + //TODO + } + }, 'customise-theme', 'toolbar'), + ]); + }; + + return { + load_ipython_extension : load_ipython_extension + }; +}); \ No newline at end of file From 19c1c30c5e1ad56acc3a2540d05a9d961957cddc Mon Sep 17 00:00:00 2001 From: ednut15 Date: Thu, 4 Jul 2019 11:38:00 +0100 Subject: [PATCH 064/329] Corrected indentation of main js file --- .../accessibility_toolbar/main.js | 80 +++++++++---------- 1 file changed, 38 insertions(+), 42 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js index bbe3fba4e..a72164228 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js @@ -9,50 +9,46 @@ define([ "use strict"; var load_ipython_extension = function() { - Jupyter.toolbar.add_buttons_group([ - Jupyter.keyboard_manager.actions.register ({ - 'help' : 'Customise font', - 'icon' : 'fas fa-font', - 'handler': function () { - //TODO - } - }, 'customise-font', 'toolbar'), - - Jupyter.keyboard_manager.actions.register ({ - 'help' : 'Spell Checker', - 'icon' : 'fas fa-check', - 'handler': function () { - //TODO - } - }, 'spell-checker', 'toolbar'), - - Jupyter.keyboard_manager.actions.register ({ - 'help' : 'Voice Control', - 'icon' : 'fas fa-microphone', - 'handler': function () { - //TODO - } - }, 'voice-control', 'toolbar'), - - Jupyter.keyboard_manager.actions.register ({ - 'help' : 'Planner', - 'icon' : 'fas fa-sticky-note', - 'handler': function () { - //TODO - } - }, 'planner', 'toolbar'), - - Jupyter.keyboard_manager.actions.register ({ - 'help' : 'Custom themes', - 'icon' : 'fas fa-clone', - 'handler': function () { - //TODO - } - }, 'customise-theme', 'toolbar'), - ]); + Jupyter.toolbar.add_buttons_group([ + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Customise font', + 'icon' : 'fas fa-font', + 'handler': function () { + //TODO + } + }, 'customise-font', 'toolbar'), + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Spell Checker', + 'icon' : 'fas fa-check', + 'handler': function () { + //TODO + } + }, 'spell-checker', 'toolbar'), + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Voice Control', + 'icon' : 'fas fa-microphone', + 'handler': function () { + //TODO + } + }, 'voice-control', 'toolbar'), + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Planner', + 'icon' : 'fas fa-sticky-note', + 'handler': function () { + //TODO + } + }, 'planner', 'toolbar'), + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Custom themes', + 'icon' : 'fas fa-clone', + 'handler': function () { + //TODO + } + }, 'customise-theme', 'toolbar'), + ]); }; return { load_ipython_extension : load_ipython_extension }; -}); \ No newline at end of file +}); From 5222445478c3c98cf5c056e2448e7975b8f6d1f8 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Thu, 4 Jul 2019 11:42:56 +0100 Subject: [PATCH 065/329] created basic planner popup with close button --- .../accessibility_toolbar/main.js | 48 ++++++++++++++++++- .../accessibility_toolbar/planner.css | 10 ++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/planner.css diff --git a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js index bbe3fba4e..d87b3766e 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js @@ -8,6 +8,45 @@ define([ ], function(Jupyter, $, requirejs, events, utils) { "use strict"; + + + var Planner = function (nb) { + var planner = this; + this.notebook = nb; + this.kernel = nb.kernel; + this.km = nb.keyboard_manager; + this.open = false; + + this.element = $("
"); + + this.close_button = $("").addClass('fa fa-close'); + this.close_button.click(function() { + planner.close_planner(); + }); + + this.element.append(this.close_button); + + $("body").append(this.element); + } + + Planner.prototype.open_planner = function () { + this.open = true; + var site_height = $("#site").height(); + this.element.animate({ + height: site_height, + }, 200); + this.element.show(); + } + + Planner.prototype.close_planner = function () { + this.open = false; + this.element.animate({ + height: 0, + }, 100); + } + + + var load_ipython_extension = function() { Jupyter.toolbar.add_buttons_group([ Jupyter.keyboard_manager.actions.register ({ @@ -38,7 +77,14 @@ define([ 'help' : 'Planner', 'icon' : 'fas fa-sticky-note', 'handler': function () { - //TODO + + var link = document.createElement("link"); + link.type = "text/css"; + link.rel = "stylesheet"; + link.href = requirejs.toUrl("./planner.css"); + document.getElementsByTagName("head")[0].appendChild(link); + new Planner(Jupyter.notebook).open_planner(); + console.log('new planner') } }, 'planner', 'toolbar'), diff --git a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/planner.css b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/planner.css new file mode 100644 index 000000000..5cf641a37 --- /dev/null +++ b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/planner.css @@ -0,0 +1,10 @@ +#nbextension-planner { + position: absolute; + right: 0; + bottom: 0; + width: 40%; + background-color: #FFFFFF; + border-left: 1px solid #aaa; + border-top: 1px solid #aaa; + z-index: 105; +} \ No newline at end of file From 974d20619826a6000f780dc32c3c5797102f77ba Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Thu, 4 Jul 2019 12:39:06 +0100 Subject: [PATCH 066/329] made the planner open and close and scale the page accordingly --- .../accessibility_toolbar/main.js | 114 ++++++++++-------- .../accessibility_toolbar/planner.css | 4 +- 2 files changed, 65 insertions(+), 53 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js index d87b3766e..843b5f213 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js @@ -17,7 +17,7 @@ define([ this.km = nb.keyboard_manager; this.open = false; - this.element = $("
"); + this.element = $("
").addClass('col-md-4'); this.close_button = $("").addClass('fa fa-close'); this.close_button.click(function() { @@ -26,7 +26,8 @@ define([ this.element.append(this.close_button); - $("body").append(this.element); + $("#notebook").addClass('row').append(this.element); + this.close_planner(); } Planner.prototype.open_planner = function () { @@ -36,6 +37,7 @@ define([ height: site_height, }, 200); this.element.show(); + $("#notebook-container").addClass('col-md-8') } Planner.prototype.close_planner = function () { @@ -43,59 +45,71 @@ define([ this.element.animate({ height: 0, }, 100); + $("#notebook-container").removeClass('col-md-8'); + }; + + Planner.prototype.toggle_planner = function () { + this.open ? this.close_planner() : this.open_planner(); + } + + function setup_planner() { + var link = document.createElement("link"); + link.type = "text/css"; + link.rel = "stylesheet"; + link.href = requirejs.toUrl("./planner.css"); + document.getElementsByTagName("head")[0].appendChild(link); + + console.log('New Planner Created'); + return new Planner(Jupyter.notebook); } var load_ipython_extension = function() { - Jupyter.toolbar.add_buttons_group([ - Jupyter.keyboard_manager.actions.register ({ - 'help' : 'Customise font', - 'icon' : 'fas fa-font', - 'handler': function () { - //TODO - } - }, 'customise-font', 'toolbar'), - - Jupyter.keyboard_manager.actions.register ({ - 'help' : 'Spell Checker', - 'icon' : 'fas fa-check', - 'handler': function () { - //TODO - } - }, 'spell-checker', 'toolbar'), - - Jupyter.keyboard_manager.actions.register ({ - 'help' : 'Voice Control', - 'icon' : 'fas fa-microphone', - 'handler': function () { - //TODO - } - }, 'voice-control', 'toolbar'), - - Jupyter.keyboard_manager.actions.register ({ - 'help' : 'Planner', - 'icon' : 'fas fa-sticky-note', - 'handler': function () { - - var link = document.createElement("link"); - link.type = "text/css"; - link.rel = "stylesheet"; - link.href = requirejs.toUrl("./planner.css"); - document.getElementsByTagName("head")[0].appendChild(link); - new Planner(Jupyter.notebook).open_planner(); - console.log('new planner') - } - }, 'planner', 'toolbar'), - - Jupyter.keyboard_manager.actions.register ({ - 'help' : 'Custom themes', - 'icon' : 'fas fa-clone', - 'handler': function () { - //TODO - } - }, 'customise-theme', 'toolbar'), - ]); + + var planner = setup_planner(); + + Jupyter.toolbar.add_buttons_group([ + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Customise font', + 'icon' : 'fas fa-font', + 'handler': function () { + //TODO + } + }, 'customise-font', 'accessibility-toolbar'), + + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Spell Checker', + 'icon' : 'fas fa-check', + 'handler': function () { + //TODO + } + }, 'spell-checker', 'accessibility-toolbar'), + + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Voice Control', + 'icon' : 'fas fa-microphone', + 'handler': function () { + //TODO + } + }, 'voice-control', 'accessibility-toolbar'), + + Jupyter.keyboard_manager.actions.register ({ + 'help': 'Planner', + 'icon': 'fas fa-sticky-note', + 'handler': function () { + planner.toggle_planner(); + } + }, 'planner', 'accessibility-toolbar'), + + Jupyter.keyboard_manager.actions.register ({ + 'help' : 'Custom themes', + 'icon' : 'fas fa-clone', + 'handler': function () { + //TODO + } + }, 'customise-theme', 'accessibility-toolbar'), + ]); }; return { diff --git a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/planner.css b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/planner.css index 5cf641a37..4b0aae86d 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/planner.css +++ b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/planner.css @@ -2,9 +2,7 @@ position: absolute; right: 0; bottom: 0; - width: 40%; background-color: #FFFFFF; border-left: 1px solid #aaa; border-top: 1px solid #aaa; - z-index: 105; -} \ No newline at end of file +} From ac2c6a60a71f1a4b410641075678084eef094b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=9F=AC?= Date: Thu, 4 Jul 2019 12:46:19 +0100 Subject: [PATCH 067/329] dropdown menu --- .../nbextensions/Untitled.ipynb | 32 +++++++++++++++++ .../accessibility_toolbar/main.js | 34 ++++++++++++++++++- .../accessibility_toolbar/spell-checker.css | 19 +++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 src/jupyter_contrib_nbextensions/nbextensions/Untitled.ipynb create mode 100644 src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/spell-checker.css diff --git a/src/jupyter_contrib_nbextensions/nbextensions/Untitled.ipynb b/src/jupyter_contrib_nbextensions/nbextensions/Untitled.ipynb new file mode 100644 index 000000000..303494929 --- /dev/null +++ b/src/jupyter_contrib_nbextensions/nbextensions/Untitled.ipynb @@ -0,0 +1,32 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.7.3" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js index bbe3fba4e..a50992cca 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js @@ -23,6 +23,7 @@ define([ 'icon' : 'fas fa-check', 'handler': function () { //TODO + spell_checker_menu(); } }, 'spell-checker', 'toolbar'), @@ -55,4 +56,35 @@ define([ return { load_ipython_extension : load_ipython_extension }; -}); \ No newline at end of file +}); + +var spc_flag=false; +function spell_checker_menu(){ + var spc; + var l=document.querySelectorAll('button[title]'); + for(var i=0;i Date: Thu, 4 Jul 2019 16:59:01 +0100 Subject: [PATCH 068/329] add buttons --- .../nbextensions/Untitled.ipynb | 46 ++++++++++ .../accessibility_toolbar/main.js | 87 ++++++++++++++++++- 2 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 src/jupyter_contrib_nbextensions/nbextensions/Untitled.ipynb diff --git a/src/jupyter_contrib_nbextensions/nbextensions/Untitled.ipynb b/src/jupyter_contrib_nbextensions/nbextensions/Untitled.ipynb new file mode 100644 index 000000000..f0f2796c5 --- /dev/null +++ b/src/jupyter_contrib_nbextensions/nbextensions/Untitled.ipynb @@ -0,0 +1,46 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.7.3" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js index a72164228..a3a1d4648 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js @@ -14,7 +14,8 @@ define([ 'help' : 'Customise font', 'icon' : 'fas fa-font', 'handler': function () { - //TODO + customise_font_menu(); + } }, 'customise-font', 'toolbar'), Jupyter.keyboard_manager.actions.register ({ @@ -52,3 +53,87 @@ define([ load_ipython_extension : load_ipython_extension }; }); + +//-------------------------- +var fs_flag=false; +function customise_font_menu(){ + + var l=document.querySelectorAll('button[title]'); + for(var i=0;i Date: Thu, 4 Jul 2019 17:12:19 +0100 Subject: [PATCH 069/329] changed the way the planner opens and closes and added blank canvas --- .../accessibility_toolbar/main.js | 19 ++++++++++--------- .../accessibility_toolbar/planner.css | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js index 0fbece0cd..51a86e038 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/main.js @@ -19,32 +19,33 @@ define([ this.element = $("
").addClass('col-md-4'); - this.close_button = $("").addClass('fa fa-close'); + this.close_button = $("`; + var spc_menuitem2=$("
  • "); + const dlg_template=` +
    +
    +
    + + +
    +
    + ... +
    +
    + + +
    `; + spc_menuitem2.append(m2_template); + dropMenu.append(spc_menuitem2); + var popup_dlg=$("
    ",{id: "popup_dlg", "tabindex":"-1", "class": "modal fade","role":"dialog"}); + popup_dlg.append(dlg_template); + spc.parent().append(popup_dlg); + + //append dropdown menu to parent + spc.parent().append(dropMenu); + } } return spell_checker; -}) +}) \ No newline at end of file diff --git a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/spellchecker.css b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/spellchecker.css index bbc17577d..55b0f0c16 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/spellchecker.css +++ b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/spellchecker.css @@ -2,7 +2,42 @@ transform: translateX(50px); } -/* .switch div{ - width: - left: 50px; -} */ \ No newline at end of file +.spc_dialog{ + transform: translateX(15px); +} + +/* .modal{ + display: none; /* Hidden by default */ + position: fixed; /* Stay in place */ + z-index: 1; /* Sit on top */ + left: 0; + top: 0; + width: 100%; /* Full width */ + height: 100%; /* Full height */ + overflow: auto; /* Enable scroll if needed */ + background-color: rgb(0,0,0); /* Fallback color */ + background-color: rgba(0,0,0,0.4); /* Black w/ opacity */ +} + +.modal-content { + background-color: #fefefe; + margin: 15% auto; /* 15% from the top and centered */ + padding: 20px; + border: 1px solid #888; + width: 80%; /* Could be more or less, depending on screen size */ + } + + /* The Close Button */ +.close { + color: #aaa; + float: right; + font-size: 28px; + font-weight: bold; + } + + .close:hover, + .close:focus { + color: black; + text-decoration: none; + cursor: pointer; + } */ \ No newline at end of file From 336d0b3e1d85d6e81ad871e77db9af7634ff25d4 Mon Sep 17 00:00:00 2001 From: tao <45403704+taohan16@users.noreply.github.com> Date: Tue, 9 Jul 2019 12:12:31 +0100 Subject: [PATCH 089/329] Delete Untitled.ipynb --- .../nbextensions/Untitled.ipynb | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 src/jupyter_contrib_nbextensions/nbextensions/Untitled.ipynb diff --git a/src/jupyter_contrib_nbextensions/nbextensions/Untitled.ipynb b/src/jupyter_contrib_nbextensions/nbextensions/Untitled.ipynb deleted file mode 100644 index dbba8601e..000000000 --- a/src/jupyter_contrib_nbextensions/nbextensions/Untitled.ipynb +++ /dev/null @@ -1,48 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "dasfa" - ] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.7.3" - } - }, - "nbformat": 4, - "nbformat_minor": 2 -} From 359d8ac2d772c1f29237bec9386493ccc9fe44c0 Mon Sep 17 00:00:00 2001 From: tao <45403704+taohan16@users.noreply.github.com> Date: Tue, 9 Jul 2019 12:13:07 +0100 Subject: [PATCH 090/329] Update spellchecker.css --- .../accessibility_toolbar/spellchecker.css | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/spellchecker.css b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/spellchecker.css index 55b0f0c16..0922c9a87 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/spellchecker.css +++ b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/spellchecker.css @@ -5,39 +5,3 @@ .spc_dialog{ transform: translateX(15px); } - -/* .modal{ - display: none; /* Hidden by default */ - position: fixed; /* Stay in place */ - z-index: 1; /* Sit on top */ - left: 0; - top: 0; - width: 100%; /* Full width */ - height: 100%; /* Full height */ - overflow: auto; /* Enable scroll if needed */ - background-color: rgb(0,0,0); /* Fallback color */ - background-color: rgba(0,0,0,0.4); /* Black w/ opacity */ -} - -.modal-content { - background-color: #fefefe; - margin: 15% auto; /* 15% from the top and centered */ - padding: 20px; - border: 1px solid #888; - width: 80%; /* Could be more or less, depending on screen size */ - } - - /* The Close Button */ -.close { - color: #aaa; - float: right; - font-size: 28px; - font-weight: bold; - } - - .close:hover, - .close:focus { - color: black; - text-decoration: none; - cursor: pointer; - } */ \ No newline at end of file From aa400d8590fe62d0adbd9ed1121b8080f9d880a4 Mon Sep 17 00:00:00 2001 From: Joshua Zeltser Date: Tue, 9 Jul 2019 12:27:52 +0100 Subject: [PATCH 091/329] changed code to jquery --- .../accessibility_toolbar/fontStyle.js | 124 +++++++----------- .../accessibility_toolbar/main.js | 4 +- 2 files changed, 51 insertions(+), 77 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/fontStyle.js b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/fontStyle.js index b533e2b63..aba28624c 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/fontStyle.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/accessibility_toolbar/fontStyle.js @@ -7,7 +7,6 @@ define([ var fontStyle = function() { - var dp_menu_flag = false; var fs_flag = false; const boostrap_toggle = "https://gitcdn.github.io/bootstrap-toggle/2.2.2/css/bootstrap-toggle.min.css"; const boostrap_toggle_js = "https://gitcdn.github.io/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min.js"; @@ -21,7 +20,7 @@ define([ document.getElementsByTagName("head")[0].appendChild(link); }; - fontStyle.prototype.fs_js_initail = function(url) { //js_initail + fontStyle.prototype.fs_js_initial = function(url) { //js_initail var script = document.createElement("script"); script.src = requirejs.toUrl(url); document.getElementsByTagName("head")[0].appendChild(script); @@ -30,112 +29,87 @@ define([ fontStyle.prototype.fs_initial=function() { //fs_initial this.fs_css_initial("../../nbextensions/accessibility_toolbar/fontStyle.css");//spc_flag this.fs_css_initial(boostrap_toggle); - this.fs_js_initail(boostrap_toggle_js); + this.fs_js_initial(boostrap_toggle_js); //find Customise font button on the page - var fs = document.querySelector('button[title="Customise font"]'); - fs.className += " dropdown-toggle"; - fs.setAttribute("data-toggle","dropdown") + var fs = $('button[title="Customise font"]'); + fs.addClass('dropdown-toggle'); + fs.attr('data-toggle','dropdown'); this.fs_dropdown_initial(fs); }//end fs_initial - fontStyle.prototype.fs_dropdown_initial=function(fs) { + fontStyle.prototype.fs_dropdown_initial = function(fs) { //Create the dropdown menu - if(!dp_menu_flag) { - var dropMenu = document.createElement("ul"); - dropMenu.className = "dropdown-menu"; - dropMenu.id = "fs_dropdown"; - dp_menu_flag = true; - } + var dropMenu = $('