Skip to content

Commit 030f932

Browse files
committed
Simplify dependencies
1 parent 00c3bd1 commit 030f932

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

.github/workflows/test.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ jobs:
2020
exclude:
2121
- os: macos-latest
2222
python-version: 3.6
23+
- os: macos-latest
24+
python-version: 3.8
2325
timeout-minutes: 60
2426
defaults:
2527
run:
@@ -48,15 +50,7 @@ jobs:
4850
conda install -c pyviz "pyctdev>=0.5"
4951
doit ecosystem_setup
5052
doit env_create ${{ env.CHANS_DEV}} --python=${{ matrix.python-version }}
51-
- name: doit develop_install osx
52-
if: contains(matrix.os, 'macos')
53-
run: |
54-
eval "$(conda shell.bash hook)"
55-
conda activate test-environment
56-
doit develop_install ${{ env.CHANS_OSX }} -o tests
57-
pip install hilbertcurve
5853
- name: doit develop_install
59-
if: (!contains(matrix.os, 'macos'))
6054
run: |
6155
eval "$(conda shell.bash hook)"
6256
conda activate test-environment

setup.py

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import sys
22

33
import param
4+
45
from setuptools import find_packages, setup
56

67
extras_require = {
@@ -34,22 +35,10 @@
3435
'pyarrow >=1.0',
3536
'python-snappy',
3637
'retrying',
38+
'numpy',
39+
'dask[complete] >=2.0'
3740
]
3841

39-
# Checking for platform explicitly because
40-
# pyctdev does not handle dependency conditions
41-
# such as 'numpy<1.20;platform_system=="Darwin"'
42-
if sys.platform == 'darwin':
43-
install_requires.extend([
44-
'dask[complete]>=2.0,<2020.12',
45-
'numpy<1.20',
46-
])
47-
else:
48-
install_requires.extend([
49-
'dask[complete]>=2.0',
50-
'numpy',
51-
])
52-
5342
setup_args = dict(
5443
name='spatialpandas',
5544
version=param.version.get_setup_version(

0 commit comments

Comments
 (0)