Skip to content

Commit

Permalink
Merge pull request #4862 from pavlin-policar/tsne-1
Browse files Browse the repository at this point in the history
tsne: require opentsne>=0.4.3
  • Loading branch information
markotoplak authored Jun 26, 2020
2 parents 4e6360e + cea0a91 commit 62e5c69
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 23 deletions.
2 changes: 0 additions & 2 deletions .travis/install_orange.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ foldable pip install -U setuptools pip codecov

if [[ $TRAVIS_PYTHON_VERSION == 3.4 ]]; then pip install pandas==0.20.3; fi

pip install numba==0.41.0 llvmlite==0.26.0

# Install dependencies sequentially
cat requirements-core.txt \
requirements-gui.txt \
Expand Down
45 changes: 25 additions & 20 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,37 @@ requirements:

run:
- python
- setuptools
- numpy >=1.16.0
- scipy
- scikit-learn >=0.22
- bottleneck >=1.0.0
- chardet >=3.0.2
- setuptools >=36.3
- numpy >=1.16.0
- scipy >=0.16.1
- scikit-learn >=0.22.0,!=0.23.0
- bottleneck >=1.0.0
- chardet >=3.0.2
- docutils
- xlrd >=0.9.2
- xlrd >=0.9.2
- xlsxwriter
- anyqt >=0.0.8
- pyqt >=5.12
- pyqtgraph ~=0.10.0|~=0.11.0
- joblib >=0.9.4
- keyring
- keyrings.alt # for alternative keyring implementations
- pyqt >=5.12
- pyqtgraph ~=0.10.0|~=0.11.0
- anyqt >=0.0.8
- joblib
- python.app # [osx]
- commonmark
- keyrings.alt
- pip >=9.0
- python.app # [osx]
- serverfiles
- matplotlib >=2.0.0
- opentsne >=0.3.11
- python-louvain >=0.13
- requests
- matplotlib-base >=2.0.0
- openTSNE >=0.4.3
- pandas
- pyyaml
- orange-canvas-core >=0.1.9
- orange-widget-base >=4.4.0
- orange-canvas-core >=0.1.15,<0.2a
- orange-widget-base >=4.6.0
- openpyxl
- python-louvain >=0.13
- xlsxwriter
- httpx >=0.12
- baycomp >=1.0.2
# cachecontrol (required by canvas core) <0.12.5 is incompatible with msgpack 1.0
- cachecontrol >=0.12.6

test:
# Python imports
Expand Down
2 changes: 1 addition & 1 deletion requirements-core.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ serverfiles # for Data Sets synchronization
networkx
python-louvain>=0.13
requests
openTSNE>=0.3.11
openTSNE>=0.4.3
baycomp>=1.0.2
pandas
pyyaml
Expand Down

0 comments on commit 62e5c69

Please sign in to comment.