Skip to content

Commit

Permalink
Add snappy, swap channels, pin 3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
brl0 committed Feb 6, 2021
1 parent da5cc87 commit 498e7fc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
shell: bash -l {0}
env:
PYTHON_VERSION: ${{ matrix.python-version }}
CHANS_DEV: "-c pyviz/label/dev -c conda-forge"
CHANS_DEV: "-c conda-forge -c pyviz/label/dev"
CHANS_OSX: "-c pyviz/label/dev -c conda-forge"
CHANS: "-c pyviz"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
15 changes: 11 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
'pandas>=0.25',
'param',
'retrying',
'snappy',
]

if sys.platform == 'darwin':
Expand All @@ -38,10 +39,16 @@
'pyarrow>=0.15,<2',
])
else:
install_requires.extend([
'numpy>=1.20',
'pyarrow>=3',
])
if sys.version_info[:2] == (3, 6):
install_requires.extend([
'numpy<1.20',
'pyarrow<3',
])
else:
install_requires.extend([
'numpy>=1.20',
'pyarrow<3',
])

setup_args = dict(
name='spatialpandas',
Expand Down

0 comments on commit 498e7fc

Please sign in to comment.