Skip to content

Commit

Permalink
Merge pull request #1044 from hamelin/drop-requirements-txt
Browse files Browse the repository at this point in the history
Drop requirements.txt, embrace setup.py for deps
  • Loading branch information
lmcinnes committed Aug 21, 2023
2 parents bd727fb + 4fe7eb2 commit 8e230d3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 40 deletions.
20 changes: 7 additions & 13 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Recommended packages:
* matplotlib
* datashader
* holoviews
* for Parametric UMAP
* for Parametric UMAP
* tensorflow > 2.0.0

**Install Options**
Expand Down Expand Up @@ -131,8 +131,8 @@ If you wish to use the plotting functionality you can use
to install all the plotting dependencies.

If you wish to use Parametric UMAP, you need to install Tensorflow, which can be
installed either using the instructions at https://www.tensorflow.org/install
(reccomended) or using
installed either using the instructions at https://www.tensorflow.org/install
(reccomended) or using

.. code:: bash
Expand All @@ -159,23 +159,17 @@ For a manual install get this package:
rm master.zip
cd umap-master
Install the requirements

.. code:: bash
sudo pip install -r requirements.txt
or
Optionally, install the requirements through Conda:

.. code:: bash
conda install scikit-learn numba
Install the package
Then install the package

.. code:: bash
python setup.py install
python -m pip install -e .
---------------
How to use UMAP
Expand Down Expand Up @@ -293,7 +287,7 @@ For a problem such as the 784-dimensional MNIST digits dataset with
compared with around 45 minutes for scikit-learn's t-SNE implementation).
Despite this runtime efficiency, UMAP still produces high quality embeddings.

The obligatory MNIST digits dataset, embedded in 42
The obligatory MNIST digits dataset, embedded in 42
seconds (with pynndescent installed and after numba jit warmup)
using a 3.1 GHz Intel Core i7 processor (n_neighbors=10, min_dist=0.001):

Expand Down
24 changes: 4 additions & 20 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,10 @@ jobs:

- script: |
python -m pip install --upgrade pip
pip install -r requirements.txt
displayName: 'Install dependencies'
- script: |
pip install -e .
pip install .[plot]
pip install .[parametric_umap]
displayName: 'Install package'
displayName: 'Install package and its dependencies'
- script: |
pip install pytest pytest-benchmark
Expand Down Expand Up @@ -68,14 +64,10 @@ jobs:

- script: |
python -m pip install --upgrade pip
pip install -r requirements.txt
displayName: 'Install dependencies'
- script: |
pip install -e .
pip install .[plot]
pip install .[parametric_umap]
displayName: 'Install package'
displayName: 'Install package and its dependencies'
- script: |
pip install pytest pytest-benchmark
Expand Down Expand Up @@ -108,14 +100,10 @@ jobs:

- script: |
python -m pip install --upgrade pip
pip install -r requirements.txt
displayName: 'Install dependencies'
- script: |
pip install -e .
pip install .[plot]
pip install .[parametric_umap]
displayName: 'Install package'
displayName: 'Install package and its dependencies'
- script: |
pip install pytest pytest-benchmark
Expand Down Expand Up @@ -144,17 +132,13 @@ jobs:

- script: |
python -m pip install --upgrade pip
pip install -r requirements.txt
displayName: 'Install dependencies'
- script: |
pip install -e .
pip install .[plot]
pip install .[parametric_umap]
pip install pytest pytest-benchmark
pip install pytest-cov
pip install coveralls
displayName: 'Install package'
displayName: 'Install package and its dependencies'
- script: |
export NUMBA_DISABLE_JIT=1
Expand Down
7 changes: 0 additions & 7 deletions requirements.txt

This file was deleted.

0 comments on commit 8e230d3

Please sign in to comment.