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.

Sign up for GitHub

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: Pin IPykernel to 6.26.0, QDarkstyle to 3.2.0 and fix building the Linux installer (CI) #21553

Merged
merged 2 commits into from
Nov 24, 2023
Merged

PR: Pin IPykernel to 6.26.0, QDarkstyle to 3.2.0 and fix building the Linux installer (CI) #21553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
136fe52
CI: Pin IPykernel to 6.26.0 and QDarkstyle to 3.2.0
ccordoba12 Nov 23, 2023
80d7744
Installers: Fix conda-based installer workflow
ccordoba12 Nov 23, 2023
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
11 changes: 10 additions & 1 deletion .github/scripts/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ if [ "$USE_CONDA" = "true" ]; then
# Remove pylsp before installing its subrepo below
micromamba remove --force python-lsp-server python-lsp-server-base -y

# Prevent error in a test for the %edit magic
micromamba install ipykernel=6.26.0 -q -y

else
# Update pip and setuptools
python -m pip install -U pip setuptools wheel build
Expand All @@ -42,12 +45,18 @@ else
# To check our manifest
pip install -q check-manifest

# This allows the test suite to run more reliably on Linux
if [ "$OS" = "linux" ]; then
# This allows the test suite to run more reliably on Linux
pip uninstall pyqt5 pyqt5-qt5 pyqt5-sip pyqtwebengine pyqtwebengine-qt5 -q -y
pip install pyqt5==5.12.* pyqtwebengine==5.12.*

# QDarkstyle 3.2.1 doesn't work with PyQt 5.12
pip install qdarkstyle==3.2
fi

# Prevent error in a test for the %edit magic
pip install ipykernel==6.26.0

fi

# Install subrepos from source
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/installers-conda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ jobs:
fetch-depth: 0

- name: Setup Build Environment
uses: mamba-org/provision-with-micromamba@main
uses: mamba-org/setup-micromamba@v1
with:
environment-file: installers-conda/build-environment.yml
extra-specs: python=${{ matrix.python-version }}
create-args: python=${{ matrix.python-version }}

- name: Build Conda Packages
run: python build_conda_pkgs.py --build $pkg
Expand Down Expand Up @@ -127,10 +127,10 @@ jobs:
fetch-depth: 0

- name: Setup Build Environment
uses: mamba-org/provision-with-micromamba@main
uses: mamba-org/setup-micromamba@v1
with:
environment-file: installers-conda/build-environment.yml
extra-specs: python=${{ matrix.python-version }}
create-args: python=${{ matrix.python-version }}

- name: Env Variables
run: |
Expand Down
1 change: 1 addition & 0 deletions installers-conda/build-environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ dependencies:
- conda-standalone
- constructor
- gitpython
- mamba
- ruamel.yaml.jinja2
- setuptools_scm
Loading