33import pandas as pd
44import pytest
55from libpysal .graph import Graph
6- from packaging .version import Version
76from pandas .testing import assert_frame_equal , assert_series_equal
87
98import momepy as mm
109
1110from .conftest import assert_frame_result , assert_result
1211
13- PD_210 = Version (pd .__version__ ) >= Version ("2.1.0" )
14-
1512
1613class TestDescribe :
1714 def setup_method (self ):
@@ -394,9 +391,6 @@ def test_unique(self):
394391 un_nan_drop , un_nan_drop_expected , self .df_tessellation , check_names = False
395392 )
396393
397- @pytest .mark .skipif (
398- not PD_210 , reason = "aggregation is different in previous pandas versions"
399- )
400394 def test_describe_agg (self ):
401395 df = mm .describe_agg (
402396 self .df_buildings ["area" ],
@@ -469,9 +463,6 @@ def test_describe_agg(self):
469463 assert_result (df ["sum" ], expected_fl_area_sum , result_index )
470464 assert_result (df ["mean" ], expected_fl_area_mean , result_index )
471465
472- @pytest .mark .skipif (
473- not PD_210 , reason = "aggregation is different in previous pandas versions"
474- )
475466 def test_describe_cols (self ):
476467 df = mm .describe_agg (
477468 self .df_buildings ["area" ],
@@ -480,9 +471,6 @@ def test_describe_cols(self):
480471 )
481472 assert list (df .columns ) == ["min" , "max" ]
482473
483- @pytest .mark .skipif (
484- not PD_210 , reason = "aggregation is different in previous pandas versions"
485- )
486474 def test_describe_reached_agg (self ):
487475 df_sw = mm .describe_reached_agg (
488476 self .df_buildings ["fl_area" ], self .df_buildings ["nID" ], graph = self .graph_sw
@@ -512,9 +500,6 @@ def test_describe_reached_agg(self):
512500 filtered_df ["count" ], filtered_expected , self .df_streets , check_names = False
513501 )
514502
515- @pytest .mark .skipif (
516- not PD_210 , reason = "aggregation is different in previous pandas versions"
517- )
518503 def test_describe_reached_input_equality (self ):
519504 island_result_df = mm .describe_agg (
520505 self .df_buildings ["area" ], self .df_buildings ["nID" ]
@@ -529,9 +514,6 @@ def test_describe_reached_input_equality(self):
529514 island_result_df .values , island_result_ndarray .values , equal_nan = True
530515 )
531516
532- @pytest .mark .skipif (
533- not PD_210 , reason = "aggregation is different in previous pandas versions"
534- )
535517 def test_describe_reached_cols (self ):
536518 df = mm .describe_reached_agg (
537519 self .df_buildings ["fl_area" ],
@@ -542,9 +524,6 @@ def test_describe_reached_cols(self):
542524 )
543525 assert list (df .columns ) == ["min" , "max" ]
544526
545- @pytest .mark .skipif (
546- not PD_210 , reason = "aggregation is different in previous pandas versions"
547- )
548527 def test_na_results (self ):
549528 nan_areas = self .df_buildings ["area" ]
550529 nan_areas .iloc [range (0 , len (self .df_buildings ), 3 ),] = np .nan
@@ -614,9 +593,6 @@ def test_density(self):
614593 check_names = False ,
615594 )
616595
617- @pytest .mark .skipif (
618- not PD_210 , reason = "aggregation is different in previous pandas versions"
619- )
620596 def test_unweighted_percentile (self ):
621597 perc = mm .percentile (self .df_tessellation ["area" ], self .diversity_graph )
622598 perc_expected = {
@@ -662,9 +638,6 @@ def test_unweighted_percentile(self):
662638 perc = mm .percentile (self .df_tessellation ["area" ].iloc [:100 ], graph )
663639 assert perc .loc [0 ].isna ().all ()
664640
665- @pytest .mark .skipif (
666- not PD_210 , reason = "aggregation is different in previous pandas versions"
667- )
668641 def test_distance_decay_linearly_weighted_percentiles (self ):
669642 # setup weight decay graph
670643
0 commit comments