Merge branch 'main' into ndefries/pandasv2-fix-tests

nmdefries · nmdefries · commit 79ab7c8b4e4e · 2023-04-05T10:56:12.000-04:00
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.34
+current_version = 0.3.35
 commit = True
 message = chore: bump covidcast-indicators to {new_version}
 tag = False
diff --git a/_delphi_utils_python/.bumpversion.cfg b/_delphi_utils_python/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.11
+current_version = 0.3.12
 commit = True
 message = chore: bump delphi_utils to {new_version}
 tag = False
diff --git a/_delphi_utils_python/delphi_utils/__init__.py b/_delphi_utils_python/delphi_utils/__init__.py
@@ -15,4 +15,4 @@
 from .nancodes import Nans
 from .weekday import Weekday
 
-__version__ = "0.3.11"
+__version__ = "0.3.12"
diff --git a/_delphi_utils_python/setup.py b/_delphi_utils_python/setup.py
@@ -14,7 +14,7 @@
     "mock",
     "moto",
     "numpy",
-    "pandas>=1.1.0",
+    "pandas>=1.1.0,<2",
     "pydocstyle",
     "pylint==2.8.3",
     "pytest",
@@ -26,7 +26,7 @@
 
 setup(
     name="delphi_utils",
-    version="0.3.11",
+    version="0.3.12",
     description="Shared Utility Functions for Indicators",
     long_description=long_description,
     long_description_content_type="text/markdown",
diff --git a/_delphi_utils_python/tests/test_geomap.py b/_delphi_utils_python/tests/test_geomap.py
@@ -275,6 +275,10 @@ def test_add_geocode(self, geomapper):
         new_data = geomapper.add_geocode(self.zip_data, "zip", "state_code")
         new_data2 = geomapper.add_geocode(new_data, "state_code", "nation")
         assert new_data2["nation"].unique()[0] == "us"
+        new_data = geomapper.replace_geocode(self.zip_data, "zip", "state_code")
+        new_data2 = geomapper.add_geocode(new_data, "state_code", "state_id", new_col="state")
+        new_data3 = geomapper.replace_geocode(new_data2, "state_code", "nation", new_col="geo_id")
+        assert "state" not in new_data3.columns
 
         # state_code -> hhs
         new_data = geomapper.add_geocode(self.zip_data, "zip", "state_code")
diff --git a/changehc/version.cfg b/changehc/version.cfg
@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35
diff --git a/claims_hosp/version.cfg b/claims_hosp/version.cfg
@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35
diff --git a/doctor_visits/version.cfg b/doctor_visits/version.cfg
@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35
diff --git a/dsew_community_profile/version.cfg b/dsew_community_profile/version.cfg
@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35
diff --git a/google_symptoms/version.cfg b/google_symptoms/version.cfg
@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35
diff --git a/hhs_hosp/version.cfg b/hhs_hosp/version.cfg
@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35
diff --git a/nchs_mortality/version.cfg b/nchs_mortality/version.cfg
@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35
diff --git a/nowcast/version.cfg b/nowcast/version.cfg
@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35
diff --git a/quidel_covidtest/version.cfg b/quidel_covidtest/version.cfg
@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35
diff --git a/sir_complainsalot/version.cfg b/sir_complainsalot/version.cfg
@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-current_version = 0.3.34`
	`1`	`+current_version = 0.3.35`