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.

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

Preparing v0.8 #218

Open
wants to merge 75 commits into
base: dev
Choose a base branch
from
Open

Preparing v0.8 #218

wants to merge 75 commits into from

Conversation

ilan-gold
Copy link
Collaborator

@ilan-gold ilan-gold commented Jul 13, 2022

Pairs with theislab/batchglm#146

This PR aims to upgrade batchglm. The main outstanding question mentioned on slack is whether the 5 failing tests in test_constrained.py and test_pairwise_null.py should be deleted. It seems to me that they are trying to do the impossible by fitting more than one scale parameter but I feel somewhat uncertain here because I have had trouble with constraints before and I am not familiar with Z-tests. Other than that, feel free to ask why I did anything!

@davidsebfischer
Copy link
Contributor

Can I rebase this branch to dev? Just so that we can merge through there. Once both this and the corresponding PR on batchglm are in the respective dev branches, I would then advance them to release, incremementing the dependency version of batchglm in diffxpy as well.

@davidsebfischer davidsebfischer changed the title BatchGLM Upgrade Preparing v0.8 Jul 14, 2022
@ilan-gold
Copy link
Collaborator Author

ilan-gold commented Jul 14, 2022

Ah yes of course! I was wondering what was up with that - it seems like master is ahead of dev?

@davidsebfischer
Copy link
Contributor

davidsebfischer commented Aug 6, 2022

Ah yes of course! I was wondering what was up with that - it seems like master is ahead of dev?

Those were small fixes it seems, I rebased them into dev. I think the rebase caused two minor conflicts, as shown in the summary of the PR.

@davidsebfischer davidsebfischer changed the base branch from master to dev August 6, 2022 12:08
@@ -12,4 +12,5 @@ sphinx-autodoc-typehints
sphinx_rtd_theme
jinja2
docutils

sparse==0.9.1
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to pin sparse exactly or can we use a >= dependency?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I could remove the pin but this issue cropped up: #212

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.

4 participants