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

Jump to bottom

8.2.2 cherries #2113

Merged
merged 18 commits into from
Dec 15, 2022
Merged

8.2.2 cherries #2113

merged 18 commits into from
Dec 15, 2022

Conversation

alexsavulescu
Copy link
Member

No description provided.

ramcdougal and others added 10 commits December 7, 2022 15:33
@ramcdougal @alexsavulescu
typo fix (#1950)
67ac115
@adamjhn @alexsavulescu
Bugfix for rxd reactions involving rxd parameters. (#1933)
aa7bc12
@alexsavulescu
drop unneeded docs/domains/hocdomain.txt (#1961)
7022ab9
@alexsavulescu
Azure CI: release/* build trigger typo (#1979)
0e30fad
@alexsavulescu
windows build updates (#1991)
e763024 
* document how to build NEURON
* adapt the scripts for local usage
@alexsavulescu
add codecov.yml (#1997)
0593b82 
* set `codecov.require_ci_to_pass` to `false`
* set `codecov.notify.wait_for_ci` to `false`
@iomaganaris @pramodk @alexsavulescu
Added documentation in various constructs in hoc and python documenta…
f00934a 
…tion. Also added TODOs to missing ones (#2011)

Co-authored-by: Pramod Kumbhar <pramod.s.kumbhar@gmail.com>
@alexsavulescu
upstream auditwheel now supports --exclude (#2036)
3cdad12
@ramcdougal @alexsavulescu
Typo fix (#2030)
061e61b
@nrnhines @mdjurfeldt @alexsavulescu
Re-enable MUSIC support in NEURON (#1896)
94f25ac 
* Enable MUSIC with -DNRN_ENABLE_MUSIC=ON

* Improve the FindPackage module for MUSIC

* ctest -R nrnmusic::music_tests

Co-authored-by: Michael Hines <michael.hines@yale.edu>
Co-authored-by: Mikael Djurfeldt <mikael@djurfeldt.com>
@alexsavulescu alexsavulescu marked this pull request as draft December 7, 2022 15:03
@alexsavulescu alexsavulescu force-pushed the 8.2.2-cherries branch 2 times, most recently from 6f2d929 to 8ef7e8f Compare December 8, 2022 08:37
@olupton @alexsavulescu
Python 3.11 wheels + fudge RxD test teardown (#2071)
6e6d686 
* fudge RxD test teardown for python 3.11 (disable garbage collection)
* build Python 3.11 wheels.
* latest numpy for latest python
@alexsavulescu
CI: bump to macOS-11 (#1928)
213c5f1
@alexsavulescu
CI: bump to Ubuntu 20.04 (#1946)
837e609 
* CI: bump to Ubuntu 20.04
* update mpich install location
* run coverage on ubuntu22
@alexsavulescu alexsavulescu force-pushed the 8.2.2-cherries branch 3 times, most recently from 86ce4db to 3605ec8 Compare December 8, 2022 13:52
@azure-pipelines
Copy link

✔️ 5a09e61 -> Azure artifacts URL

@azure-pipelines
Copy link

✔️ 3b5610b -> Azure artifacts URL

@codecov-commenter
Copy link

Codecov Report

Merging #2113 (e76cb9d) into release/8.2 (c2ad468) will decrease coverage by 0.86%.
The diff coverage is 100.00%.

@@               Coverage Diff               @@
##           release/8.2    #2113      +/-   ##
===============================================
- Coverage        47.31%   46.45%   -0.87%     
===============================================
  Files              543      526      -17     
  Lines           112688   119261    +6573     
===============================================
+ Hits             53322    55404    +2082     
- Misses           59366    63857    +4491
Impacted Files Coverage Δ
share/lib/python/neuron/rxd/region.py 81.14% <100.00%> (+0.41%) ⬆️
share/lib/python/neuron/rxd/rxd.py 83.89% <100.00%> (+0.04%) ⬆️
src/nrnmpi/nrnmpi.cpp 74.19% <100.00%> (+0.91%) ⬆️
src/gnu/LogNorm.cpp 0.00% <0.00%> (-33.34%) ⬇️
src/gnu/Weibull.cpp 0.00% <0.00%> (-33.34%) ⬇️
src/gnu/Geom.cpp 0.00% <0.00%> (-25.00%) ⬇️
src/gnu/HypGeom.cpp 0.00% <0.00%> (-25.00%) ⬇️
src/gnu/Erlang.cpp 0.00% <0.00%> (-16.67%) ⬇️
src/gnu/Binomial.cpp 0.00% <0.00%> (-14.29%) ⬇️
src/nrnoc/nrnnemo.cpp 0.00% <0.00%> (-14.29%) ⬇️
... and 415 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@alexsavulescu alexsavulescu requested review from olupton and removed request for olupton December 13, 2022 13:31
@alexsavulescu alexsavulescu requested review from pramodk, olupton, nrnhines and ramcdougal and removed request for pramodk December 13, 2022 13:31
@azure-pipelines
Copy link

✔️ e76cb9d -> Azure artifacts URL

@alexsavulescu alexsavulescu marked this pull request as ready for review December 13, 2022 13:43
olupton
olupton reviewed Dec 13, 2022
View reviewed changes
Copy link
Collaborator

@olupton olupton left a comment

Choose a reason for hiding this comment

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

Generally LGTM

I wonder if we are backporting a few too many Ubuntu/GCC version bumps -- are some of these dictated by features like Python 3.11 support that we are explicitly trying to include?

IIUC Ubuntu 18.04 is still available on GitHub Actions, it's just deprecated...

.circleci/config.yml Show resolved Hide resolved
.github/workflows/neuron-ci.yml Show resolved Hide resolved
.github/workflows/neuron-ci.yml Show resolved Hide resolved
.github/workflows/neuron-ci.yml Outdated Show resolved Hide resolved
@alexsavulescu
Copy link
Member Author

I wonder if we are backporting a few too many Ubuntu/GCC version bumps -- are some of these dictated by features like Python 3.11 support that we are explicitly trying to include?

IIUC Ubuntu 18.04 is still available on GitHub Actions, it's just deprecated...

I'd rather move on and keep up to date with master CI as much as possible, we may have to release again before 9.0.0. And yeah, there were some CI issues that got fixed off the back of it.

@azure-pipelines
Copy link

✔️ 8ed3e5aefa4ed6b1a5007e3dfea2dbb2a4eed820 -> Azure artifacts URL

nrnhines
nrnhines approved these changes Dec 14, 2022
View reviewed changes
Copy link
Member

@nrnhines nrnhines left a comment

Choose a reason for hiding this comment

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

successfully builds, signs, notarizes
nrn-8.2.1-21-g8ed3e5aef-macosx-10.9-universal2-py-38-39-310-311.pkg
LGTM

pramodk
pramodk approved these changes Dec 15, 2022
View reviewed changes
Copy link
Member

@pramodk pramodk left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM - apart few minor comments (esp about Ubuntu 18.04 and older GCC version checks in CI?)

.github/workflows/neuron-ci.yml Show resolved Hide resolved
docs/cmake_doc/options.rst Outdated Show resolved Hide resolved
docs/hoc/modelspec/programmatic/mechanisms/nmodl.rst Outdated Show resolved Hide resolved
docs/changelog.md Show resolved Hide resolved
src/neuronmusic/CMakeLists.txt Show resolved Hide resolved
alkino
alkino reviewed Dec 15, 2022
View reviewed changes
azure-pipelines.yml Show resolved Hide resolved
ci/win_install_deps.cmd Outdated Show resolved Hide resolved
@azure-pipelines
Copy link

✔️ b58b178 -> Azure artifacts URL

@alexsavulescu alexsavulescu merged commit 93d41fa into release/8.2 Dec 15, 2022
@alexsavulescu alexsavulescu deleted the 8.2.2-cherries branch December 15, 2022 09:57
@heerener heerener mentioned this pull request Sep 12, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@olupton olupton olupton left review comments

@alkino alkino alkino left review comments

@nrnhines nrnhines nrnhines approved these changes

@pramodk pramodk pramodk approved these changes

@ramcdougal ramcdougal Awaiting requested review from ramcdougal

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@alexsavulescu @codecov-commenter @alkino @pramodk @nrnhines @olupton @ramcdougal @adamjhn @iomaganaris