Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump pandas/numpy/pyarrow versions #339

Merged
merged 2 commits into from
Feb 2, 2021
Merged

Bump pandas/numpy/pyarrow versions #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca4efd1
Try fixing tests
karenfeng Feb 1, 2021
33930b8
Change test order
karenfeng Feb 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,14 @@ jobs:
export SPARK_VERSION="2.4.5"
export SCALA_VERSION="2.11.12"
sbt coverage core/test coverageReport exit
- run:
name: Run docs tests
environment:
command: |
export PATH=$HOME/conda/envs/glow/bin:$PATH
export SPARK_VERSION="2.4.5"
export SCALA_VERSION="2.11.12"
sbt docs/test exit
- run:
name: Run Python tests
no_output_timeout: 30m
Expand All @@ -137,14 +145,6 @@ jobs:
sudo apt-get update
sudo apt-get -y install rsync
sbt installHail hail/test uninstallHail exit
- run:
name: Run docs tests
environment:
command: |
export PATH=$HOME/conda/envs/glow/bin:$PATH
export SPARK_VERSION="2.4.5"
export SCALA_VERSION="2.11.12"
sbt docs/test exit
- *check_clean_repo
- store_artifacts:
path: ~/glow/unit-tests.log
Expand Down Expand Up @@ -176,6 +176,14 @@ jobs:
export SPARK_VERSION="2.4.5"
export SCALA_VERSION="2.12.8"
sbt core/test exit
- run:
name: Run docs tests
environment:
command: |
export PATH=$HOME/conda/envs/glow/bin:$PATH
export SPARK_VERSION="2.4.5"
export SCALA_VERSION="2.12.8"
sbt docs/test exit
- run:
name: Run Python tests
no_output_timeout: 30m
Expand All @@ -195,14 +203,6 @@ jobs:
sudo apt-get update
sudo apt-get -y install rsync
sbt installHail hail/test uninstallHail exit
- run:
name: Run docs tests
environment:
command: |
export PATH=$HOME/conda/envs/glow/bin:$PATH
export SPARK_VERSION="2.4.5"
export SCALA_VERSION="2.12.8"
sbt docs/test exit


spark-3-tests:
Expand All @@ -226,6 +226,14 @@ jobs:
export SPARK_VERSION="3.0.0"
export SCALA_VERSION="2.12.8"
sbt core/test exit
- run:
name: Run docs tests
environment:
command: |
export PATH=$HOME/conda/envs/glow/bin:$PATH
export SPARK_VERSION="3.0.0"
export SCALA_VERSION="2.12.8"
sbt docs/test exit
- run:
name: Run Python tests
no_output_timeout: 30m
Expand All @@ -245,14 +253,6 @@ jobs:
sudo apt-get update
sudo apt-get -y install rsync
sbt installHail hail/test uninstallHail exit
- run:
name: Run docs tests
environment:
command: |
export PATH=$HOME/conda/envs/glow/bin:$PATH
export SPARK_VERSION="3.0.0"
export SCALA_VERSION="2.12.8"
sbt docs/test exit
- *check_clean_repo
- store_artifacts:
path: ~/glow/unit-tests.log
Expand Down
6 changes: 3 additions & 3 deletions python/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ dependencies:
- jupyterlab
- nomkl # Skip MKL for local development
- nptyping=1.3.0
- numpy=1.17.5
- numpy=1.18.1
- opt_einsum>=3.2.0
- pandas=0.25.3
- pandas=1.0.1
- pip
- pyarrow=0.15.1
- pyarrow=1.0.1
- pyspark=3.0.0
- pytest
- pyyaml
Expand Down
4 changes: 2 additions & 2 deletions python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
packages=setuptools.find_packages(),
install_requires=[
'nptyping==1.3.0',
'numpy>=1.17.4',
'numpy>=1.18.1',
'opt_einsum>=3.2.0',
'pandas>=0.25.3',
'pandas>=1.0.1',
'statsmodels>=0.10.0',
'typeguard==2.9.1',
],
Expand Down