Skip to content

Commit 498e7fc

Browse files
committed
Add snappy, swap channels, pin 3.6
1 parent da5cc87 commit 498e7fc

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
shell: bash -l {0}
2929
env:
3030
PYTHON_VERSION: ${{ matrix.python-version }}
31-
CHANS_DEV: "-c pyviz/label/dev -c conda-forge"
31+
CHANS_DEV: "-c conda-forge -c pyviz/label/dev"
3232
CHANS_OSX: "-c pyviz/label/dev -c conda-forge"
3333
CHANS: "-c pyviz"
3434
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

setup.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
'pandas>=0.25',
3131
'param',
3232
'retrying',
33+
'snappy',
3334
]
3435

3536
if sys.platform == 'darwin':
@@ -38,10 +39,16 @@
3839
'pyarrow>=0.15,<2',
3940
])
4041
else:
41-
install_requires.extend([
42-
'numpy>=1.20',
43-
'pyarrow>=3',
44-
])
42+
if sys.version_info[:2] == (3, 6):
43+
install_requires.extend([
44+
'numpy<1.20',
45+
'pyarrow<3',
46+
])
47+
else:
48+
install_requires.extend([
49+
'numpy>=1.20',
50+
'pyarrow<3',
51+
])
4552

4653
setup_args = dict(
4754
name='spatialpandas',

0 commit comments

Comments
 (0)