Skip to content

Commit

Permalink
Update dependencies to fix safety check failures (#2142)
Browse files Browse the repository at this point in the history
* Update dependencies

Update dependencies causing safety check to fail

* Remove nb_black from jupyter notebooks

Because of the build issue on M1 macs, nb_black was removed as a dev dependency. This change removes the lines referencing nb_black (%load_ext lab_black) from all jupyter notebooks.
  • Loading branch information
travis-newby authored Feb 2, 2023
1 parent 7d1d14e commit a27ca46
Show file tree
Hide file tree
Showing 13 changed files with 1,681 additions and 724 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"from data_pipeline.score import field_names\n",
"from data_pipeline.comparison_tool.src import utils\n",
"\n",
"pd.options.display.float_format = \"{:,.3f}\".format\n",
"%load_ext lab_black"
"pd.options.display.float_format = \"{:,.3f}\".format"
]
},
{
Expand Down Expand Up @@ -433,7 +432,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.10"
"version": "3.10.9"
}
},
"nbformat": 4,
Expand Down
6 changes: 2 additions & 4 deletions data/data-pipeline/data_pipeline/content/config/scratch.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
"outputs": [],
"source": [
"import pandas as pd\n",
"import numpy as np\n",
"\n",
"%load_ext lab_black"
"import numpy as np"
]
},
{
Expand Down Expand Up @@ -792,7 +790,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.10"
"version": "3.10.9"
}
},
"nbformat": 4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
"source": [
"import pandas as pd\n",
"import numpy as np\n",
"import pathlib\n",
"\n",
"%load_ext lab_black"
"import pathlib"
]
},
{
Expand Down Expand Up @@ -1230,7 +1228,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.10"
"version": "3.10.9"
}
},
"nbformat": 4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
"from pathlib import Path\n",
"import matplotlib.pyplot as plt\n",
"\n",
"sys.path.append(\"../../data_pipeline/\")\n",
"\n",
"%load_ext lab_black"
"sys.path.append(\"../../data_pipeline/\")"
]
},
{
Expand Down Expand Up @@ -998,7 +996,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.10"
"version": "3.10.9"
}
},
"nbformat": 4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,6 @@
"import geopandas as gpd"
]
},
{
"cell_type": "code",
"execution_count": 3,
"id": "039d244f-6c97-4b1b-af04-6f879cd2cd86",
"metadata": {},
"outputs": [],
"source": [
"%load_ext lab_black"
]
},
{
"cell_type": "code",
"execution_count": 4,
Expand Down Expand Up @@ -169,7 +159,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.4"
"version": "3.10.9"
}
},
"nbformat": 4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"metadata": {},
"outputs": [],
"source": [
"# %load_ext lab_black\n",
"import json\n",
"import pandas as pd\n",
"import geopandas as gpd"
Expand Down Expand Up @@ -332,7 +331,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3.8.10 ('data-pipeline-WziHKidv-py3.8')",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
Expand All @@ -346,7 +345,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.10"
"version": "3.10.9"
},
"vscode": {
"interpreter": {
Expand Down
14 changes: 1 addition & 13 deletions data/data-pipeline/data_pipeline/ipython/explore_adjacency.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,6 @@
")"
]
},
{
"cell_type": "code",
"execution_count": 2,
"id": "f36fe7ef-2717-48be-ae94-a3f0aa33acc1",
"metadata": {
"tags": []
},
"outputs": [],
"source": [
"%load_ext lab_black"
]
},
{
"cell_type": "code",
"execution_count": 3,
Expand Down Expand Up @@ -710,7 +698,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.4"
"version": "3.10.9"
}
},
"nbformat": 4,
Expand Down
14 changes: 1 addition & 13 deletions data/data-pipeline/data_pipeline/ipython/explore_eamlis.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,6 @@
"from data_pipeline.utils import unzip_file_from_url"
]
},
{
"cell_type": "code",
"execution_count": 2,
"id": "f36fe7ef-2717-48be-ae94-a3f0aa33acc1",
"metadata": {
"tags": []
},
"outputs": [],
"source": [
"%load_ext lab_black"
]
},
{
"cell_type": "markdown",
"id": "dbecd665-1c8a-40fe-a7fc-684ecf73f991",
Expand Down Expand Up @@ -2436,7 +2424,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.6"
"version": "3.10.9"
}
},
"nbformat": 4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,6 @@
"from data_pipeline.etl.sources.us_army_fuds.etl import USArmyFUDS"
]
},
{
"cell_type": "code",
"execution_count": 3,
"id": "598dfe82-04b9-4e9c-a74b-a18c9db6688c",
"metadata": {},
"outputs": [],
"source": [
"%load_ext lab_black"
]
},
{
"cell_type": "markdown",
"id": "53b68b92-e575-4404-b79d-7dceb302f588",
Expand Down Expand Up @@ -1490,7 +1480,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.4"
"version": "3.10.9"
}
},
"nbformat": 4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"metadata": {},
"outputs": [],
"source": [
"# %load_ext lab_black\n",
"import json\n",
"import pandas as pd\n",
"import geopandas as gpd\n",
Expand Down Expand Up @@ -499,7 +498,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.13"
"version": "3.10.9"
}
},
"nbformat": 4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"\n",
"from data_pipeline.score import field_names\n",
"\n",
"%load_ext lab_black\n",
"# Turn on TQDM for pandas so that we can have progress bars when running `apply`.\n",
"tqdm_notebook.pandas()"
]
Expand Down Expand Up @@ -4203,7 +4202,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.10"
"version": "3.10.9"
}
},
"nbformat": 4,
Expand Down
Loading

0 comments on commit a27ca46

Please sign in to comment.