Skip to content

Commit 45639a8

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # hdbscan/_hdbscan_boruvka.c # hdbscan/_hdbscan_tree.c # hdbscan/_prediction_utils.c # hdbscan/dist_metrics.c
2 parents 96b8920 + 54e8a19 commit 45639a8

File tree

8 files changed

+6
-138033
lines changed

8 files changed

+6
-138033
lines changed

hdbscan/_hdbscan_boruvka.c

Lines changed: 0 additions & 40382 deletions
This file was deleted.

hdbscan/_hdbscan_linkage.c

Lines changed: 0 additions & 25169 deletions
This file was deleted.

hdbscan/_hdbscan_reachability.c

Lines changed: 0 additions & 10721 deletions
This file was deleted.

hdbscan/_hdbscan_tree.c

Lines changed: 0 additions & 33253 deletions
This file was deleted.

hdbscan/_prediction_utils.c

Lines changed: 0 additions & 28497 deletions
This file was deleted.

hdbscan/dist_metrics.c

Lines changed: 0 additions & 1 deletion
This file was deleted.

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cython>=0.22
1+
cython>=0.27
22
numpy>=1.9
33
scipy >= 0.9
44
scikit-learn>=0.17

setup.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def readme():
4747

4848
configuration = {
4949
'name': 'hdbscan',
50-
'version': '0.8.13',
50+
'version': '0.8.14',
5151
'description': 'Clustering based on density with variable density clusters',
5252
'long_description': readme(),
5353
'classifiers': [
@@ -74,7 +74,7 @@ def readme():
7474
'packages': ['hdbscan', 'hdbscan.tests'],
7575
'install_requires': ['numpy',
7676
'scikit-learn>=0.16',
77-
'cython >= 0.17'],
77+
'cython >= 0.26'],
7878
'ext_modules': [_hdbscan_tree,
7979
_hdbscan_linkage,
8080
_hdbscan_boruvka,
@@ -88,12 +88,8 @@ def readme():
8888
}
8989

9090
if not HAVE_CYTHON:
91-
_hdbscan_tree.sources[0] = 'hdbscan/_hdbscan_tree.c'
92-
_hdbscan_linkage.sources[0] = 'hdbscan/_hdbscan_linkage.c'
93-
_hdbscan_boruvka.sources[0] = 'hdbscan/_hdbscan_boruvka.c'
94-
_hdbscan_reachability.sources[0] = 'hdbscan/_hdbscan_reachability.c'
95-
_prediction_utils.sources[0] = 'hdbscan/_prediction_utils.c'
96-
dist_metrics.sources[0] = 'hdbscan/dist_metrics.c'
97-
configuration['install_requires'] = ['numpy', 'scikit-learn>=0.16']
91+
warnings.warn('Due to incompatibilities with Python 3.7 hdbscan now'
92+
'requires Cython to be installed in order to build it')
93+
raise ImportError('Cython not found! Please install cython and try again')
9894

9995
setup(**configuration)

0 commit comments

Comments
 (0)