Skip to content

Commit

Permalink
Simplify dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr committed Jun 7, 2021
1 parent 00c3bd1 commit a6b1310
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 24 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
19 changes: 3 additions & 16 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import sys

import param

from setuptools import find_packages, setup

extras_require = {
Expand Down Expand Up @@ -34,22 +33,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(
Expand Down

0 comments on commit a6b1310

Please sign in to comment.