Skip to content

Merging dev to Fay's branch #63

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
Merged
merged 121 commits into from
Apr 17, 2025
Merged

Merging dev to Fay's branch #63

merged 121 commits into from
Apr 17, 2025

Conversation

FayFrost107
Copy link
Collaborator

No description provided.

LevanBokeria and others added 30 commits February 10, 2025 12:44
@LevanBokeria
adding pre-commit to toml
246db85
@LevanBokeria
adding balck, flake8 and isort packages. creating pre-commit-config.y…
fa915a1 
…aml file
@LevanBokeria
adding packages to pre-commit file
8ebf9b4
@LevanBokeria
fixing formatting errors by adding an escape character to backslashes
5bb3a75
@LevanBokeria
updating the pre-commit yaml
bce8516
@LevanBokeria
updating the precommit file name
409de95
@LevanBokeria
removing KorakianitisMixedModel tests and expected outputs for this b…
106867f 
…ranch
@LevanBokeria
merging dev into 24-test-naghavi-model including updated gh ci, readm…
24cf95b 
…e, toml, and some formatting fixes
@LevanBokeria
basic copilot suggested test for solver as a scaffold
db55ef8
@LevanBokeria
adding tests for initialize_by_function() function
f8badbd
@LevanBokeria
reordered placement of properties and functions in the Solver.py, for…
1e18baa 
… better readability
@LevanBokeria
adding tests for optimize function and initialize_by_function function
7ba57b8
@LevanBokeria
adding a random seed setter to the solver test
4094dc0
@LevanBokeria
added a test for pv_dfdt_update function
be1aa8f
@LevanBokeria
added a test for the solve() function
6acafe0
@LevanBokeria
fixing the tests and file names
93c96e0
@LevanBokeria
separating out different tests in the solver test
40c54e5
@LevanBokeria
fixed some tests and added docstrings
dcade65
@LevanBokeria
updating Naghavi tests. Copied over from KMM tests
00ca011
@MaxBalmus
Merge pull request #44 from alan-turing-institute/38-solver-tests
c1203ee 
38 solver tests
@LevanBokeria
updating the tests
f379779
@LevanBokeria
Merge branch 'dev' into 24-test-naghavi-model
374f3ff 
Merging dev which is now way ahead, so that later merge back into dev is easier.
@LevanBokeria
Add missing JSON file from dev branch
5504383
@LevanBokeria
added Naghavi expected outputs;
97c75c9
@LevanBokeria
working on the tests
8c324a5
@LevanBokeria
fixing Naghavi components being tested
7422a11
@crangelsmith
documentation of solver
650584e
@crangelsmith
adaptable cycle slicing
6cefbb6
@crangelsmith
reducing the number of cycles needed in the test
a97702d
@MaxBalmus
attemp #1 at fix
833c987
LevanBokeria and others added 26 commits April 8, 2025 16:05
@LevanBokeria
Update README.md
124eb9f 
updating the action status
@LevanBokeria
changing the name back to ModularCirc
fa0bf76
@LevanBokeria
decided to stay on testpypi for now
925a093
@LevanBokeria
Update README.md
1f3a859 
addint pypi links
@LevanBokeria
Update README.md
6d181f5 
formatting the readme
@LevanBokeria
bumping up the release version
4881208
@LevanBokeria
updating to ignore vscode settings
471a7f6
@LevanBokeria
deleting the .vscode/
6104cb0
@LevanBokeria
ignoring .vscode
d525ab4
@LevanBokeria
removing username from package name
50988a5
@LevanBokeria
ignoring __pycache__ inside Tutorials
b638248
@MaxBalmus
Merge pull request #56 from alan-turing-institute/45-publish-in-pypi
4343976 
45 publish in pypi
@LevanBokeria
adding automatic publishing yml file
c4703a7
@LevanBokeria
env name change
4b966ac
@LevanBokeria
Update README.md
852f38c 
fixing readme badges
@LevanBokeria
updating the release number
096881f
@LevanBokeria
Update publish.yml
1e93797 
adding build to the publishing.yml
@LevanBokeria
Merge branch 'dev' into 21-add-pre-commit-hooks.
1e8ead5
@LevanBokeria
Merge branch 'dev' into 21-add-pre-commit-hooks
ad787a5
@LevanBokeria
pre-commits unleashed
b342021
@LevanBokeria
Merge pull request #59 from alan-turing-institute/57-automatic-pypi-p…
1f66e5b 
…ublishing

57 automatic pypi publishing
@LevanBokeria
fixed pre-commit yaml
0dc2a1f
@LevanBokeria
addint CONTRIBUTING.md
d1b59cc
@LevanBokeria
explaining the pre-commit hooks
c70965c
@LevanBokeria
Merge branch 'dev' into 21-add-pre-commit-hooks
fc87fa6
@LevanBokeria
Merge pull request #60 from alan-turing-institute/21-add-pre-commit-h…
c555f5d 
…ooks

21 add pre commit hooks
@review-notebook-app Review Notebook App
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

LevanBokeria
LevanBokeria approved these changes Apr 17, 2025
View reviewed changes
Copy link
Collaborator

@LevanBokeria LevanBokeria left a comment

Choose a reason for hiding this comment

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

All looks good.

@FayFrost107 FayFrost107 merged commit 2bd60f9 into Fays-sandbox Apr 17, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LevanBokeria LevanBokeria LevanBokeria approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@FayFrost107 @LevanBokeria @MaxBalmus @crangelsmith