diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index d132f4db..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,47 +0,0 @@ -version: 2 - -main: &main - machine: true - steps: - - checkout - - run: - command: docker pull dorowu/ubuntu-desktop-lxde-vnc:focal - - run: - name: Install system packages - command: | - sudo apt-get -qq update - sudo apt-get install libegl1-mesa - - run: - command: ./continuous_integration/circle/install.sh - - run: - command: ./continuous_integration/circle/runtests.sh || ./continuous_integration/circle/runtests.sh - -jobs: - python3.7: - <<: *main - environment: - - PYTHON_VERSION: "3.7" - - USE_CONDA: "yes" - - CODECOV_TOKEN: "273c981b-7851-4895-a4bb-07377c67791e" - - python3.8: - <<: *main - environment: - - PYTHON_VERSION: "3.8" - - USE_CONDA: "yes" - - CODECOV_TOKEN: "273c981b-7851-4895-a4bb-07377c67791e" - - python3.9: - <<: *main - environment: - - PYTHON_VERSION: "3.9" - - USE_CONDA: "yes" - - CODECOV_TOKEN: "273c981b-7851-4895-a4bb-07377c67791e" - -workflows: - version: 2 - build_and_test: - jobs: - - python3.7 - - python3.8 - - python3.9 diff --git a/.github/scripts/install.sh b/.github/scripts/install.sh new file mode 100644 index 00000000..734cb7df --- /dev/null +++ b/.github/scripts/install.sh @@ -0,0 +1,15 @@ +#!/bin/bash -ex + +# Install dependencies +if [[ "$OS" == "win" ]] +then + mamba install -q -y -c conda-forge --file requirements/conda_win.txt +else + mamba install -q -y -c conda-forge --file requirements/conda.txt +fi + + +# Install test dependencies +mamba install -q -y -c conda-forge --file requirements/tests.txt + +mamba install -q codecov diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml new file mode 100644 index 00000000..58f2ad27 --- /dev/null +++ b/.github/workflows/test-linux.yml @@ -0,0 +1,67 @@ +name: Linux tests + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + build: + name: Py${{ matrix.PYTHON_VERSION }}, ${{ matrix.INSTALL_TYPE }} + runs-on: ubuntu-latest + env: + CI: 'true' + CODECOV_TOKEN: "273c981b-7851-4895-a4bb-07377c67791e" + OS: 'linux' + PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }} + USE_CONDA: ${{ matrix.INSTALL_TYPE == 'conda' }} + USE_GDB: 'false' + strategy: + fail-fast: false + matrix: + INSTALL_TYPE: ['conda'] + PYTHON_VERSION: ['3.7', '3.8', '3.9'] + timeout-minutes: 120 + steps: + - name: checkout branch + uses: actions/checkout@v3 + - name: Install dependencies + shell: bash + run: | + sudo apt-get update --fix-missing + sudo apt-get install -qq pyqt5-dev-tools libxcb-xinerama0 xterm --fix-missing + - name : Setup miniforge + uses: conda-incubator/setup-miniconda@v2 + with: + miniforge-variant: Mambaforge + python-version: ${{ matrix.PYTHON_VERSION }} + mamba-version: "*" + use-mamba: true + channels: conda-forge,defaults + channel-priority: true + activate-environment: test + miniforge-version: latest + - name: Setup node + uses: actions/setup-node@v2 + with: + node-version: '13' + - name: Create test environment + shell: bash -l {0} + run: bash -l .github/scripts/install.sh + - name: Show test environment + shell: bash -l {0} + run: | + conda info + conda list + - name: Build static resources + shell: bash -l {0} + run: python setup.py build_static + - name: Run tests + shell: bash -l {0} + run: xvfb-run --auto-servernum python runtests.py || xvfb-run --auto-servernum python runtests.py || xvfb-run --auto-servernum python runtests.py || xvfb-run --auto-servernum python runtests.py || xvfb-run --auto-servernum python runtests.py + - name: Coverage + shell: bash -l {0} + run: codecov \ No newline at end of file diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml new file mode 100644 index 00000000..6458bfda --- /dev/null +++ b/.github/workflows/test-mac.yml @@ -0,0 +1,70 @@ +name: Mac tests + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + build: + name: Py${{ matrix.PYTHON_VERSION }}, ${{ matrix.INSTALL_TYPE }} + runs-on: macos-latest + env: + CI: 'true' + CODECOV_TOKEN: "273c981b-7851-4895-a4bb-07377c67791e" + OS: 'mac' + PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }} + USE_CONDA: ${{ matrix.INSTALL_TYPE == 'conda' }} + USE_GDB: 'false' + strategy: + fail-fast: false + matrix: + INSTALL_TYPE: ['conda'] + PYTHON_VERSION: ['3.7', '3.8', '3.9'] + timeout-minutes: 120 + steps: + - name: checkout branch + uses: actions/checkout@v3 + - name : Setup miniforge + uses: conda-incubator/setup-miniconda@v2 + with: + miniforge-variant: Mambaforge + python-version: ${{ matrix.PYTHON_VERSION }} + mamba-version: "*" + use-mamba: true + channels: conda-forge,defaults + channel-priority: true + activate-environment: test + miniforge-version: latest + - name: Create test environment + shell: bash -l {0} + run: bash -l .github/scripts/install.sh + - name: Show test environment + shell: bash -l {0} + run: | + conda info + conda list + - name: Setup node + uses: actions/setup-node@v2 + with: + node-version: '13' + - name: Node and NPM version + shell: bash -l {0} + run: | + export PATH=/Users/runner/hostedtoolcache/node/13.14.0/x64/bin:$PATH + node -v + npm -v + - name: Build static resources + shell: bash -l {0} + run: | + export PATH=/Users/runner/hostedtoolcache/node/13.14.0/x64/bin:$PATH + python setup.py build_static + - name: Run tests + shell: bash -l {0} + run: python runtests.py || python runtests.py || python runtests.py || python runtests.py || python runtests.py + - name: Coverage + shell: bash -l {0} + run: codecov \ No newline at end of file diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml new file mode 100644 index 00000000..4da73dab --- /dev/null +++ b/.github/workflows/test-windows.yml @@ -0,0 +1,62 @@ +name: Windows tests + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + build: + name: Py${{ matrix.PYTHON_VERSION }}, ${{ matrix.INSTALL_TYPE }} + runs-on: windows-latest + env: + CI: 'true' + CODECOV_TOKEN: "273c981b-7851-4895-a4bb-07377c67791e" + OS: 'win' + PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }} + USE_CONDA: ${{ matrix.INSTALL_TYPE == 'conda' }} + USE_GDB: 'false' + strategy: + fail-fast: false + matrix: + INSTALL_TYPE: ['conda'] + PYTHON_VERSION: ['3.7', '3.8', '3.9'] + timeout-minutes: 120 + steps: + - name: checkout branch + uses: actions/checkout@v3 + - name : Setup miniforge + uses: conda-incubator/setup-miniconda@v2 + with: + miniforge-variant: Mambaforge + python-version: ${{ matrix.PYTHON_VERSION }} + mamba-version: "*" + use-mamba: true + channels: conda-forge,defaults + channel-priority: true + activate-environment: test + miniforge-version: latest + - name: Setup node + uses: actions/setup-node@v2 + with: + node-version: '13' + - name: Create test environment + shell: bash -l {0} + run: bash -l .github/scripts/install.sh + - name: Show test environment + shell: bash -l {0} + run: | + conda info + conda list + - name: Build static resources + shell: bash -l {0} + run: python setup.py build_static + - name: Run tests + shell: bash -l {0} + run: python runtests.py || python runtests.py || python runtests.py || python runtests.py || python runtests.py + - name: Coverage + shell: bash -l {0} + run: codecov \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 28f92542..00000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,176 +0,0 @@ -# https://dev.azure.com/spyder-ide/spyder-terminal/ - -jobs: - -################################################################################ -# macOS -################################################################################ -- job: 'macOS' - - pool: - vmImage: 'macOS-10.15' - - timeoutInMinutes: 100 - - variables: - USE_CONDA: "yes" - CI: True - AZURE: True - - # Run the pipeline with multiple Python versions - strategy: - matrix: - Python37: - python.version: '3.7' - Python38: - python.version: '3.8' - Python39: - python.version: '3.9' - maxParallel: 4 - - steps: - # Set the UsePythonVersion task to reference the matrix variable for its Python version - - task: UsePythonVersion@0 - inputs: - versionSpec: '$(python.version)' - architecture: 'x64' - - - script: sudo chown -R 501:20 /Users/runner/.conda - displayName: Fix .conda permissions - - - script: sudo install -d -m 0777 /usr/local/envs/ - displayName: Fix conda env permissions - - - script: sudo chown -R 501:20 /usr/local/miniconda/ - displayName: Fix miniconda permissions - - # Conda setup environment. - # https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/package/conda-environment?view=vsts - - task: CondaEnvironment@0 - inputs: - environmentName: 'test' - packageSpecs: 'python=$(python.version)' - - # Install dependencies - - script: | - ./continuous_integration/azure/install.sh - displayName: 'Install dependencies' - continueOnError: false - - # Show Conda Build Env - - script: | - conda list - displayName: 'Show build environment' - continueOnError: true - - # Run Tests - - script: | - ./continuous_integration/azure/runtests.sh || ./continuous_integration/azure/runtests.sh || ./continuous_integration/azure/runtests.sh || ./continuous_integration/azure/runtests.sh - displayName: 'Run tests' - continueOnError: false - - # Publish test results to the Azure DevOps server - - task: PublishTestResults@2 - inputs: - testResultsFiles: 'result.xml' - testRunTitle: 'macOS - Python $(python.version)' - condition: succeededOrFailed() - -################################################################################ -# Windows -################################################################################ -- job: 'Windows' - - pool: - vmImage: 'windows-latest' - - timeoutInMinutes: 100 - - variables: - CI: True - AZURE: True - PYTHON: "C:\\Miniconda" - CODECOV_TOKEN: "273c981b-7851-4895-a4bb-07377c67791e" - - # Run the pipeline with multiple Python versions - strategy: - matrix: - Python37: - python.version: '3.7' - use.conda: "yes" - Python38: - python.version: '3.8' - use.conda: "yes" - Python39: - python.version: '3.9' - use.conda: "yes" - maxParallel: 4 - - steps: - # Set the UsePythonVersion task to reference the matrix variable for its Python version - - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" - displayName: Add conda to PATH - - # Install nodejs version 13.x - - task: NodeTool@0 - inputs: - versionSpec: '13.x' - - # Conda setup environment. - # https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/package/conda-environment?view=vsts - - script: conda update -q -n base conda - displayName: 'Update conda' - - - script: conda create --yes --quiet --name test python=%PYTHON_VERSION% - displayName: Create conda environment - - # Install dependencies - - script: | - call activate test - continuous_integration\azure\install.bat - displayName: 'Install dependencies' - continueOnError: false - # Show Conda Build Env - - script: | - call activate test - conda list - displayName: 'Show build environment' - continueOnError: true - # Setup Build - - script: | - echo %username% - call activate test - python setup.py build_static - displayName: 'Setup build' - continueOnError: false - # Enable this to debug via RDP - # - powershell: | - # Invoke-WebRequest https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-windows-amd64.zip -OutFile ngrok.zip - # Expand-Archive ngrok.zip - # .\ngrok\ngrok.exe authtoken 1raaG4z7gsaCRlLw8cRkUWW6ItF_2LWTUFxXwd6UeeJNAAAci - # Set-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Terminal Server'-name "fDenyTSConnections" -Value 0 - # Enable-NetFirewallRule -DisplayGroup "Remote Desktop" - # Set-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp' -name "UserAuthentication" -Value 1 - # Set-LocalUser -Name "VssAdministrator" -Password (ConvertTo-SecureString -AsPlainText "P@ssw0rd!" -Force) - # .\ngrok\ngrok.exe tcp 3389 - # displayName: 'Enable Ngrok' - # continueOnError: true - # Run tests - - script: | - call activate test - python runtests.py - displayName: 'Run tests' - continueOnError: false - - script: | - call activate test - pip install -q codecov - codecov - displayName: 'Run code coverage' - continueOnError: true - - # Publish test results to the Azure DevOps server - - task: PublishTestResults@2 - inputs: - testResultsFiles: 'result.xml' - testRunTitle: 'Windows - Python $(python.version)' - condition: succeededOrFailed() \ No newline at end of file diff --git a/continuous_integration/azure/install.bat b/continuous_integration/azure/install.bat deleted file mode 100755 index 7c38f951..00000000 --- a/continuous_integration/azure/install.bat +++ /dev/null @@ -1,43 +0,0 @@ -:: Install dependencies -if %USE_CONDA% == yes ( - if %PYTHON_VERSION% == 3.6 ( - conda install -q -y python=3.6.8=h9f7ef89_7 - ) - - conda install -q -y -c conda-forge --file requirements/conda_win.txt - if errorlevel 1 exit 1 - - conda install -q -y -c conda-forge --file requirements/tests.txt - if errorlevel 1 exit 1 - - conda install -q -y -c conda-forge nodejs=13 - if errorlevel 1 exit 1 - - conda install -q -y -c conda-forge yarn - if errorlevel 1 exit 1 -) else ( - pip install -r requirements/conda_win.txt - if errorlevel 1 exit 1 - - pip install -r requirements/tests.txt - if errorlevel 1 exit 1 - - if %PYTHON_VERSION% == 3.7 ( - pip install -U pywinpty - if errorlevel 1 exit 1 - - pip install --pre -U spyder - if errorlevel 1 exit 1 - ) - - :: Install nodejs - conda install -q -y -c conda-forge nodejs - if errorlevel 1 exit 1 - - :: Install yarn - conda install -q -y -c conda-forge yarn - if errorlevel 1 exit 1 -) - -pip install -q codecov -if errorlevel 1 exit 1 diff --git a/continuous_integration/azure/install.sh b/continuous_integration/azure/install.sh deleted file mode 100755 index dde5d1f3..00000000 --- a/continuous_integration/azure/install.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -ex - -# Install dependencies -conda install -q -y -c conda-forge --file requirements/conda.txt - -# Install test dependencies -conda install -q -y -c conda-forge --file requirements/tests.txt - -conda install -q -y -c conda-forge nodejs=13 - -conda install -q -y -c conda-forge yarn - -pip install -q codecov diff --git a/continuous_integration/azure/runtests.sh b/continuous_integration/azure/runtests.sh deleted file mode 100755 index a647e564..00000000 --- a/continuous_integration/azure/runtests.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -ex - -python setup.py build_static - -# Run tests -python runtests.py - -codecov \ No newline at end of file diff --git a/continuous_integration/circle/install.sh b/continuous_integration/circle/install.sh deleted file mode 100755 index fdb74877..00000000 --- a/continuous_integration/circle/install.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -ex - -# -- Install Miniconda -MINICONDA=Miniconda3-latest-Linux-x86_64.sh -wget https://repo.continuum.io/miniconda/$MINICONDA -O miniconda.sh -bash miniconda.sh -b -p $HOME/miniconda -source $HOME/miniconda/etc/profile.d/conda.sh - -# -- Make new conda environment with required Python version -conda create -y -n test python=$PYTHON_VERSION -conda activate test - -# Install dependencies -conda install -q -y -c conda-forge --file requirements/conda.txt - -# Install test dependencies -conda install -q -y -c conda-forge --file requirements/tests.txt - -# Update to latest version of nodejs using nvm -export NVM_DIR="/opt/circleci/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - -nvm install v13.10.1 - -# -- Install Yarn -curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - -echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list -sudo apt-get update && sudo apt-get install yarn -export PATH="$PATH:/opt/yarn-1.17.3/bin" - -pip install -q codecov diff --git a/continuous_integration/circle/runtests.sh b/continuous_integration/circle/runtests.sh deleted file mode 100755 index 5c9fa18a..00000000 --- a/continuous_integration/circle/runtests.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -ex -set -ex - -source $HOME/miniconda/etc/profile.d/conda.sh -conda activate test - -export NVM_DIR="/opt/circleci/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" -nvm use v13.10.1 - -python setup.py build_static - -# Run tests -python runtests.py - -codecov \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2c424df8..67343719 100644 --- a/package-lock.json +++ b/package-lock.json @@ -835,9 +835,9 @@ }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true }, "strip-ansi": { @@ -1028,22 +1028,22 @@ } }, "css-select": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz", - "integrity": "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", + "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", "dev": true, "requires": { "boolbase": "^1.0.0", - "css-what": "^5.1.0", - "domhandler": "^4.3.0", + "css-what": "^6.0.1", + "domhandler": "^4.3.1", "domutils": "^2.8.0", "nth-check": "^2.0.1" } }, "css-what": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", - "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.0.1.tgz", + "integrity": "sha512-z93ZGFLNc6yaoXAmVhqoSIb+BduplteCt1fepvwhBUQK6MNE4g6fgjpuZKJKp0esUe+vXWlIkwZZjNWoOKw0ZA==", "dev": true }, "cyclist": { @@ -1191,9 +1191,9 @@ "dev": true }, "domhandler": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz", - "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", + "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", "dev": true, "requires": { "domelementtype": "^2.2.0" @@ -1305,9 +1305,9 @@ } }, "es-abstract": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", - "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==", + "version": "1.19.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz", + "integrity": "sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -1316,15 +1316,15 @@ "get-intrinsic": "^1.1.1", "get-symbol-description": "^1.0.0", "has": "^1.0.3", - "has-symbols": "^1.0.2", + "has-symbols": "^1.0.3", "internal-slot": "^1.0.3", "is-callable": "^1.2.4", - "is-negative-zero": "^2.0.1", + "is-negative-zero": "^2.0.2", "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.1", "is-string": "^1.0.7", - "is-weakref": "^1.0.1", - "object-inspect": "^1.11.0", + "is-weakref": "^1.0.2", + "object-inspect": "^1.12.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", "string.prototype.trimend": "^1.0.4", @@ -1794,9 +1794,9 @@ "dev": true }, "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "dev": true }, "has-tostringtag": { @@ -2493,9 +2493,9 @@ "dev": true }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "requires": { "brace-expansion": "^1.1.7" @@ -2547,12 +2547,20 @@ } }, "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "dev": true, "requires": { - "minimist": "^1.2.5" + "minimist": "^1.2.6" + }, + "dependencies": { + "minimist": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", + "dev": true + } } }, "move-concurrently": { @@ -3582,9 +3590,9 @@ }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true }, "strip-ansi": { @@ -4237,9 +4245,9 @@ }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true }, "strip-ansi": { @@ -4266,9 +4274,9 @@ "dev": true }, "xterm": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/xterm/-/xterm-4.16.0.tgz", - "integrity": "sha512-nAbuigL9CYkI075mdfqpnB8cHZNKxENCj1CQ9Tm5gSvWkMtkanmRN2mkHGjSaET1/3+X9BqISFFo7Pd2mXVjiQ==" + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/xterm/-/xterm-4.18.0.tgz", + "integrity": "sha512-JQoc1S0dti6SQfI0bK1AZvGnAxH4MVw45ZPFSO6FHTInAiau3Ix77fSxNx3mX4eh9OL4AYa8+4C8f5UvnSfppQ==" }, "xterm-addon-attach": { "version": "0.6.0", diff --git a/package.json b/package.json index 057bed81..e366cc95 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "fetch": "github/fetch#^2.0.3", "jquery": "jquery/jquery-dist#^3.5.0", "promise-polyfill": "taylorhakes/promise-polyfill#^6.0.2", - "xterm": "^4.16.0", + "xterm": "^4.18.0", "xterm-addon-attach": "^0.6.0", "xterm-addon-fit": "^0.5.0", "xterm-addon-search": "^0.8.2", diff --git a/requirements/conda.txt b/requirements/conda.txt index 95cf53b9..7dd74019 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -3,4 +3,5 @@ pexpect tornado coloredlogs requests -terminado>=0.13.1 \ No newline at end of file +terminado>=0.13.1 +qt>=5.12 \ No newline at end of file diff --git a/requirements/conda_win.txt b/requirements/conda_win.txt index df08b0f8..0c3fea2d 100644 --- a/requirements/conda_win.txt +++ b/requirements/conda_win.txt @@ -3,4 +3,5 @@ pywinpty==2.0.5 tornado coloredlogs requests -terminado>=0.13.1 \ No newline at end of file +terminado>=0.13.1 +qt>=5.12 \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 48967846..b141935f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5367,10 +5367,10 @@ xterm-addon-fit@^0.5.0: resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596" integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ== -xterm-addon-search@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.8.1.tgz#dfc557e9bcf5fd8ed96292c0d271aa865bc545d5" - integrity sha512-OtOaC9gxD2Q4ZnjZrCSRZmKLwwUjXX3gP7mIzq8Rs50317DGRDqgTLuHTYv/Nx/LvI5ceVFRYCxK36Ixs1nXNw== +xterm-addon-search@^0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.8.2.tgz#be7aa74d5ff12c901707c6ff674229f214318032" + integrity sha512-I1863mjn8P6uVrqm/X+btalVsqjAKLhnhpbP7SavAOpEkI1jJhbHU2UTp7NjeRtcKTks6UWk/ycgds5snDSejg== xterm-addon-web-links@^0.4.0: version "0.4.0" @@ -5381,10 +5381,10 @@ xterm.js@sourcelair/xterm.js#^3.14.5: version "3.14.5" resolved "https://codeload.github.com/sourcelair/xterm.js/tar.gz/b2bb848dfe49923c03eff35736a5e4411f1ee2b6" -xterm@^4.15.0: - version "4.15.0" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.15.0.tgz#e52038507eba7e0d36d47f81e29fe548c82b9561" - integrity sha512-Ik1GoSq1yqKZQ2LF37RPS01kX9t4TP8gpamUYblD09yvWX5mEYuMK4CcqH6+plgiNEZduhTz/UrcaWs97gOlOw== +xterm@^4.16.0: + version "4.18.0" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.18.0.tgz#a1f6ab2c330c3918fb094ae5f4c2562987398ea1" + integrity sha512-JQoc1S0dti6SQfI0bK1AZvGnAxH4MVw45ZPFSO6FHTInAiau3Ix77fSxNx3mX4eh9OL4AYa8+4C8f5UvnSfppQ== y18n@^4.0.0: version "4.0.3"