From 030f932fac7692835438b87e34056a799446560d Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <prudiger@anaconda.com>
Date: Mon, 7 Jun 2021 14:34:06 +0200
Subject: [PATCH] Simplify dependencies

---
 .github/workflows/test.yml | 10 ++--------
 setup.py                   | 17 +++--------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1ab33e1..5e48195 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,6 +20,8 @@ jobs:
         exclude:
           - os: macos-latest
             python-version: 3.6
+          - os: macos-latest
+            python-version: 3.8
     timeout-minutes: 60
     defaults:
       run:
@@ -48,15 +50,7 @@ jobs:
           conda install -c pyviz "pyctdev>=0.5"
           doit ecosystem_setup
           doit env_create ${{ env.CHANS_DEV}} --python=${{ matrix.python-version }}
-      - name: doit develop_install osx
-        if: contains(matrix.os, 'macos')
-        run: |
-          eval "$(conda shell.bash hook)"
-          conda activate test-environment
-          doit develop_install ${{ env.CHANS_OSX }} -o tests
-          pip install hilbertcurve
       - name: doit develop_install
-        if: (!contains(matrix.os, 'macos'))
         run: |
           eval "$(conda shell.bash hook)"
           conda activate test-environment
diff --git a/setup.py b/setup.py
index 7685163..5d842ec 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
 import sys
 
 import param
+
 from setuptools import find_packages, setup
 
 extras_require = {
@@ -34,22 +35,10 @@
     'pyarrow >=1.0',
     'python-snappy',
     'retrying',
+    'numpy',
+    'dask[complete] >=2.0'
 ]
 
-# Checking for platform explicitly because
-# pyctdev does not handle dependency conditions
-# such as 'numpy<1.20;platform_system=="Darwin"'
-if sys.platform == 'darwin':
-    install_requires.extend([
-        'dask[complete]>=2.0,<2020.12',
-        'numpy<1.20',
-    ])
-else:
-    install_requires.extend([
-        'dask[complete]>=2.0',
-        'numpy',
-    ])
-
 setup_args = dict(
     name='spatialpandas',
     version=param.version.get_setup_version(