Merge pull request #113 from daisybio/development

New versions, new Dockerimage

Author: JudithBernett

.github/workflows/publish-docker.yml

@@ -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]
 

.github/workflows/python-publish.yml

@@ -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 }}

.github/workflows/run_tests.yml

@@ -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 }}

docs/conf.py

@@ -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.

docs/requirements.txt

@@ -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"

drevalpy/models/drp_model.py

@@ -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)
 

poetry.lock

@@ -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"
@@ -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 = "*"
@@ -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"