Skip to content

Commit

Permalink
Merge pull request #242 from theislab/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
LouisK92 committed Sep 13, 2022
2 parents cf96c77 + b617210 commit 1059592
Show file tree
Hide file tree
Showing 29 changed files with 1,763 additions and 2,122 deletions.
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: Lukas Heumos
email: lukas.heumos@posteo.net
project_name: spapros
project_short_description: Fully automated spatial transcriptomics probe selection.
version: 0.1.0
version: 0.1.1
license: MIT
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.0 🌈" # <<COOKIETEMPLE_FORCE_BUMP>>
tag-template: 0.1.0 # <<COOKIETEMPLE_FORCE_BUMP>>
name-template: "0.1.1 🌈" # <<COOKIETEMPLE_FORCE_BUMP>>
tag-template: 0.1.1 # <<COOKIETEMPLE_FORCE_BUMP>>
categories:
- title: "🚀 Features"
labels:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
python: [3.8, 3.9]

steps:
- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3.0.2
name: Check out source-code repository

- name: Setup Python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repository
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3.0.2

- name: Run Labeler
uses: crazy-max/ghaction-github-labeler@v4.0.0
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 @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3.0.2
name: Check out source-code repository

- name: Setup Python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repository
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3.0.2
with:
fetch-depth: 2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_cookietemple_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3.0.2
name: Check out source-code repository

- name: Setup Python
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Check out the repository
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3.0.2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2.3.1
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
print("::set-output name=result::{}".format(result))
- name: Restore pre-commit cache
uses: actions/cache@v3.0.7
uses: actions/cache@v3.0.8
if: matrix.session == 'pre-commit'
with:
path: ~/.cache/pre-commit
Expand All @@ -92,14 +92,14 @@ jobs:
- name: Upload coverage data
if: always() && matrix.session == 'tests'
uses: "actions/upload-artifact@v2.3.1"
uses: "actions/upload-artifact@v3.1.0"
with:
name: coverage-data
path: ".coverage.*"

- name: Upload documentation
if: matrix.session == 'docs-build'
uses: actions/upload-artifact@v2.3.1
uses: actions/upload-artifact@v3.1.0
with:
name: docs
path: docs/_build
Expand All @@ -109,7 +109,7 @@ jobs:
needs: tests
steps:
- name: Check out the repository
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3.0.2

- name: Set up Python 3.9
uses: actions/setup-python@v2.3.1
Expand Down Expand Up @@ -147,4 +147,4 @@ jobs:
nox --force-color --session=coverage -- xml
- name: Upload coverage report
uses: codecov/codecov-action@v2.1.0
uses: codecov/codecov-action@v3.1.0
2 changes: 1 addition & 1 deletion .github/workflows/sync_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install cookietemple
run: pip install cookietemple

- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3.0.2
with:
fetch-depth: 0
token: "${{ secrets.CT_SYNC_TOKEN }}"
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,22 @@ Changelog
This project adheres to `Semantic Versioning <https://semver.org/>`_.


0.1.1 (2022-09-13)
-----------------------

**Added**

* install instructions to docs and readme for a workaround of `issue #234 <https://github.com/theislab/spapros/issues/234>`_

**Fixed**

* `issue #233 <https://github.com/theislab/spapros/issues/233>`_

**Dependencies**

**Deprecated**


0.1.0 (2022-08-12)
-----------------------

Expand Down
9 changes: 9 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,15 @@ You can install *spapros* via pip_ from PyPI_:
$ pip install spapros
Note! Currently the pip installation into an environment without `leidenalg` installed can lead to problems when running
Spapros' knn-based evaluation (see `issue #234 <https://github.com/theislab/spapros/issues/234>`_). To solve this, run
Spapros in a conda environment and install leidenalg before installing spapros via:

.. code:: console
$ conda install -c conda-forge leidenalg
Usage
-----

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.0
current_version = 0.1.1

[bumpversion_files_whitelisted]
init_file = spapros/__init__.py
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@
# the built documents.
#
# The short X.Y version.
version = "0.1.0"
version = "0.1.1"
# The full version, including alpha/beta/rc tags.
release = "0.1.0"
release = "0.1.1"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
8 changes: 8 additions & 0 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ you through the process.
.. _pip: https://pip.pypa.io
.. _Python installation guide: http://docs.python-guide.org/en/latest/starting/installation/

Note! Currently the pip installation into an environment without `leidenalg` installed can lead to problems when running
Spapros' knn-based evaluation (see `issue #234 <https://github.com/theislab/spapros/issues/234>`_). To solve this, run
Spapros in a conda environment and install leidenalg before installing spapros via:

.. code-block:: console
$ conda install -c conda-forge leidenalg
From sources
------------
Expand Down
Loading

0 comments on commit 1059592

Please sign in to comment.