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

Go back to regular pip #1702

Merged
merged 9 commits into from
Mar 2, 2021
Merged

Go back to regular pip #1702

merged 9 commits into from
Mar 2, 2021

Conversation

flying-sheep
Copy link
Member

@flying-sheep flying-sheep commented Mar 1, 2021

Hahaha and of course after weeks of this bug, everything gets resolved the day I press the merge button. pypa/flit#395 should fix the issues where

  1. pip install scvelo downgrades a flit install -s installed scanpy (now the dist-info dir name contains the correct version)
  2. The wheel built by flit now corresponds to the freshly-changed spec’s mangling rules

So we can remove the workarounds. No problem, git blame won’t be affected much, this almost exclusively deletes lines.

@flying-sheep flying-sheep changed the title Go back to regular flit Go back to regular pip Mar 1, 2021
@flying-sheep
Copy link
Member Author

flying-sheep commented Mar 1, 2021

Just checked using this dockerfile, works flawlessly:

FROM continuumio/miniconda

RUN conda install python=3.8
RUN pip install flit>=3.1
RUN git clone https://github.com/theislab/scanpy.git
WORKDIR /scanpy
# Go to the mainline-pip branch if it hasn’t been merged into master yet
RUN git checkout mainline-pip || true
RUN FLIT_ROOT_INSTALL=1 flit install -s --dep=develop  # Make development install of scanpy
# Make sure the dist-info folder has a plus in its name
RUN SCANPY_VERSION=$(python -c 'from importlib.metadata import version; print(version("scanpy"))') && \
    echo $SCANPY_VERSION | grep '+' &&
    test -d /opt/conda/lib/python3.8/site-packages/scanpy-$SCANPY_VERSION.dist-info
# Install project that depends on scanpy
RUN pip install scvelo
# Make sure it’s still a dev install
RUN test -L /opt/conda/lib/python3.8/site-packages/scanpy

Copy link
Member

@ivirshup ivirshup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More something that should have been caught in previous review, for the Check Build job:

  • Flit should be installed with the rest of the dependencies.
  • Can some of those tools be removed? For example: setuptools.

@ivirshup ivirshup self-requested a review March 2, 2021 11:02
@ivirshup ivirshup merged commit 7681458 into master Mar 2, 2021
@flying-sheep flying-sheep deleted the mainline-pip branch March 2, 2021 11:23
Zethson pushed a commit that referenced this pull request Mar 15, 2021
* Go back to regular flit

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>
ivirshup added a commit that referenced this pull request Mar 18, 2021
* add flake8 pre-commit

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* fix pre-commit

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* add E402 to flake8 ignore

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* revert neighbors

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* fix flake8

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* address review

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* fix comment character in .flake8

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* fix test

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* black

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* review round 2

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* review round 3

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* readded double comments

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* Ignoring E262 & reverted comment

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* using self for obs_tidy

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* Restore setup.py

* rm call of black test (#1690)

* Fix print_versions for python<3.8 (#1691)

* add codecov so we can have a badge to point to (#1693)

* Attempt server-side search (#1672)

* Fix paga_path (#1047)

Fix paga_path

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* Switch to flit

This reverts commit d645790

* add setup.py while leaving it ignored

* Update install instructions

* Circumvent new pip check (see pypa/pip#9628)

* Go back to regular pip (#1702)

* Go back to regular flit

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* codecov comment (#1704)

* Use joblib for parallelism in regress_out (#1695)

* Use joblib for parallism in regress_out

* release note

* fix link in release notes

* Add todo for resource test

* Add sparsificiation step before sparse-dependent Scrublet calls (#1707)

* Add sparsificiation step before sparse-dependent Scrublet calls

* Apply sparsification suggestion

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* Fix imports

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* Fix version on Travis (#1713)

By default, Travis does `git clone --depth=50` which means the version can’t be detected from the git tag.

* `sc.metrics` module (add confusion matrix & Geary's C methods) (#915)

* Add `sc.metrics` with `gearys_c`

Add a module for computing useful metrics. Started off with Geary's C since I'm using it and finding it useful. I've also got a fairly fast way to calculate it worked out.

Unfortunatly my implementation runs into some issues with some global configs set by umap (see lmcinnes/umap#306), so I'm going to see if that can be resolved before changing it.

* Add sc.metrics.confusion_matrix

* Better tests and output for confusion_matrix

* Workaround umap<0.4 and increase numerical stability of gearys_c

* Work around lmcinnes/umap#306 by not
  calling out to kernel function. That code has been kept, but commented
  out.
* Increase numerical stability by casting data to system width. Tests
  were failing due to instability.

* Split up gearys_c tests

* Improved unexpected error message

* gearys_c working again. Sadly, a bit slower

* One option for doc strings

* Simplify implementation to use single dispatch

* release notes

* Fix clipped images in docs (#1717)

* Cleanup normalize_total (#1667)

* Cleanup normalize_total

* Add modification tests and copy kwarg for normalize_total

* Test that 'layers' argument is deprecated

* Added more mutation checks for normalize_total

* release note

* Error message

* deprecate scvi (#1703)

* deprecate scvi

* Update .azure-pipelines.yml

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* remove :func: links to scvi in release notes

* remove tildes in front of scvi in release notes

* Update docs/release-notes/1.5.0.rst

Co-authored-by: Michael Jayasuriya <mjayasur@Michaels-MacBook-Air.local>
Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* updated ecosystem.rst to add triku (#1722)

* Minor addition to contributing docs (#1726)

* Preserve category order when groupby is a list (#1735)

Preserve category order when groupby is a list

* Asymmetrical diverging colormaps and vcenter (#1551)

Add vcenter and norm arguments to plotting functions

* add flake8 pre-commit

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* add E402 to flake8 ignore

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* revert neighbors

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* address review

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* black

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* using self for obs_tidy

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* rebased

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* rebasing

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* rebasing

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* rebasing

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* add flake8 to dev docs

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* add autopep8 to pre-commits

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* add flake8 ignore docs

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* add exception todos

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* add ignore directories

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* reinstated lambdas

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* fix tests

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* fix tests

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* fix tests

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* fix tests

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* fix tests

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* Add E741 to allowed flake8 violations.

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* Add F811 flake8 ignore for tests

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* Fix mask comparison

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* Fix mask comparison

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* fix flake8 config file

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* readded autopep8

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* import Literal

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* revert literal import

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* fix scatterplot pca import

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* false comparison & unused vars

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* Add cleaner level determination

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* Fix comment formatting

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* Add smoother dev documentation

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* fix flake8

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* Readd long comment

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* Assuming X as array like

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* fix flake8

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* fix flake8 config

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* reverted rank_genes

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* fix disp_mean_bin formatting

Co-authored-by: Isaac Virshup <ivirshup@gmail.com>

* fix formatting

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* add final todos

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* boolean checks with is

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* _dpt formatting

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* literal fixes

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* links to leafs

Signed-off-by: Zethson <lukas.heumos@posteo.net>

* revert paga variable naming

Co-authored-by: Philipp A <flying-sheep@web.de>
Co-authored-by: Sergei Rybakov <koncopd@gmail.com>
Co-authored-by: Isaac Virshup <ivirshup@gmail.com>
Co-authored-by: Jonathan Manning <jmanning@ebi.ac.uk>
Co-authored-by: mjayasur <mjayasur@berkeley.edu>
Co-authored-by: Michael Jayasuriya <mjayasur@Michaels-MacBook-Air.local>
Co-authored-by: Alex M. Ascensión <35657291+alexmascension@users.noreply.github.com>
Co-authored-by: Gökçen Eraslan <gokcen.eraslan@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants