Amanda: update packages from shared_utils to calitp_data_analysis

cell_coverage/A1_provider_prep.py

@@ -1,4 +1,4 @@
-from shared_utils import utils
+from calitp_data_analaysis import utils
 import geopandas as gpd
 import dask.dataframe as dd
 import dask_geopandas as dg

cell_coverage/A2_other.py

@@ -1,5 +1,5 @@
-from shared_utils import geography_utils
-from shared_utils import utils
+from calitp_data_analaysis import geography_utils
+from calitp_data_analaysis import utils
 import geopandas as gpd
 import dask.dataframe as dd
 import dask_geopandas as dg

cell_coverage/A3_analysis.py

@@ -1,20 +1,18 @@
 import A1_provider_prep
 import A2_other
 
-from shared_utils import geography_utils
+from calitp_data_analaysis import geography_utils, utils, calitp_color_palette as cp
 import geopandas as gpd
 import shapely.wkt
 
 import dask.dataframe as dd
 import pandas as pd
-from shared_utils import utils
 
 # Times
 import datetime
 from loguru import logger
 
 # Charts
-from shared_utils import calitp_color_palette as cp
 import altair as alt
 
 """

cell_coverage/analysis_buses.ipynb

@@ -33,7 +33,7 @@
     "import altair as alt\n",
     "import geopandas as gpd\n",
     "import pandas as pd\n",
-    "from shared_utils import geography_utils, utils"
+    "from calitp_data_analaysis import geography_utils, utils"
    ]
   },
   {

cell_coverage/analysis_overlay_routes_test.ipynb

@@ -33,7 +33,7 @@
     "import pandas as pd\n",
     "import shapely.wkt\n",
     "from calitp.sql import to_snakecase\n",
-    "from shared_utils import geography_utils, utils\n",
+    "from calitp_data_analaysis import geography_utils, utils\n",
     "from calitp.storage import get_fs\n",
     "fs = get_fs()"
    ]

cell_coverage/provider_prep_clip.ipynb

@@ -25,7 +25,7 @@
     "import A2_other\n",
     "import A3_analysis\n",
     "from calitp.sql import to_snakecase\n",
-    "from shared_utils import geography_utils, utils"
+    "from calitp_data_analaysis import geography_utils, utils"
    ]
   },
   {

cell_coverage/provider_prep_sjoin.ipynb

@@ -34,8 +34,7 @@
     "import dask_geopandas as dg\n",
     "import geopandas as gpd\n",
     "import pandas as pd\n",
-    "from shared_utils import geography_utils\n",
-    "from shared_utils import utils\n",
+    "from calitp_data_analaysis import geography_utils, utils\n",
     "import folium\n",
     "\n",
     "from calitp.sql import to_snakecase\n",

consolidated_app/data_cleaning.py

@@ -10,8 +10,6 @@
 
 # import shared_utils
 from calitp_data_analysis.sql import to_snakecase
-# from shared_utils import utils
-# from siuba import *
 
 GCS_FILE_PATH = "gs://calitp-analytics-data/data-analyses/consolidated_applications/"
 Caltrans_shape = "https://gis.data.ca.gov/datasets/0144574f750f4ccc88749004aca6eb0c_0.geojson?outSR=%7B%22latestWkid%22%3A3857%2C%22wkid%22%3A102100%7D"

consolidated_app/free_fare.ipynb

@@ -27,7 +27,7 @@
     "import altair as alt\n",
     "import utilities\n",
     "from calitp_data_analysis.sql import to_snakecase\n",
-    "from shared_utils import styleguide"
+    "from calitp_data_analaysis import styleguide"
    ]
   },
   {

consolidated_app/lessons_learned.ipynb

@@ -54,10 +54,9 @@
     "import altair as alt\n",
     "import branca\n",
     "import folium\n",
-    "import shared_utils\n",
     "import utilities\n",
     "from calitp import *\n",
-    "from shared_utils import altair_utils, styleguide\n",
+    "from calitp_data_analaysis import styleguide\n",
     "from siuba import *"
    ]
   },

consolidated_app/script_testing.ipynb

@@ -23,10 +23,7 @@
     "import geopandas as gpd\n",
     "import numpy as np\n",
     "import pandas as pd\n",
-    "import shared_utils\n",
-    "from calitp import *\n",
-    "from shared_utils import utils\n",
-    "from siuba import *\n",
+    "from calitp_data_analaysis import utils\n",
     "\n",
     "GCS_FILE_PATH = \"gs://calitp-analytics-data/data-analyses/consolidated_applications/\"\n",
     "Caltrans_shape = \"https://gis.data.ca.gov/datasets/0144574f750f4ccc88749004aca6eb0c_0.geojson?outSR=%7B%22latestWkid%22%3A3857%2C%22wkid%22%3A102100%7D\"\n",
@@ -1370,7 +1367,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.5"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

consolidated_app/utilities.py

@@ -1,6 +1,5 @@
 import altair as alt
-from shared_utils import calitp_color_palette as cp
-from shared_utils import styleguide
+ffrom calitp_data_analaysis import calitp_color_palette as cp,import styleguide
 
 '''
 Non-Chart Functions

grant_freq/cleaning.ipynb

@@ -30,8 +30,7 @@
     "import pandas as pd\n",
     "import shared_utils\n",
     "from calitp_data_analysis.sql import to_snakecase\n",
-    "from shared_utils import calitp_color_palette as cp\n",
-    "from shared_utils import geography_utils, styleguide\n",
+    "from calitp_data_analaysis import calitp_color_palette as cp, geography_utils, styleguide\n",
     "\n",
     "pd.options.display.max_columns = 100\n",
     "pd.options.display.max_rows = 100\n",

grant_freq/funding_amounts.ipynb

@@ -28,9 +28,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# from shared_utils import altair_utils\n",
-    "from shared_utils import calitp_color_palette as cp\n",
-    "from shared_utils import styleguide"
+    "from calitp_data_analaysis import calitp_color_palette as cp, styleguide"
    ]
   },
   {

grant_misc/A3_visuals.ipynb

@@ -29,8 +29,7 @@
     "import pandas as pd\n",
     "\n",
     "from calitp_data_analysis.sql import to_snakecase\n",
-    "from shared_utils import calitp_color_palette\n",
-    "from shared_utils import styleguide"
+    "from calitp_data_analysis import calitp_color_palette, styleguide"
    ]
   },
   {

grant_misc/B2_funding_amounts.ipynb

@@ -30,10 +30,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from shared_utils import altair_utils\n",
-    "from shared_utils import geography_utils\n",
-    "from shared_utils import calitp_color_palette as cp\n",
-    "from shared_utils import styleguide"
+    "from calitp_data_analysis import  geography_utils, calitp_color_palette as cp, styleguide"
    ]
   },
   {
@@ -2330,7 +2327,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.4"
+   "version": "3.9.13"
   },
   "widgets": {
    "application/vnd.jupyter.widget-state+json": {

lctop/A1_data_prep.py

@@ -1,7 +1,7 @@
 #General packages
 import pandas as pd
 import geopandas as gpd
-from shared_utils import geography_utils, utils
+from calitp_data_analysis import geography_utils, utils
 from calitp_data_analysis.sql import to_snakecase
 
 #For saving geojson to GCS

lctop/firstlook.ipynb

@@ -28,7 +28,7 @@
    "source": [
     "import numpy as np\n",
     "import pandas as pd\n",
-    "from shared_utils import geography_utils, utils\n",
+    "from calitp_data_analysis import geography_utils, utils\n",
     "from calitp_data_analysis.sql import to_snakecase\n",
     "import os\n",
     "\n",

project_list/_sb1_utils.py

@@ -3,7 +3,7 @@
 import pandas as pd
 import _harmonization_utils 
 from calitp_data_analysis.sql import to_snakecase
-from shared_utils import utils
+from calitp_data_analysis import utils
 
 url_pt1 = "https://odpsvcs.dot.ca.gov/arcgis/rest/services/RCA/RCA_Projects_032022/FeatureServer/"
 url_pt2 = "/query?where=1%3D1&objectIds=&time=&geometry=&geometryType=esriGeometryEnvelope&inSR=&spatialRel=esriSpatialRelIntersects&distance=&units=esriSRUnit_Foot&relationParam=&outFields=*+&returnGeometry=true&maxAllowableOffset=&geometryPrecision=&outSR=&gdbVersion=&historicMoment=&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=&resultOffset=&resultRecordCount=&returnTrueCurves=false&sqlFormat=none&f=geojson"

project_list/add_sb1.ipynb

@@ -29,7 +29,7 @@
     "import pandas as pd\n",
     "import _harmonization_utils \n",
     "from calitp_data_analysis.sql import to_snakecase\n",
-    "from shared_utils import utils"
+    "from calitp_data_analysis import utils"
    ]
   },
   {

tircp/A6_zev.py

@@ -3,8 +3,7 @@
 import A1_data_prep
 
 import altair as alt
-from shared_utils import calitp_color_palette as cp
-from shared_utils import styleguide
+from calitp_data_analysis import calitp_color_palette as cp, styleguide
 
 #import re
 #from nltk import ngrams

tircp/A_START_HERE.ipynb

@@ -30,7 +30,6 @@
     "import A1_data_prep\n",
     "import A5_crosswalks as crosswalks\n",
     "import A6_zev\n",
-    "# import numpy as np\n",
     "import pandas as pd\n",
     "from calitp_data_analysis.sql import to_snakecase\n",
     "\n",

tircp/requests/Interim_Expenditures_Solution.ipynb

@@ -29,8 +29,7 @@
     "import numpy as np\n",
     "import pandas as pd\n",
     "import TIRCP_functions\n",
-    "from siuba import *\n",
-    "from calitp import *\n",
+    "from calitp_data_analysis.sql to_snakecase\n",
     "\n",
     "GCS_FILE_PATH = \"gs://calitp-analytics-data/data-analyses/tircp/\"\n",
     "\n",
@@ -3988,7 +3987,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.4"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,