Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR : Spyder 6 compatibility #349

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
e0a7588
Change name of QStylePalette to SpyderPalette
Zybulon Sep 7, 2024
a32fba8
add_corner_widget interface evolution
Zybulon Sep 7, 2024
e9b3587
SpyderDockablePlugin get_font interface adaptation
Zybulon Sep 7, 2024
6ec0331
Update requirements
Zybulon Sep 7, 2024
a1b33e7
update python requirement
Zybulon Sep 7, 2024
bd58ff1
roll back on last commit
Zybulon Sep 7, 2024
56d25d8
increase pytest version
Zybulon Sep 7, 2024
a747d6d
update python version and pytest requirement
Zybulon Sep 7, 2024
65481ce
test adaptation for new tornado
Zybulon Sep 8, 2024
74c52c0
update dependencies versions
Zybulon Sep 8, 2024
9b04f05
use of miniforge instead of mamba forge
Zybulon Sep 8, 2024
7041c37
remove miniforge-variant
Zybulon Sep 15, 2024
7a65d9b
remove miniforge-variant
Zybulon Sep 15, 2024
6638fda
Merge branch 'master' of https://github.com/Zybulon/spyder-terminal
Zybulon Sep 15, 2024
64e9f24
update versions of test packages
Zybulon Sep 21, 2024
0e5b1ae
Correction of setup_terminal
Zybulon Sep 21, 2024
7da42f8
update webpack version
Zybulon Sep 21, 2024
8e4dfbf
update node version
Zybulon Sep 21, 2024
2f3fef5
Increase timeout
Zybulon Sep 21, 2024
d979575
Increase timeout
Zybulon Sep 21, 2024
24349cf
Increase Timeout again
Zybulon Sep 21, 2024
20bdfc7
Trying to remove the skip
Zybulon Sep 21, 2024
5ad2e17
unregister terminal when done
Zybulon Sep 21, 2024
62813d3
unregister terminal when done
Zybulon Sep 21, 2024
f7956ac
Merge branch 'master' of https://github.com/Zybulon/spyder-terminal
Zybulon Sep 21, 2024
7fb063e
remove python 3.12 test on Mac : it doesn't work
Zybulon Sep 21, 2024
aa2090a
change test_terminal_paste position
Zybulon Sep 21, 2024
fc8522b
update tests on windows
Zybulon Sep 21, 2024
da467d3
split tests in 2
Zybulon Sep 21, 2024
9d67310
repeat tests for windows
Zybulon Sep 21, 2024
507b073
update to last version of xterm
Zybulon Sep 22, 2024
4395244
Delete package-lock.json
Zybulon Sep 22, 2024
0886d4d
specific yarn version
Zybulon Sep 22, 2024
2f1bcb9
add .yarn to gitignore
Zybulon Sep 22, 2024
79ca50a
trying not to use flaky
Zybulon Sep 22, 2024
8c4702e
skip some test on windows too
Zybulon Sep 22, 2024
81a309d
Merge branch 'master' of https://github.com/Zybulon/spyder-terminal
Zybulon Sep 22, 2024
7bd57df
merge correction
Zybulon Sep 22, 2024
6bbf052
Merge branch 'master' of https://github.com/Zybulon/spyder-terminal
Zybulon Sep 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,19 @@ jobs:
fail-fast: false
matrix:
INSTALL_TYPE: ['conda']
PYTHON_VERSION: ['3.7', '3.8', '3.9']
PYTHON_VERSION: ['3.9', '3.10', '3.11', '3.12']
timeout-minutes: 120
steps:
- name: checkout branch
uses: actions/checkout@v3
uses: actions/checkout@v4
- 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
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
python-version: ${{ matrix.PYTHON_VERSION }}
mamba-version: "*"
use-mamba: true
Expand All @@ -45,9 +44,9 @@ jobs:
activate-environment: test
miniforge-version: latest
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: '13'
node-version: latest
- name: Create test environment
shell: bash -l {0}
run: bash -l .github/scripts/install.sh
Expand All @@ -61,7 +60,7 @@ jobs:
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
run: xvfb-run --auto-servernum python runtests.py
- name: Coverage
shell: bash -l {0}
run: codecov
17 changes: 8 additions & 9 deletions .github/workflows/test-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,14 @@ jobs:
fail-fast: false
matrix:
INSTALL_TYPE: ['conda']
PYTHON_VERSION: ['3.7', '3.8', '3.9']
PYTHON_VERSION: ['3.9', '3.10', '3.11']
timeout-minutes: 120
steps:
- name: checkout branch
uses: actions/checkout@v3
uses: actions/checkout@v4
- name : Setup miniforge
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
python-version: ${{ matrix.PYTHON_VERSION }}
mamba-version: "*"
use-mamba: true
Expand All @@ -48,23 +47,23 @@ jobs:
conda info
conda list
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: '13'
node-version: '22.7.0'
- name: Node and NPM version
shell: bash -l {0}
run: |
export PATH=/Users/runner/hostedtoolcache/node/13.14.0/x64/bin:$PATH
export PATH=/Users/runner/hostedtoolcache/node/22.7.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
export PATH=/Users/runner/hostedtoolcache/node/22.7.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
run: python runtests.py
- name: Coverage
shell: bash -l {0}
run: codecov
11 changes: 5 additions & 6 deletions .github/workflows/test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,14 @@ jobs:
fail-fast: false
matrix:
INSTALL_TYPE: ['conda']
PYTHON_VERSION: ['3.7', '3.8', '3.9']
PYTHON_VERSION: ['3.9', '3.10', '3.11', '3.12']
timeout-minutes: 120
steps:
- name: checkout branch
uses: actions/checkout@v3
uses: actions/checkout@v4
- name : Setup miniforge
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
python-version: ${{ matrix.PYTHON_VERSION }}
mamba-version: "*"
use-mamba: true
Expand All @@ -40,9 +39,9 @@ jobs:
activate-environment: test
miniforge-version: latest
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: '13'
node-version: latest
- name: Create test environment
shell: bash -l {0}
run: bash -l .github/scripts/install.sh
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -166,4 +166,6 @@ typings/
.serverless

# vscode settings
.vscode/
.vscode/
.yarn/install-state.gz
.yarnrc.yml
Loading
Loading