Skip to content

Support cython>=3 and remove cython<3 pin.#3028

Merged
alkino merged 5 commits into
masterfrom
rxd_cython3
Aug 13, 2024
Merged

Support cython>=3 and remove cython<3 pin.#3028
alkino merged 5 commits into
masterfrom
rxd_cython3

Conversation

@kbvw

@kbvw kbvw commented Aug 5, 2024

Copy link
Copy Markdown
Contributor

Fixes #2435

@azure-pipelines

Copy link
Copy Markdown

✔️ 97a56b2 -> Azure artifacts URL

@bbpbuildbot

This comment has been minimized.

@kbvw kbvw requested a review from 1uc August 5, 2024 15:13
@kbvw kbvw mentioned this pull request Aug 5, 2024
1uc
1uc previously approved these changes Aug 6, 2024
@codecov

codecov Bot commented Aug 6, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.28%. Comparing base (cdabc3c) to head (87a9524).

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #3028   +/-   ##
=======================================
  Coverage   67.27%   67.28%           
=======================================
  Files         571      571           
  Lines      104916   104909    -7     
=======================================
  Hits        70585    70585           
+ Misses      34331    34324    -7     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Comment thread CMakeLists.txt
@1uc 1uc changed the title Fix RXD issues resulting from cython>=3 and remove cython<3 pin Support cython>=3 and remove cython<3 pin. Aug 6, 2024
@kbvw kbvw force-pushed the rxd_cython3 branch 2 times, most recently from c6d13dd to ae2db1a Compare August 6, 2024 14:31
@bbpbuildbot

This comment has been minimized.

@1uc 1uc dismissed their stale review August 7, 2024 08:21

CI went red.

Comment thread setup.py
@azure-pipelines

Copy link
Copy Markdown

✔️ fcb8af5 -> Azure artifacts URL

@bbpbuildbot

This comment has been minimized.

@azure-pipelines

Copy link
Copy Markdown

✔️ c8221ee -> Azure artifacts URL

@sonarqubecloud

Copy link
Copy Markdown

@azure-pipelines

Copy link
Copy Markdown

✔️ 87a9524 -> Azure artifacts URL

@alkino alkino merged commit 61dfd7c into master Aug 13, 2024
@alkino alkino deleted the rxd_cython3 branch August 13, 2024 09:58

@1uc 1uc left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Seems like a sensible compromise between RXD using dlsym (hence language="c") and MUSIC that uses std::vector (therefore language="c++").

mgeplf pushed a commit that referenced this pull request Aug 19, 2024
* Change Cython language setting to C instead of C++ except for MUSIC
nrnhines added a commit that referenced this pull request Jan 23, 2025
nrnhines added a commit that referenced this pull request Jan 23, 2025
JCGoran pushed a commit that referenced this pull request Jan 24, 2025
nrnhines added a commit that referenced this pull request Mar 24, 2025
At starting point, jelic/8.2-py313 #3319 had only two CI failures.

Almost the entirety of this PR is to get 8.2 to pass CI.
In addition it supports Python3.13.
Bug fixes adopted from the master are
#3239 Launching nrniv -python with Python 3.13.0 does not allow use of gui.
#3259 On h.quit() terminal settings are same as when neuron.hoc was imported.
#3243 save stdin terminal settings on import hoc and restore on h.quit()
#3276 Python 3.13.1 broke [s for s in sl] where sl is a SectionList. Manual partial cherry-pick.

Other PR attempts at fixing CI failures that can be closed when this PR is merged, are #3329 #3325 #3319 #3317

Many of the CI fixes are backports from #3028 #3040 #3303 #3105 #3278

bldnrnmacpkgcmake.sh was updated. It isolates a change (avoid breaking CI) with -DNRN_MAC_PKG=ON
---------

Co-authored-by: Goran Jelic-Cizmek <goran.jelic-cizmek@epfl.ch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Cython 3.0 support

5 participants