From 2c29cb33ad009367364abc2beaf8571d07e68bdf Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Sun, 20 Oct 2024 16:32:48 -0400 Subject: [PATCH] apparently one does not name a file types.py --- oldnyc/geocode/coders/extended_grid.py | 2 +- oldnyc/geocode/coders/gpt.py | 2 +- oldnyc/geocode/coders/milstein.py | 2 +- oldnyc/geocode/coders/nyc_parks.py | 2 +- oldnyc/geocode/generate_js.py | 2 +- oldnyc/geocode/geocode.py | 2 +- oldnyc/geocode/{types.py => geocode_types.py} | 0 7 files changed, 6 insertions(+), 6 deletions(-) rename oldnyc/geocode/{types.py => geocode_types.py} (100%) diff --git a/oldnyc/geocode/coders/extended_grid.py b/oldnyc/geocode/coders/extended_grid.py index 61d7f076..ab1fed2a 100755 --- a/oldnyc/geocode/coders/extended_grid.py +++ b/oldnyc/geocode/coders/extended_grid.py @@ -16,7 +16,7 @@ import sys from oldnyc.geocode import grid -from oldnyc.geocode.types import Coder, Locatable +from oldnyc.geocode.geocode_types import Coder, Locatable from oldnyc.item import Item, blank_item ORDINALS = { diff --git a/oldnyc/geocode/coders/gpt.py b/oldnyc/geocode/coders/gpt.py index 57edddc3..97cc74bc 100644 --- a/oldnyc/geocode/coders/gpt.py +++ b/oldnyc/geocode/coders/gpt.py @@ -3,7 +3,7 @@ import json import sys -from oldnyc.geocode.types import Coder, Locatable +from oldnyc.geocode.geocode_types import Coder, Locatable from oldnyc.item import Item diff --git a/oldnyc/geocode/coders/milstein.py b/oldnyc/geocode/coders/milstein.py index 83b3755b..8328f32c 100755 --- a/oldnyc/geocode/coders/milstein.py +++ b/oldnyc/geocode/coders/milstein.py @@ -8,7 +8,7 @@ import sys from oldnyc.geocode.boroughs import point_to_borough -from oldnyc.geocode.types import Coder, Locatable +from oldnyc.geocode.geocode_types import Coder, Locatable from oldnyc.item import Item boros = r"(?:New York|Manhattan|Brooklyn|Bronx|Queens|Staten Island), (?:NY|N\.Y\.)" diff --git a/oldnyc/geocode/coders/nyc_parks.py b/oldnyc/geocode/coders/nyc_parks.py index b0f1ea04..0a92e15a 100755 --- a/oldnyc/geocode/coders/nyc_parks.py +++ b/oldnyc/geocode/coders/nyc_parks.py @@ -8,7 +8,7 @@ import sys from collections import defaultdict -from oldnyc.geocode.types import Coder, Locatable +from oldnyc.geocode.geocode_types import Coder, Locatable from oldnyc.item import blank_item # TODO: move these into a data file, maybe GeoJSON diff --git a/oldnyc/geocode/generate_js.py b/oldnyc/geocode/generate_js.py index e96d0f7d..3d82c4d3 100644 --- a/oldnyc/geocode/generate_js.py +++ b/oldnyc/geocode/generate_js.py @@ -8,7 +8,7 @@ from typing import Sequence from oldnyc.geocode import record -from oldnyc.geocode.types import Locatable, Location +from oldnyc.geocode.geocode_types import Locatable, Location from oldnyc.item import Item encoder.FLOAT_REPR = lambda o: format(o, ".6f") # type: ignore diff --git a/oldnyc/geocode/geocode.py b/oldnyc/geocode/geocode.py index d7f6f32a..02f8ee71 100755 --- a/oldnyc/geocode/geocode.py +++ b/oldnyc/geocode/geocode.py @@ -16,7 +16,7 @@ from oldnyc.geocode import generate_js, geocoder from oldnyc.geocode.coders import extended_grid, gpt, milstein, nyc_parks -from oldnyc.geocode.types import Coder, Locatable, Location +from oldnyc.geocode.geocode_types import Coder, Locatable, Location from oldnyc.item import Item, load_items CODERS: dict[str, Callable[[], Coder]] = { diff --git a/oldnyc/geocode/types.py b/oldnyc/geocode/geocode_types.py similarity index 100% rename from oldnyc/geocode/types.py rename to oldnyc/geocode/geocode_types.py