Skip to content

merge v3.3.0 into main#181

Open
cadenmyers13 wants to merge 217 commits intomainfrom
v3.3.0
Open

merge v3.3.0 into main#181
cadenmyers13 wants to merge 217 commits intomainfrom
v3.3.0

Conversation

@cadenmyers13
Copy link
Copy Markdown
Contributor

For the 3.3.0 release of srfit

cadenmyers13 and others added 30 commits February 6, 2026 12:09
build:remove matrix merge into deprecation branch
deprecate: `addProfileGenerator` deprecation
deprecate: `addContribution` deprecation
deprecate: `pushFitHook`, `popFitHook`, `getFitHook`, `clearFitHook`, and `setWeight` in `FitRecipe`
deprecate: `setEquation` deprecation
deprecate: `addParameterSet` deprecation in `FitRecipe` and `ParameterSet`
cadenmyers13 and others added 29 commits March 16, 2026 11:55
Deprecate: deprecate all methods of `parameters.py`
deprecate: Deprecate function in `ProfileParser` and deprecate `PDFParser`
@cadenmyers13
Copy link
Copy Markdown
Contributor Author

@sbillinge because i dont have write access to upstream/main I can't easily fix the merge conflict. I reproduced it locally and see its only a docstring conflict (accept the incoming) and a private function name conflict (accept combination). Can you resolve these conflicts?

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.

2 participants