Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5e1a028
[DEPENDABOT]: Bump flake8-bugbear from 24.10.31 to 24.12.12
dependabot[bot] Dec 16, 2024
2342573
[DEPENDABOT]: Bump sphinx-autodoc-typehints from 2.5.0 to 3.0.0 in /docs
dependabot[bot] Jan 6, 2025
c7f9adb
[DEPENDABOT]: Bump scikit-learn from 1.5.2 to 1.6.1
dependabot[bot] Jan 13, 2025
f1f46d0
asserting in input, causes silent bugs otherwise
PascalIversen Jan 15, 2025
e8db38c
[DEPENDABOT]: Bump codecov/codecov-action from 5.1.1 to 5.3.1
dependabot[bot] Jan 27, 2025
94f770f
[DEPENDABOT]: Bump pypa/gh-action-pypi-publish from 1.12.3 to 1.12.4
dependabot[bot] Jan 27, 2025
f8058eb
removing fix: push to main docker build
JudithBernett Jan 30, 2025
2b52414
new version including CurveCurator in the Dockerimage
JudithBernett Jan 30, 2025
82dd34f
Merge pull request #99 from daisybio/dependabot/pip/development/flake…
JudithBernett Jan 30, 2025
3baa4ef
Merge pull request #105 from daisybio/dependabot/pip/docs/development…
JudithBernett Jan 30, 2025
1aa7b4a
Merge pull request #109 from daisybio/dependabot/pip/development/scik…
JudithBernett Jan 30, 2025
4837f61
[DEPENDABOT]: Bump poetry from 2.0.0 to 2.0.1
dependabot[bot] Jan 30, 2025
c859cea
Merge pull request #111 from daisybio/dependabot/github_actions/devel…
JudithBernett Jan 30, 2025
551d4ed
Merge pull request #112 from daisybio/dependabot/github_actions/devel…
JudithBernett Jan 30, 2025
1661876
Merge pull request #110 from daisybio/dependabot/pip/development/poet…
JudithBernett Jan 30, 2025
96efdac
Merge branch 'development' of github.com:daisybio/drevalpy into devel…
JudithBernett Jan 30, 2025
acbf435
updated poetry deps and requirements
JudithBernett Jan 30, 2025
c57c00e
updated poetry deps and requirements
JudithBernett Jan 30, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ name: Create and publish a Docker image

# Configures this workflow to run every time a release is published
on:
push:
branches:
- main
release:
types: [published]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Build package
run: python -m build
- name: Publish package
uses: pypa/gh-action-pypi-publish@67339c736fd9354cd4f8cb0b744f2b82a74b5c70
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,6 @@ jobs:
run: nox --force-color --session=coverage -- xml -i

- name: Upload coverage report
uses: codecov/codecov-action@v5.1.1
uses: codecov/codecov-action@v5.3.1
with:
token: ${{ secrets.CODECOV_TOKEN }}
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
# the built documents.
#
# The short X.Y version.
version = "1.1.1"
version = "1.1.2"
# The full version, including alpha/beta/rc tags.
release = "1.1.1"
release = "1.1.2"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sphinx-autobuild==2024.10.3 ; python_version >= "3.11" and python_version < "3.13"
sphinx-autodoc-typehints==2.5.0 ; python_version >= "3.11" and python_version < "3.13"
sphinx-autodoc-typehints==3.0.1 ; python_version >= "3.11" and python_version < "3.13"
sphinx-click==6.0.0 ; python_version >= "3.11" and python_version < "3.13"
sphinx-rtd-theme==3.0.2 ; python_version >= "3.11" and python_version < "3.13"
9 changes: 9 additions & 0 deletions drevalpy/models/drp_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,15 @@ def get_concatenated_features(
cell_line_input=cell_line_input,
drug_input=drug_input,
)
if drug_view is not None:
if drug_view not in inputs:
raise ValueError(f"Expected drug_view '{drug_view}' to be in inputs, but it was not. Inputs: {inputs}")
if cell_line_view is not None:
if cell_line_view not in inputs:
raise ValueError(
f"Expected cell_line_view '{cell_line_view}' to be in inputs, but it was not. Inputs: {inputs}"
)

cell_line_features = None if cell_line_view is None else inputs.get(cell_line_view)
drug_features = None if drug_view is None else inputs.get(drug_view)

Expand Down
75 changes: 39 additions & 36 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "drevalpy"
version = "1.1.1"
version = "1.1.2"
description = "Drug response evaluation of cancer cell line drug response models in a fair setting"
authors = ["DrEvalPy development team"]
license = "GPL-3.0"
Expand All @@ -10,7 +10,7 @@ readme = "README.md"
python = ">=3.11,<3.13"
numpy = ">=1.20,<2.0"
scipy = "*"
scikit-learn = ">=1.4,<1.6"
scikit-learn = ">=1.4,<1.7"
pandas = "*"
networkx = "*"
pyyaml = "*"
Expand All @@ -33,7 +33,7 @@ fit = ["curve-curator"]
multiprocessing = ["ray"]

[tool.poetry.group.development.dependencies]
sphinx-autodoc-typehints = "<3.0"
sphinx-autodoc-typehints = "*"
sphinx = ">=4.0.2"
sphinx-autobuild = ">=2021.3.14"
sphinx-rtd-theme = ">=1.0.0,<3.0.3"
Expand Down
Loading
Loading