Skip to content

Comments

PR: Update python-lsp-server and qtconsole subrepos#24213

Merged
ccordoba12 merged 2 commits intospyder-ide:masterfrom
mrclary:update-external-deps
Apr 19, 2025
Merged

PR: Update python-lsp-server and qtconsole subrepos#24213
ccordoba12 merged 2 commits intospyder-ide:masterfrom
mrclary:update-external-deps

Conversation

@mrclary
Copy link
Contributor

@mrclary mrclary commented Apr 14, 2025

Update python-lsp-server and qtconsole external-deps.

Our external-deps cache of conda packages for these repos have been behind and should have caused our weekly installers to fail. However, the weekly installers were erroneously discovering the latest releases of these packages from conda-forge rather than using the cached CI-built ones, allowing the workflow to succeed, i.e. a false-positive.

#23287 fixes this error, but then requires the external-deps specs to be updated so that the correct conda packages can be built and cached.

@mrclary mrclary force-pushed the update-external-deps branch from 906e0a5 to ce4e987 Compare April 14, 2025 06:49
@mrclary mrclary marked this pull request as ready for review April 14, 2025 18:36
@mrclary mrclary requested a review from ccordoba12 April 14, 2025 18:36
@ccordoba12 ccordoba12 changed the title PR: Update python-lsp-server and qtconsole external deps PR: Update python-lsp-server and qtconsole subrepos Apr 14, 2025
@ccordoba12 ccordoba12 added this to the v6.0.6 milestone Apr 14, 2025
@ccordoba12
Copy link
Member

@mrclary, quick question for you: is this meant to be backported?

@mrclary
Copy link
Contributor Author

mrclary commented Apr 15, 2025

@mrclary, quick question for you: is this meant to be backported?

python-lsp-server>=1.12.0 is still spec'ed on the 6.x branch, so not here.
qtconsole>=5.6.1 is spec'ed for both master and 6.x; also .gitrepo is the same for both branches, so I'm not sure about this one.

@mrclary mrclary force-pushed the update-external-deps branch from ce4e987 to e3a9424 Compare April 17, 2025 00:31
@mrclary mrclary modified the milestones: v6.0.6, v6.1.0a2 Apr 18, 2025
mrclary added 2 commits April 18, 2025 09:33
…lsp/python-lsp-server.git external-deps/python-lsp-server

subrepo:
  subdir:   "external-deps/python-lsp-server"
  merged:   "04fa3e59e"
upstream:
  origin:   "https://github.com/python-lsp/python-lsp-server.git"
  branch:   "develop"
  commit:   "04fa3e59e"
git-subrepo:
  version:  "0.4.9"
  origin:   "???"
  commit:   "???"
…pyter/qtconsole.git external-deps/qtconsole

subrepo:
  subdir:   "external-deps/qtconsole"
  merged:   "f6d3a7ce2"
upstream:
  origin:   "https://github.com/jupyter/qtconsole.git"
  branch:   "main"
  commit:   "f6d3a7ce2"
git-subrepo:
  version:  "0.4.9"
  origin:   "???"
  commit:   "???"
@mrclary mrclary force-pushed the update-external-deps branch from e3a9424 to 4aba48b Compare April 18, 2025 16:35
@mrclary
Copy link
Contributor Author

mrclary commented Apr 18, 2025

@ccordoba12 this should be ready. Let's not bother with a backport.

Copy link
Member

@ccordoba12 ccordoba12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @mrclary!

@ccordoba12 ccordoba12 merged commit 7f2846e into spyder-ide:master Apr 19, 2025
20 checks passed
@mrclary mrclary deleted the update-external-deps branch April 19, 2025 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants