Skip to content

Fragments from 2dd4518 windows 11 fix for nrniv -python (#2255)#2946

Merged
nrnhines merged 4 commits into
release/8.2from
hines/fix-win11
Jul 5, 2024
Merged

Fragments from 2dd4518 windows 11 fix for nrniv -python (#2255)#2946
nrnhines merged 4 commits into
release/8.2from
hines/fix-win11

Conversation

@nrnhines

@nrnhines nrnhines commented Jun 26, 2024

Copy link
Copy Markdown
Member

Picked the substantive changes from #2255 that should go into release/8.2. Tested on Windows11 virtualbox guest

@nrnhines nrnhines requested review from JCGoran and heerener June 26, 2024 13:23
Comment thread src/nrnpython/nrnpython.cpp Outdated
@azure-pipelines

Copy link
Copy Markdown

✔️ f396267 -> Azure artifacts URL

@nrnhines

Copy link
Copy Markdown
Member Author

how do we format release/8.2?

clang-format --style=file:external/coding-conventions/cpp/clang-format-12 -I src/nrniv/*.cpp

changes every file in that folder.

@sonarqubecloud

sonarqubecloud Bot commented Jul 4, 2024

Copy link
Copy Markdown

@nrnhines

nrnhines commented Jul 4, 2024

Copy link
Copy Markdown
Member Author

Tested on windows11 and works. I notice that the artifact for the Windows Installer / WindowsInstaller (pull_request) CI did not build against python3.12 so tested with python3.11

@nrnhines

nrnhines commented Jul 4, 2024

Copy link
Copy Markdown
Member Author

I think this PR is ready to merge if the CI neuronsimulator.nrn Failing after 60m — Build #20240704.22 failed can be fixed.

@azure-pipelines

Copy link
Copy Markdown

✔️ b10b568 -> Azure artifacts URL

@nrnhines nrnhines enabled auto-merge (squash) July 4, 2024 16:49

@JCGoran JCGoran 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.

LGTM

@nrnhines nrnhines merged commit 657e562 into release/8.2 Jul 5, 2024
@nrnhines nrnhines deleted the hines/fix-win11 branch July 5, 2024 07:11
@heerener heerener mentioned this pull request Jul 24, 2024
27 tasks
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.

3 participants