Merge pull request #34 from scverse-bot/template-update-scverse-multi-condition-comparisions-v0.3.1

grst · web-flow · commit 13a8f0ed5082 · 2024-02-22T20:18:57.000+01:00
Update template to v0.3.1
diff --git a/.cruft.json b/.cruft.json
@@ -1,7 +1,7 @@
 {
   "template": "https://github.com/scverse/cookiecutter-scverse",
-  "commit": "30bbbdbd429bcd10099f7a6d9f3583e20b378b95",
-  "checkout": null,
+  "commit": "586b1652162ff7994b0070a034023d64289ae416",
+  "checkout": "v0.3.1",
   "context": {
     "cookiecutter": {
       "project_name": "multi-condition-comparisions",
@@ -13,9 +13,15 @@
       "project_repo": "https://github.com/scverse/multi-condition-comparisons",
       "license": "BSD 3-Clause License",
       "_copy_without_render": [
-        ".github/workflows/**.yaml",
+        ".github/workflows/build.yaml",
+        ".github/workflows/test.yaml",
         "docs/_templates/autosummary/**.rst"
       ],
+      "_render_devdocs": false,
+      "_jinja2_env_vars": {
+        "lstrip_blocks": true,
+        "trim_blocks": true
+      },
       "_template": "https://github.com/scverse/cookiecutter-scverse"
     }
   },
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,30 +1,29 @@
 name: Release
 
 on:
-  push:
-    tags:
-      - "*.*.*"
+  release:
+    types: [published]
 
+# Use "trusted publishing", see https://docs.pypi.org/trusted-publishers/
 jobs:
   release:
-    name: Release
+    name: Upload release to PyPI
     runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/multi_condition_comparisions
+    permissions:
+      id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
         with:
-          python-version: "3.10"
-
-      - name: Install hatch
-        run: pip install hatch
-
-      - name: Build project for distribution
-        run: hatch build
-
-      - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+          filter: blob:none
+          fetch-depth: 0
+      - uses: actions/setup-python@v4
         with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
+          python-version: "3.x"
+          cache: "pip"
+      - run: pip install build
+      - run: python -m build
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -5,6 +5,8 @@ on:
     branches: [main]
   pull_request:
     branches: [main]
+  schedule:
+    - cron: "0 5 1,15 * *"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -24,8 +26,13 @@ jobs:
           - os: ubuntu-latest
             python: "3.10"
           - os: ubuntu-latest
-            python: "3.10"
+            python: "3.11"
+          - os: ubuntu-latest
+            python: "3.11"
             pip-flags: "--pre"
+            name: PRE-RELEASE DEPENDENCIES
+
+    name: ${{ matrix.name }} Python ${{ matrix.python }}
 
     env:
       OS: ${{ matrix.os }}
@@ -60,6 +67,9 @@ jobs:
           PLATFORM: ${{ matrix.os }}
           DISPLAY: :42
         run: |
-          pytest -v --cov --color=yes
+          coverage run -m pytest -v --color=yes
+      - name: Report coverage
+        run: |
+          coverage report
       - name: Upload coverage
         uses: codecov/codecov-action@v3
diff --git a/.gitignore b/.gitignore
@@ -26,5 +26,6 @@ __pycache__/
 # IDEs
 /.idea/
 /.vscode/
+*.code-workspace
 
 /node_modules
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -15,7 +15,9 @@ repos:
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix, --unsafe-fixes]
+        types_or: [python, pyi, jupyter]
       - id: ruff-format
+        types_or: [python, pyi, jupyter]
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
@@ -26,6 +28,8 @@ repos:
         args: [--fix=lf]
       - id: trailing-whitespace
       - id: check-case-conflict
+      - id: check-merge-conflict
+        args: [--assume-in-merge]
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.8.0
     hooks:
diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
@@ -0,0 +1,4 @@
+/* Reduce the font size in data frames - See https://github.com/scverse/cookiecutter-scverse/issues/193 */
+div.cell_output table.dataframe {
+    font-size: 0.8em;
+}
diff --git a/docs/conf.py b/docs/conf.py
@@ -107,6 +107,8 @@
 #
 html_theme = "sphinx_book_theme"
 html_static_path = ["_static"]
+html_css_files = ["css/custom.css"]
+
 html_title = project_name
 
 html_theme_options = {
@@ -118,17 +120,7 @@
 
 pygments_style = "default"
 
-
-def setup(app):
-    """App setup hook."""
-    app.add_config_value(
-        "recommonmark_config",
-        {
-            "auto_toc_tree_section": "Contents",
-            "enable_auto_toc_tree": True,
-            "enable_math": True,
-            "enable_inline_math": False,
-            "enable_eval_rst": True,
-        },
-        True,
-    )
+nitpick_ignore: list[tuple[str, str]] = [
+    # you can add an exception to this list.
+    #     ("py:class", "igraph.Graph"),
+]
diff --git a/docs/contributing.md b/docs/contributing.md
@@ -1,6 +1,6 @@
 # Contributing guide
 
-Scanpy provides extensive [developer documentation][scanpy developer guide], most of which applies to this repo, too.
+Scanpy provides extensive [developer documentation][scanpy developer guide], most of which applies to this project, too.
 This document will not reproduce the entire content from there. Instead, it aims at summarizing the most important
 information to get you started on contributing.
 
@@ -19,9 +19,8 @@ pip install -e ".[dev,test,doc]"
 
 ## Code-style
 
-This template uses [pre-commit][] to enforce consistent code-styles. On every commit, pre-commit checks will either
-automatically fix issues with the code, or raise an error message. See [pre-commit checks](template_usage.md#pre-commit-checks) for
-a full list of checks enabled for this repository.
+This package uses [pre-commit][] to enforce consistent code-styles.
+On every commit, pre-commit checks will either automatically fix issues with the code, or raise an error message.
 
 To enable pre-commit locally, simply run
 
@@ -43,10 +42,10 @@ git pull --rebase
 to integrate the changes into yours.
 While the [pre-commit.ci][] is useful, we strongly encourage installing and running pre-commit locally first to understand its usage.
 
-Finally, most editors have an _autoformat on save_ feature. Consider enabling this option for [black][black-editors]
+Finally, most editors have an _autoformat on save_ feature. Consider enabling this option for [ruff][ruff-editors]
 and [prettier][prettier-editors].
 
-[black-editors]: https://black.readthedocs.io/en/stable/integrations/editors.html
+[ruff-editors]: https://docs.astral.sh/ruff/integrations/
 [prettier-editors]: https://prettier.io/docs/en/editors.html
 
 ## Writing tests
@@ -65,7 +64,17 @@ command line by executing
 pytest
 ```
 
-in the root of the repository. Continuous integration will automatically run the tests on all pull requests.
+in the root of the repository.
+
+### Continuous integration
+
+Continuous integration will automatically run the tests on all pull requests and test
+against the minimum and maximum supported Python version.
+
+Additionally, there's a CI job that tests against pre-releases of all dependencies
+(if there are any). The purpose of this check is to detect incompatibilities
+of new package versions early on and gives you time to fix the issue or reach
+out to the developers of the dependency before the package is released to a wider audience.
 
 [scanpy-test-docs]: https://scanpy.readthedocs.io/en/latest/dev/testing.html#writing-tests
 
@@ -83,55 +92,8 @@ Before making a release, you need to update the version number in the `pyproject
 >
 > Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format.
 
-Once you are done, run
-
-```
-git push --tags
-```
-
-to publish the created tag on GitHub. Alternatively, it is possible to create a tag through the Github web interface. For more information, see [managing Github releases][]. This will automatically trigger a Github workflow that creates a release on PyPI.
-
-### The release Github workflow
-
-#### Behind the scenes
-
-This section explains how releases can be created manually purely for educational purposes. Experienced developers may skip this section.
-Python packages are not distributed as source code, but as _distributions_. The most common distribution format is the so-called _wheel_. To build a _wheel_, run
-
-```bash
-python -m build
-```
-
-This command creates a _source archive_ and a _wheel_, which are required for publishing your package to [PyPI][]. These files are created directly in the root of the repository.
-
-Before uploading them to [PyPI][] you can check that your _distribution_ is valid by running:
-
-```bash
-twine check dist/*
-```
-
-and finally publishing it with:
-
-```bash
-twine upload dist/*
-```
-
-Provide your username and password when requested and then go check out your package on [PyPI][]!
-
-For more information, follow the [Python packaging tutorial][].
-
-#### Configuring the Github workflow
-
-Tags adhering to `"*.*.*"` that are pushed to the `main` branch will trigger the release Github workflow that automatically builds and uploads the Python package to [PyPI][].
-For this to work, the `PYPI_API_TOKEN` Github secret needs to be set to the value of the [PyPI][] token.
-See [Creating PyPI tokens][] for instructions on how to create a [PyPI][] token.
-Finally, set your `PYPI_API_TOKEN` Github secret equal to the value of the just created [PyPI][] token by following [creating Github secrets][].
-
-[creating github secrets]: https://docs.github.com/en/actions/security-guides/encrypted-secrets
-[creating pypi tokens]: https://pypi.org/help/#apitoken
-[managing github releases]: https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository
-[python packaging tutorial]: https://packaging.python.org/en/latest/tutorials/packaging-projects/#generating-distribution-archives
-[pypi-feature-request]: https://github.com/scverse/cookiecutter-scverse/issues/88
+Once you are done, commit and push your changes and navigate to the "Releases" page of this project on GitHub.
+Specify `vX.X.X` as a tag name and create a release. For more information, see [managing GitHub releases][]. This will automatically create a git tag and trigger a Github workflow that creates a release on PyPI.
 
 ## Writing documentation
 
@@ -195,3 +157,4 @@ open _build/html/index.html
 [numpydoc]: https://numpydoc.readthedocs.io/en/latest/format.html
 [sphinx autodoc typehints]: https://github.com/tox-dev/sphinx-autodoc-typehints
 [pypi]: https://pypi.org/
+[managing GitHub releases]: https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository
diff --git a/docs/index.md b/docs/index.md
@@ -8,7 +8,6 @@
 
 api.md
 changelog.md
-template_usage.md
 contributing.md
 references.md
 
diff --git a/docs/notebooks/breast_cancer.ipynb b/docs/notebooks/breast_cancer.ipynb
@@ -27,8 +27,8 @@
     "%autoreload 2\n",
     "from multi_condition_comparisions.tl.de import StatsmodelsDE\n",
     "\n",
-    "import scanpy as sc\n",
-    "import decoupler as dc"
+    "import decoupler as dc\n",
+    "import scanpy as sc"
    ]
   },
   {
@@ -44,11 +44,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "#import cellxgene_census\n",
-    "#cellxgene_census.download_source_h5ad('cd74e95e-6583-4875-a0ba-f2eae5a1e5a6.h5ad',\n",
-    "                                        #to_path=\"breast_cancer.h5ad\")\n",
+    "import cellxgene_census\n",
     "\n",
-    "#adata = sc.read_h5ad('./cd74e95e-6583-4875-a0ba-f2eae5a1e5a6.h5ad')"
+    "cellxgene_census.download_source_h5ad(\"cd74e95e-6583-4875-a0ba-f2eae5a1e5a6.h5ad\", to_path=\"breast_cancer.h5ad\")\n",
+    "\n",
+    "adata = sc.read_h5ad(\"./cd74e95e-6583-4875-a0ba-f2eae5a1e5a6.h5ad\")"
    ]
   },
   {
@@ -57,8 +57,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "adata.layers['counts'] = adata.raw.X\n",
-    "adata.layers['normalised_counts'] = adata.X\n"
+    "adata.layers[\"counts\"] = adata.raw.X\n",
+    "adata.layers[\"normalised_counts\"] = adata.X"
    ]
   },
   {
@@ -116,13 +116,14 @@
     }
    ],
    "source": [
-    "pbulk = dc.get_pseudobulk(adata,\n",
-    "                            sample_col='donor_id',\n",
-    "                            groups_col='cell_type',\n",
-    "                            layer='normalised_counts',\n",
-    "                            mode='sum',\n",
-    "                            min_cells=10,\n",
-    "                            min_counts=1000,\n",
+    "pbulk = dc.get_pseudobulk(\n",
+    "    adata,\n",
+    "    sample_col=\"donor_id\",\n",
+    "    groups_col=\"cell_type\",\n",
+    "    layer=\"normalised_counts\",\n",
+    "    mode=\"sum\",\n",
+    "    min_cells=10,\n",
+    "    min_counts=1000,\n",
     ")\n",
     "\n",
     "pbulk"
@@ -713,8 +714,13 @@
     }
    ],
    "source": [
-    "mod.test_contrasts({\"T cells\": mod.cond(disease=\"breast cancer\", cell_type=\"T cell\") - mod.cond(disease=\"normal\", cell_type=\"T cell\")},\n",
-    "                   {\"fibroblasts\": mod.cond(disease=\"breast cancer\", cell_type=\"fibroblast\") - mod.cond(disease=\"normal\", cell_type=\"fibroblast\")})"
+    "mod.test_contrasts(\n",
+    "    {\"T cells\": mod.cond(disease=\"breast cancer\", cell_type=\"T cell\") - mod.cond(disease=\"normal\", cell_type=\"T cell\")},\n",
+    "    {\n",
+    "        \"fibroblasts\": mod.cond(disease=\"breast cancer\", cell_type=\"fibroblast\")\n",
+    "        - mod.cond(disease=\"normal\", cell_type=\"fibroblast\")\n",
+    "    },\n",
+    ")"
    ]
   }
  ],
diff --git a/docs/template_usage.md b/docs/template_usage.md
diff --git a/multi-condition-comparisions.code-workspace b/multi-condition-comparisions.code-workspace
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/src/multi_condition_comparisions/tl/de.py b/src/multi_condition_comparisions/tl/de.py
diff --git a/tests/test_de.py b/tests/test_de.py
