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

Development #153

Closed
wants to merge 59 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
2635411
[DEPENDABOT]: Bump pep8-naming from 0.11.1 to 0.13.2
dependabot[bot] Aug 23, 2022
a015014
added tools skeleton
davidsebfischer Sep 19, 2022
2374b0c
added testing into skeleton
davidsebfischer Sep 19, 2022
fc62f8a
some code
davidsebfischer Sep 19, 2022
a5415d7
added unit tests for skeleton functions
davidsebfischer Sep 19, 2022
aa535af
temp commit
davidsebfischer Sep 19, 2022
bb83d58
fixed bugs
davidsebfischer Sep 19, 2022
8260ef3
fixed up into testing
davidsebfischer Sep 20, 2022
a9b9b76
fixed bugs
davidsebfischer Sep 20, 2022
18667b3
fixed normal ncem
davidsebfischer Sep 21, 2022
882c037
differential ncem is running
davidsebfischer Sep 21, 2022
460f60b
fixed multi parameter testing
davidsebfischer Sep 21, 2022
bacba84
added multi coefficient testing of coupling coefficients grouped by t…
davidsebfischer Sep 21, 2022
43b5b43
added saving of tested parameters
davidsebfischer Sep 21, 2022
f31ae64
added cross-functional interface for type specific confounders
davidsebfischer Sep 21, 2022
418e4df
spline
davidsebfischer Sep 21, 2022
865ccd1
saved ncem fits in differential ncem
davidsebfischer Sep 21, 2022
0fd9219
minor fixtures linear ncem
AnnaChristina Oct 10, 2022
76cdc13
[DEPENDABOT]: Bump actions/setup-python from 2.1.4 to 4.3.0
dependabot[bot] Oct 11, 2022
f9fe769
fixtures for new api and plotting module
AnnaChristina Oct 13, 2022
12b0ad5
add rotated labels to type coupling plot
AnnaChristina Oct 14, 2022
22c9be2
[DEPENDABOT]: Bump pre-commit-hooks from 3.4.0 to 4.4.0
dependabot[bot] Nov 24, 2022
278e84b
moving tl, pl into src
AnnaChristina Dec 9, 2022
c4e0dad
add ablation functions
AnnaChristina Dec 9, 2022
3502901
follow api matching squidpy
AnnaChristina Dec 9, 2022
cb8a180
add new api to docs
AnnaChristina Dec 9, 2022
e024f02
add new api to docs
AnnaChristina Dec 9, 2022
4191bfd
change how to call models in tools
AnnaChristina Dec 9, 2022
aaf7de6
add autosummary for new api
AnnaChristina Dec 9, 2022
d8a8353
change autosummary of read the docs
AnnaChristina Dec 9, 2022
ecc2c9c
update docs and dependencies
AnnaChristina Apr 17, 2023
0d7682f
update workflows
AnnaChristina Apr 17, 2023
bc856b7
update workflows
AnnaChristina Apr 17, 2023
8292480
update python version in workflows
AnnaChristina Apr 17, 2023
d0fa027
update dependencies
AnnaChristina Apr 17, 2023
797e1cb
add python3.10 [skip actions]
AnnaChristina Apr 17, 2023
72722e1
update dependencies [skip actions]
AnnaChristina Apr 17, 2023
de48c2b
Merge pull request #118 from theislab/dependabot/pip/development/pep8…
AnnaChristina Apr 17, 2023
e2f9b4e
resolve conflict [skip actions]
AnnaChristina Apr 17, 2023
5d7ed7c
Merge pull request #127 from theislab/dependabot/github_actions/devel…
AnnaChristina Apr 17, 2023
f56d372
Merge branch 'development' into dependabot/pip/development/pre-commit…
AnnaChristina Apr 17, 2023
81004e9
Merge pull request #133 from theislab/dependabot/pip/development/pre-…
AnnaChristina Apr 17, 2023
db805da
resolve conflict [skip actions]
AnnaChristina Apr 17, 2023
ecdb14d
enhance docs [ci skip]
AnnaChristina Apr 19, 2023
b61219a
run pre-commit [ci skip]
AnnaChristina Apr 19, 2023
0db6d8f
pre-commit
AnnaChristina Apr 25, 2023
9be249e
update poetry
AnnaChristina Apr 25, 2023
4c81b8b
adjust noxfile
AnnaChristina Apr 25, 2023
d8dc90c
Bump version from 0.1.4 to 0.1.5
AnnaChristina May 9, 2023
a3f3775
bump version
AnnaChristina May 9, 2023
42ad6cf
resolve bugs in deconvolution model
AnnaChristina May 16, 2023
4eceb8d
adjust naming in dmats
AnnaChristina May 16, 2023
e09d55a
Merge pull request #123 from theislab/feature/tools
AnnaChristina Jun 27, 2023
5fb779f
update python version in docs build
AnnaChristina Jun 27, 2023
1daf7bb
update workflow requirements
AnnaChristina Jun 27, 2023
c320756
update python version in docs build
AnnaChristina Jun 27, 2023
b7cd2eb
resolve issue in docs build
AnnaChristina Jun 27, 2023
64b7ac1
resolve issue in docs build
AnnaChristina Jun 27, 2023
05fca3f
adjust dependencies for docs build
AnnaChristina Jun 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .cookietemple.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ full_name: Anna Schaar
email: [email protected]
project_name: ncem
project_short_description: ncem. Learning cell communication from spatial graphs of cells.
version: 0.1.4
version: 0.1.5
license: BSD-3-Clause
4 changes: 2 additions & 2 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name-template: "0.1.4 🌈" # <<COOKIETEMPLE_FORCE_BUMP>>
tag-template: 0.1.4 # <<COOKIETEMPLE_FORCE_BUMP>>
name-template: "0.1.5 🌈" # <<COOKIETEMPLE_FORCE_BUMP>>
tag-template: 0.1.5 # <<COOKIETEMPLE_FORCE_BUMP>>
categories:
- title: "🚀 Features"
labels:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
python: [3.7, 3.8]
python: [3.8]

steps:
- uses: actions/checkout@v2
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4.3.0
with:
python-version: ${{ matrix.python }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main_master_branch_protection.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4.3.0
with:
python-version: "3.8"
# PRs to the repository master branch are only ok if coming from any patch or release branch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4.3.0
with:
python-version: 3.8

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fetch-depth: 2

- name: Set up Python
uses: actions/setup-python@v2.1.4
uses: actions/setup-python@v4.3.0
with:
python-version: "3.8"

Expand All @@ -31,7 +31,7 @@ jobs:
- name: Publish package on PyPI
uses: pypa/[email protected]
with:
# TODO COOKIETEMPLE: Configure your PyPI Token to enable automatic deployment to PyPi on releases
# COOKIETEMPLE: Configure your PyPI Token to enable automatic deployment to PyPi on releases
# https://help.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets
user: __token__
password: ${{ secrets.PYPI_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/run_cookietemple_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4.3.0
with:
python-version: 3.8

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
uses: actions/[email protected]

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2.1.4
uses: actions/setup-python@v4.3.0
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
print("::set-output name=result::{}".format(result))

- name: Restore pre-commit cache
uses: actions/cache@v2.1.6
uses: actions/cache@v3.3.1
if: matrix.session == 'pre-commit'
with:
path: ~/.cache/pre-commit
Expand All @@ -113,14 +113,14 @@ jobs:

- name: Upload coverage data
if: always() && matrix.session == 'tests'
uses: "actions/upload-artifact@v2.2.4"
uses: "actions/upload-artifact@v3.1.2"
with:
name: coverage-data
path: ".coverage.*"

- name: Upload documentation
if: matrix.session == 'docs-build'
uses: actions/upload-artifact@v2.2.4
uses: actions/upload-artifact@v3.1.2
with:
name: docs
path: docs/_build
Expand All @@ -133,7 +133,7 @@ jobs:
uses: actions/[email protected]

- name: Set up Python 3.8
uses: actions/setup-python@v2.1.4
uses: actions/setup-python@v4.3.0
with:
python-version: 3.8

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4.3.0
with:
python-version: 3.8

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ repos:
hooks:
- id: prettier
- repo: https://github.com/pycqa/isort
rev: 5.9.3
rev: 5.11.5
hooks:
- id: isort
name: isort (python)
Expand Down
2 changes: 1 addition & 1 deletion cookietemple.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.1.4
current_version = 0.1.5

[bumpversion_files_whitelisted]
init_file = ncem/__init__.py
Expand Down
119 changes: 119 additions & 0 deletions docs/_static/css/custom.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
.small {
font-size: 55%;
}

div.version {
color: #ffd92c !important;
}

.wy-nav-side {
background: #242335;
}

.wy-side-nav-search {
background-color: #242335;
}

.wy-side-nav-search input[type="text"] {
border-radius: 6px !important;
}

.wy-nav-content {
max-width: 950px;
}

.wy-menu-vertical a {
color: #eceef4;
}

.wy-menu-vertical li.current {
background: #f1f5fb;
}

.wy-menu-vertical li.toctree-l2.current > a {
background: #34377d2e;
}

.wy-menu-vertical li.toctree-l2.current li.toctree-l3 > a {
background: #34377d4a;
}

.wy-menu-vertical li.toctree-l3.current li.toctree-l4 > a {
background: #34377d7d;
}

.wy-menu-vertical a:hover {
background-color: #6b86b0;
}

.wy-menu-vertical li.current a:hover {
background: #bdcde6a3;
}

a {
color: #5b64b1;
}

.rst-content .viewcode-link {
color: #7013e1d9;
}

.highlight {
background: #f1f5fb !important;
}

.rst-content div[class^="highlight"] {
border: 1px solid #e4eaf2;
}

.wy-menu-vertical p.caption {
color: #ffd92c;
}

div.output_subarea.output_html.rendered_html.output_result {
overflow: auto;
}

/* function/class top bar */
html.writer-html5
.rst-content
dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple)
> dt {
color: #404040;
border-top: solid 4px #7013e1d9;
background: #ffd833a8;
}

/* class params */
html.writer-html5
.rst-content
dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple)
dl:not(.field-list)
> dt {
color: #404040;
border-left: solid 4px #7013e1d9;
background: #ffd8338f;
}

/* the other elements, but more specific - leave them be */
code.docutils.literal.notranslate > span[class="pre"] {
font-weight: bold;
color: #404040;
}

/* odd rows in API */
.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td {
background-color: #f6f6f3;
}

.rst-content div[class^="highlight"] pre {
padding: 8px;
}

.rst-content .seealso {
background: #fafae2 !important;
}

.rst-content .seealso .admonition-title {
background: #7013e1d9 !important;
}
43 changes: 43 additions & 0 deletions docs/_static/css/dataframe.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/* Pandas dataframe css */
/* Taken from: https://github.com/spatialaudio/nbsphinx/blob/fb3ba670fc1ba5f54d4c487573dbc1b4ecf7e9ff/src/nbsphinx.py#L587-L619 */
/* modified margin-left */

table.dataframe {
border: none !important;
border-collapse: collapse;
border-spacing: 0;
border-color: transparent;
color: black;
font-size: 12px;
table-layout: fixed;
margin-left: 0 !important;
}

table.dataframe thead {
border-bottom: 1px solid black;
vertical-align: bottom;
}

table.dataframe tr,
table.dataframe th,
table.dataframe td {
text-align: right;
vertical-align: middle;
padding: 0.5em 0.5em;
line-height: normal;
white-space: normal;
max-width: none;
border: none;
}

table.dataframe th {
font-weight: bold;
}

table.dataframe tbody tr:nth-child(odd) {
background: #f5f5f5;
}

table.dataframe tbody tr:hover {
background: rgba(66, 165, 245, 0.2);
}
24 changes: 24 additions & 0 deletions docs/_static/css/nbsphinx.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
div.nbinput.container div.prompt,
div.nboutput.container div.prompt {
display: none;
}

div.nbinput.container div.prompt > div.highlight,
div.nboutput.container div.prompt > div.highlight {
display: none;
}

div.nbinput.container div.input_area div[class*="highlight"] > pre,
div.nboutput.container div.output_area div[class*="highlight"] > pre {
padding: 8px !important;
}

div.nboutput.container div.output_area > div[class^="highlight"] {
background-color: #fafae2 !important;
}

.rst-content .output_area img {
max-width: unset;
width: 100% !important;
height: auto !important;
}
Loading
Loading