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

Prelease 0.0.5 #123

Merged
merged 279 commits into from
Mar 19, 2024
Merged

Prelease 0.0.5 #123

merged 279 commits into from
Mar 19, 2024

Conversation

andped10
Copy link
Collaborator

@andped10 andped10 commented Mar 19, 2024 •
edited
Loading

New release version.

Notice that main shows same behavior as for EasyCore where commits before the previous version also were listed. We should change that. Could it be related to the merging strategy since we squash all commits on main whereas we keep them on develop

arm61 and others added 30 commits January 24, 2023 17:32
@arm61
Pin numpy due to numba bug
1702486
@arm61
Merge pull request #57 from easyScience/easycore-0.3.0
15198c1 
Easycore-0.3.0
@arm61
Merge conflicts
d0553ab
@arm61
Fix pp.toml
a70247a
@arm61
Remove flake8 with poetry
f1ab0e6
@arm61
Bug fix
d38fa79
@arm61
Remove docs build
897a66f
@arm61
Merge pull request #58 from easyScience/no_poetry
40b6e44 
Removal of poetry
@rozyczko
changed dependency to fixed easyCore
2289a72
@rozyczko
and now with fixed typos
19c6a54
@rozyczko
pin scipp version
490e079
@rozyczko
Merge pull request #59 from easyScience/fixed_unit_tests
07e8ece 
fitting tests/functionality fixed
@andped10
pin hatchling, gitignore
0267fb1
@rozyczko
Merge pull request #61 from easyScience/pin_hatchling
5e423ca 
pin hatchling, gitignore
@andped10
py311 tests pass, scipp 23.08
c959886
@andped10
added python 3.11 to pipelines
1915d42
@rozyczko
Merge pull request #63 from easyScience/python311
be2c283 
Added support for python 3.11
@andped10
explicit packages different from project name
b707b01
@andped10
update scipp
d688f79
@andped10
revert scipp version
fb3572b
@andped10
scipp==23.08.0
149e823
@andped10
set hatchling version
dd0013f
@andped10
Merge pull request #64 from easyScience/hatchling-latest-preserve-mod…
b8c383c 
…ule-name

Latest hatchling, preserve module name
@andped10
adjust plot to satisfy scipp.plopp
6226875
@andped10
adjustments
a228963
@andped10
no need for ipympl
29acc66
@andped10
removed plural s in neutron
b0f9b5e
@andped10
scipp update, dataset to datagroup
12cbb4a
@andped10
plot adjustments
8abec5b
@andped10
code cleaning
b1714e7
andped10 and others added 24 commits March 7, 2024 09:11
@andped10
change to solvent fraction
758613b
@andped10
prt files, neutron without s
65a295e
@andped10
clean notebooks
56f07ba
@andped10
docs fixes
dcc1f5f
@andped10
revert changes that were not needed
9045214
@andped10
code cleaning
54e414e
@andped10
pr response
b8ad612
@andped10
Merge pull request #109 from EasyScience/105-requests-from-jos-correct
5905c96 
105 requests from jos correct
@andped10
fix notebooks
14a4bb8
@andped10
consistent usage of front (fitst interaction with neutrons) and back …
86d99cd 
…layer
@andped10
docstring correction
c7136e0
@andped10
pr response
8a02152
@andped10
make it clear that sld is set thorigh constraint
f2c74cd
@andped10
code comments
3b2f804
@andped10
PR response
412e6d5
@andped10
Merge pull request #118 from EasyScience/100-confirm-that-tha-apm-wor…
a080373 
…ks-as-intended-when-a-new-molecular-formula

Make it clear that sld and isld are managed through constraints
@andped10
from easyCore
b658ce8
@andped10
update have version is determined
992f429
@andped10
pr response
8ee7a7b
@andped10
changes from easycore
6c5337a
@andped10
Merge pull request #117 from EasyScience/116-ensure-that-the-terms-su…
35e8737 
…per-and-sub-phase-is-used-correctly-in-notebooks

116 ensure that the terms super and sub phase is used correctly in notebooks
@andped10
fix tests
a24d149
@andped10
Merge pull request #122 from EasyScience/120-workflow-consistent-with…
e8a1590 
…-easycore

120 workflow consistent with EasyCore
@andped10
bump version
bc5ac9f
@andped10 andped10 closed this Mar 19, 2024
@andped10 andped10 reopened this Mar 19, 2024
@andped10 andped10 requested a review from rozyczko March 19, 2024 05:30
rozyczko
rozyczko approved these changes Mar 19, 2024
View reviewed changes
Copy link
Member

@rozyczko rozyczko left a comment

Choose a reason for hiding this comment

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

LGTM (after all, it's just a copy of develop going to main)

@andped10 andped10 merged commit d186c86 into main Mar 19, 2024
46 checks passed
@andped10 andped10 deleted the prelease-0.0.5 branch March 19, 2024 08:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rozyczko rozyczko rozyczko 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.
3 participants
@andped10 @rozyczko @arm61