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.

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

[hail] Update Hail Python dependencies #6214

Merged
merged 6 commits into from
Jun 3, 2019
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
6 changes: 3 additions & 3 deletions hail/deploy_scripts/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
'numpy<2',
'pandas>0.22,<0.24',
'matplotlib<3',
'seaborn<0.9',
'bokeh<0.14',
'bokeh>1.1,<1.3',
'pyspark>=2.4,<2.4.2',
'parsimonious<0.9',
'ipykernel<5',
'decorator<5',
'requests>=2.21.0,<2.21.1',
'gcsfs==0.2.1',
'hurry.filesize==0.9'
'hurry.filesize==0.9',
'scipy>1.2, <1.4'
],
entry_points={
'console_scripts': ['hailctl = hailctl.__main__:main']
Expand Down
1 change: 0 additions & 1 deletion hail/python/hail/dev-environment-py3.7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dependencies:
- numpy=1.15.3
- pandas=0.23.4
- matplotlib=3.0.1
- seaborn=0.9.0
- bokeh=1.0.0
- jupyter=1.0.0
- pip=18.0
Expand Down
1 change: 0 additions & 1 deletion hail/python/hail/dev-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dependencies:
- numpy=1.14.0
- pandas=0.23.4
- matplotlib=2.2.3
- seaborn=0.8.1
- bokeh=0.12.13
- jupyter=1.0.0
- pip=10.0.1
Expand Down
1 change: 0 additions & 1 deletion hail/python/hail/docs/style-guide.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
- matplotlib
- pandas
- numpy
- seaborn

## Function Documentation Structure
- Description
Expand Down
2 changes: 0 additions & 2 deletions hail/python/hail/docs/tutorials/04-aggregation.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@
"source": [
"import hail as hl\n",
"from bokeh.io import output_notebook,show\n",
"import seaborn\n",
"output_notebook()\n",
"seaborn.set()\n",
"hl.init()\n",
"\n",
"\n",
Expand Down
1 change: 0 additions & 1 deletion hail/python/hail/docs/tutorials/05-filter-annotate.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"outputs": [],
"source": [
"import hail as hl\n",
"import seaborn\n",
"\n",
"hl.utils.get_movie_lens('data/')\n",
"users = hl.read_table('data/users.ht')"
Expand Down
1 change: 0 additions & 1 deletion hail/python/hail/docs/tutorials/06-joins.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"outputs": [],
"source": [
"import hail as hl\n",
"import seaborn\n",
"\n",
"hl.utils.get_movie_lens('data/')\n",
"\n",
Expand Down
2 changes: 0 additions & 2 deletions hail/python/hail/docs/tutorials/07-matrixtable.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,8 @@
"outputs": [],
"source": [
"import hail as hl\n",
"import seaborn\n",
"from bokeh.io import output_notebook, show\n",
"output_notebook()\n",
"seaborn.set()\n",
"\n",
"hl.utils.get_1kg('data/')"
]
Expand Down
1 change: 0 additions & 1 deletion hail/python/hail/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ dependencies:
- numpy=1.14.0
- pandas=0.23.0
- matplotlib=2.2.3
- seaborn=0.8.1
- bokeh=0.12.13
- jupyter=1.0.0
- pip=10.0.1
Expand Down
1 change: 0 additions & 1 deletion hail/python/hailctl/dataproc/resources/init_notebook.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ def mkdir_if_not_exists(path):
'pandas<0.24'
]
pip_pkgs = [
'seaborn<0.10',
'decorator==4.2.1',
'parsimonious<0.9',
'ipywidgets<8',
Expand Down
21 changes: 10 additions & 11 deletions hail/python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
numpy==1.14.0
pandas==0.23.0
matplotlib==2.2.3
seaborn==0.8.1
bokeh==0.12.13
numpy==1.16
pandas==0.23
bokeh==1.2
jupyter==1.0.0
tornado<6
parsimonious==0.8.0
ipykernel==4.9.0
parsimonious==0.8
ipykernel==5.1
# should go in test image
pytest==3.10.1
pytest==4.5
pytest-html==1.20.0
pytest-xdist==1.23.2
sphinx==1.8.3
nbsphinx==0.3.1
pytest-xdist==1.28
sphinx==2.0
nbsphinx==0.4
sphinx_rtd_theme==0.4.2
scipy==1.3