Fix for pandas 1.5#629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpn-- merged 5 commits into from
Dec 12, 2022
Merged

Fix for pandas 1.5 #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ae54a9
handle expected warnings
jpn-- Dec 12, 2022
711dec2
unpin dependencies
jpn-- Dec 12, 2022
11d9556
unpin pandas
jpn-- Dec 12, 2022
d4ab3a3
columns cannot be a set
jpn-- Dec 12, 2022
1938b3e
numeric_only args in groupby.sum
jpn-- Dec 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions activitysim/abm/models/trip_matrices.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,9 @@ def write_trip_matrices(network_los):
# write matrices by zone system type
if network_los.zone_system == los.ONE_ZONE: # taz trips written to taz matrices
logger.info("aggregating trips one zone...")
aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum()
aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum(
numeric_only=True
)

# use the average household weight for all trips in the origin destination pair
hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -94,7 +96,9 @@ def write_trip_matrices(network_los):
trips_df["dtaz"] = (
pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
)
aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
numeric_only=True
)

# use the average household weight for all trips in the origin destination pair
hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -130,7 +134,9 @@ def write_trip_matrices(network_los):
trips_df["dtaz"] = (
pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
)
aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
numeric_only=True
)

# use the average household weight for all trips in the origin destination pair
hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand All@@ -156,7 +162,9 @@ def write_trip_matrices(network_los):
)

logger.info("aggregating trips three zone tap...")
aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum()
aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum(
numeric_only=True
)

# use the average household weight for all trips in the origin destination pair
hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand Down
9 changes: 3 additions & 6 deletions activitysim/abm/models/util/canonical_ids.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
# ActivitySim
# See full license in LICENSE.txt.
import logging
import re

import numpy as np
import pandas as pd
import re

from activitysim.core.util import reindex
from activitysim.core import config
from activitysim.core import pipeline
from activitysim.core import simulate
from activitysim.core import config, simulate

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -167,7 +164,7 @@ def determine_flavors_from_alts_file(
Parameters
----------
alts : pd.DataFrame
provided_flavors : dict
provided_flavors : dict, optional
tour flavors provided by user in the model yaml
default_flavors : dict
default tour flavors to fall back on
Expand Down
10 changes: 3 additions & 7 deletions activitysim/abm/models/util/test/test_flexible_tour_trip_ids.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
# ActivitySim
# See full license in LICENSE.txt.

import os

import pandas as pd
import pandas.testing as pdt
import pytest

from ..canonical_ids import (
determine_mandatory_tour_flavors,
determine_flavors_from_alts_file,
determine_mandatory_tour_flavors,
)


Expand All@@ -20,7 +16,7 @@ def test_mandatory_tour_flavors():
# first test using default
mandatory_tour_flavors = determine_mandatory_tour_flavors(
mtf_settings,
pd.DataFrame(columns={"random_name"}),
pd.DataFrame(columns=["random_name"]),
default_mandatory_tour_flavors,
)

Expand DownExpand Up@@ -69,7 +65,7 @@ def test_tour_flavors_from_alt_files():

# first test using default
tour_flavors = determine_flavors_from_alts_file(
pd.DataFrame(columns={"random_name"}),
pd.DataFrame(columns=["random_name"]),
provided_flavors=None,
default_flavors=default_tour_flavors,
)
Expand Down
25 changes: 25 additions & 0 deletions activitysim/core/config.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -635,6 +635,31 @@ def filter_warnings():

warnings.filterwarnings("default", category=PerformanceWarning)

# pandas 1.5
# beginning in pandas version 1.5, a new warning is emitted when a column is set via iloc
# from an array of different dtype, the update will eventually be done in-place in future
# versions. This is actually the preferred outcome for ActivitySim and no code changes are
# needed.
warnings.filterwarnings(
"ignore",
category=FutureWarning,
message=(
".*will attempt to set the values inplace instead of always setting a new array. "
"To retain the old behavior, use either.*"
),
)

# beginning in sharrow version 2.5, a CacheMissWarning is emitted when a sharrow
# flow cannot be loaded from cache and needs to be compiled. These are performance
# warnings for production runs and totally expected when running test or on new
# machines
try:
from sharrow import CacheMissWarning
except ImportError:
pass
else:
warnings.filterwarnings("default", category=CacheMissWarning)


def handle_standard_args(parser=None):

Expand Down
4 changes: 2 additions & 2 deletions conda-environments/activitysim-dev.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- numba >= 0.51.2
- numba >= 0.56.4
- numexpr
- numpy >= 1.16.1,<=1.21
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down
4 changes: 2 additions & 2 deletions conda-environments/activitysim-test-larch.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,8 @@ dependencies:
- isort
- larch >=5.5.3
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down
4 changes: 2 additions & 2 deletions conda-environments/activitysim-test.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down
4 changes: 2 additions & 2 deletions conda-environments/docbuild.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ dependencies:
- larch >=5.5.3
- matplotlib
- myst-parser
- numba >= 0.51.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down
6 changes: 3 additions & 3 deletions conda-environments/github-actions-tests.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,11 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba = 0.55.2 # see https://github.com/conda-forge/numba-feedstock/pull/104
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0,<1.5
- pandas >= 1.1.0
- psutil >= 4.1
- pyarrow >= 2.0
- pypyr >= 5.3
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix for pandas 1.5#629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jpn--
merged 5 commits into

from

Dec 12, 2022
 Merged


Fix for pandas 1.5
#629
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
9ae54a9

handle expected warnings


jpn-- Dec 12, 2022
711dec2

unpin dependencies


jpn-- Dec 12, 2022
11d9556

unpin pandas


jpn-- Dec 12, 2022
d4ab3a3

columns cannot be a set


jpn-- Dec 12, 2022
1938b3e

numeric_only args in groupby.sum


jpn-- Dec 12, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
activitysim/abm/models/trip_matrices.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,9 @@ def write_trip_matrices(network_los):
 # write matrices by zone system type
 if network_los.zone_system == los.ONE_ZONE: # taz trips written to taz matrices
 logger.info("aggregating trips one zone...")
 aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -94,7 +96,9 @@ def write_trip_matrices(network_los):
 trips_df["dtaz"] = (
 pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
 )
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -130,7 +134,9 @@ def write_trip_matrices(network_los):
 trips_df["dtaz"] = (
 pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
 )
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand All@@ -156,7 +162,9 @@ def write_trip_matrices(network_los):
 )

 logger.info("aggregating trips three zone tap...")
 aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand Down

9 changes: 3 additions & 6 deletions
activitysim/abm/models/util/canonical_ids.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
# ActivitySim
# See full license in LICENSE.txt.
import logging
import re

import numpy as np
import pandas as pd
import re

from activitysim.core.util import reindex
from activitysim.core import config
from activitysim.core import pipeline
from activitysim.core import simulate
from activitysim.core import config, simulate

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -167,7 +164,7 @@ def determine_flavors_from_alts_file(
 Parameters
 ----------
 alts : pd.DataFrame
 provided_flavors : dict
 provided_flavors : dict, optional
 tour flavors provided by user in the model yaml
 default_flavors : dict
 default tour flavors to fall back on
Expand Down

10 changes: 3 additions & 7 deletions
activitysim/abm/models/util/test/test_flexible_tour_trip_ids.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
# ActivitySim
# See full license in LICENSE.txt.

import os

import pandas as pd
import pandas.testing as pdt
import pytest

from ..canonical_ids import (
 determine_mandatory_tour_flavors,
 determine_flavors_from_alts_file,
 determine_mandatory_tour_flavors,
)


Expand All@@ -20,7 +16,7 @@ def test_mandatory_tour_flavors():
 # first test using default
 mandatory_tour_flavors = determine_mandatory_tour_flavors(
 mtf_settings,
 pd.DataFrame(columns={"random_name"}),
 pd.DataFrame(columns=["random_name"]),
 default_mandatory_tour_flavors,
 )

Expand DownExpand Up@@ -69,7 +65,7 @@ def test_tour_flavors_from_alt_files():

 # first test using default
 tour_flavors = determine_flavors_from_alts_file(
 pd.DataFrame(columns={"random_name"}),
 pd.DataFrame(columns=["random_name"]),
 provided_flavors=None,
 default_flavors=default_tour_flavors,
 )
Expand Down

25 changes: 25 additions & 0 deletions
activitysim/core/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -635,6 +635,31 @@ def filter_warnings():

 warnings.filterwarnings("default", category=PerformanceWarning)

 # pandas 1.5
 # beginning in pandas version 1.5, a new warning is emitted when a column is set via iloc
 # from an array of different dtype, the update will eventually be done in-place in future
 # versions. This is actually the preferred outcome for ActivitySim and no code changes are
 # needed.
 warnings.filterwarnings(
 "ignore",
 category=FutureWarning,
 message=(
 ".*will attempt to set the values inplace instead of always setting a new array. "
 "To retain the old behavior, use either.*"
 ),
 )

 # beginning in sharrow version 2.5, a CacheMissWarning is emitted when a sharrow
 # flow cannot be loaded from cache and needs to be compiled. These are performance
 # warnings for production runs and totally expected when running test or on new
 # machines
 try:
 from sharrow import CacheMissWarning
 except ImportError:
 pass
 else:
 warnings.filterwarnings("default", category=CacheMissWarning)


def handle_standard_args(parser=None):

Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-dev.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- numba >= 0.51.2
- numba >= 0.56.4
- numexpr
- numpy >= 1.16.1,<=1.21
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-test-larch.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,8 @@ dependencies:
- isort
- larch >=5.5.3
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/docbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ dependencies:
- larch >=5.5.3
- matplotlib
- myst-parser
- numba >= 0.51.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down

6 changes: 3 additions & 3 deletions
conda-environments/github-actions-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,11 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba = 0.55.2 # see https://github.com/conda-forge/numba-feedstock/pull/104
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0,<1.5
- pandas >= 1.1.0
- psutil >= 4.1
- pyarrow >= 2.0
- pypyr >= 5.3
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix for pandas 1.5#629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jpn--
merged 5 commits into

from

Dec 12, 2022
 Merged


Fix for pandas 1.5
#629
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
9ae54a9

handle expected warnings


jpn-- Dec 12, 2022
711dec2

unpin dependencies


jpn-- Dec 12, 2022
11d9556

unpin pandas


jpn-- Dec 12, 2022
d4ab3a3

columns cannot be a set


jpn-- Dec 12, 2022
1938b3e

numeric_only args in groupby.sum


jpn-- Dec 12, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
activitysim/abm/models/trip_matrices.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,9 @@ def write_trip_matrices(network_los):
 # write matrices by zone system type
 if network_los.zone_system == los.ONE_ZONE: # taz trips written to taz matrices
 logger.info("aggregating trips one zone...")
 aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -94,7 +96,9 @@ def write_trip_matrices(network_los):
 trips_df["dtaz"] = (
 pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
 )
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -130,7 +134,9 @@ def write_trip_matrices(network_los):
 trips_df["dtaz"] = (
 pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
 )
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand All@@ -156,7 +162,9 @@ def write_trip_matrices(network_los):
 )

 logger.info("aggregating trips three zone tap...")
 aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand Down

9 changes: 3 additions & 6 deletions
activitysim/abm/models/util/canonical_ids.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
# ActivitySim
# See full license in LICENSE.txt.
import logging
import re

import numpy as np
import pandas as pd
import re

from activitysim.core.util import reindex
from activitysim.core import config
from activitysim.core import pipeline
from activitysim.core import simulate
from activitysim.core import config, simulate

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -167,7 +164,7 @@ def determine_flavors_from_alts_file(
 Parameters
 ----------
 alts : pd.DataFrame
 provided_flavors : dict
 provided_flavors : dict, optional
 tour flavors provided by user in the model yaml
 default_flavors : dict
 default tour flavors to fall back on
Expand Down

10 changes: 3 additions & 7 deletions
activitysim/abm/models/util/test/test_flexible_tour_trip_ids.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
# ActivitySim
# See full license in LICENSE.txt.

import os

import pandas as pd
import pandas.testing as pdt
import pytest

from ..canonical_ids import (
 determine_mandatory_tour_flavors,
 determine_flavors_from_alts_file,
 determine_mandatory_tour_flavors,
)


Expand All@@ -20,7 +16,7 @@ def test_mandatory_tour_flavors():
 # first test using default
 mandatory_tour_flavors = determine_mandatory_tour_flavors(
 mtf_settings,
 pd.DataFrame(columns={"random_name"}),
 pd.DataFrame(columns=["random_name"]),
 default_mandatory_tour_flavors,
 )

Expand DownExpand Up@@ -69,7 +65,7 @@ def test_tour_flavors_from_alt_files():

 # first test using default
 tour_flavors = determine_flavors_from_alts_file(
 pd.DataFrame(columns={"random_name"}),
 pd.DataFrame(columns=["random_name"]),
 provided_flavors=None,
 default_flavors=default_tour_flavors,
 )
Expand Down

25 changes: 25 additions & 0 deletions
activitysim/core/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -635,6 +635,31 @@ def filter_warnings():

 warnings.filterwarnings("default", category=PerformanceWarning)

 # pandas 1.5
 # beginning in pandas version 1.5, a new warning is emitted when a column is set via iloc
 # from an array of different dtype, the update will eventually be done in-place in future
 # versions. This is actually the preferred outcome for ActivitySim and no code changes are
 # needed.
 warnings.filterwarnings(
 "ignore",
 category=FutureWarning,
 message=(
 ".*will attempt to set the values inplace instead of always setting a new array. "
 "To retain the old behavior, use either.*"
 ),
 )

 # beginning in sharrow version 2.5, a CacheMissWarning is emitted when a sharrow
 # flow cannot be loaded from cache and needs to be compiled. These are performance
 # warnings for production runs and totally expected when running test or on new
 # machines
 try:
 from sharrow import CacheMissWarning
 except ImportError:
 pass
 else:
 warnings.filterwarnings("default", category=CacheMissWarning)


def handle_standard_args(parser=None):

Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-dev.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- numba >= 0.51.2
- numba >= 0.56.4
- numexpr
- numpy >= 1.16.1,<=1.21
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-test-larch.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,8 @@ dependencies:
- isort
- larch >=5.5.3
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/docbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ dependencies:
- larch >=5.5.3
- matplotlib
- myst-parser
- numba >= 0.51.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down

6 changes: 3 additions & 3 deletions
conda-environments/github-actions-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,11 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba = 0.55.2 # see https://github.com/conda-forge/numba-feedstock/pull/104
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0,<1.5
- pandas >= 1.1.0
- psutil >= 4.1
- pyarrow >= 2.0
- pypyr >= 5.3
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix for pandas 1.5#629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jpn--
merged 5 commits into

from

Dec 12, 2022
 Merged


Fix for pandas 1.5
#629
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
9ae54a9

handle expected warnings


jpn-- Dec 12, 2022
711dec2

unpin dependencies


jpn-- Dec 12, 2022
11d9556

unpin pandas


jpn-- Dec 12, 2022
d4ab3a3

columns cannot be a set


jpn-- Dec 12, 2022
1938b3e

numeric_only args in groupby.sum


jpn-- Dec 12, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
activitysim/abm/models/trip_matrices.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,9 @@ def write_trip_matrices(network_los):
 # write matrices by zone system type
 if network_los.zone_system == los.ONE_ZONE: # taz trips written to taz matrices
 logger.info("aggregating trips one zone...")
 aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -94,7 +96,9 @@ def write_trip_matrices(network_los):
 trips_df["dtaz"] = (
 pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
 )
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -130,7 +134,9 @@ def write_trip_matrices(network_los):
 trips_df["dtaz"] = (
 pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
 )
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand All@@ -156,7 +162,9 @@ def write_trip_matrices(network_los):
 )

 logger.info("aggregating trips three zone tap...")
 aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand Down

9 changes: 3 additions & 6 deletions
activitysim/abm/models/util/canonical_ids.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
# ActivitySim
# See full license in LICENSE.txt.
import logging
import re

import numpy as np
import pandas as pd
import re

from activitysim.core.util import reindex
from activitysim.core import config
from activitysim.core import pipeline
from activitysim.core import simulate
from activitysim.core import config, simulate

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -167,7 +164,7 @@ def determine_flavors_from_alts_file(
 Parameters
 ----------
 alts : pd.DataFrame
 provided_flavors : dict
 provided_flavors : dict, optional
 tour flavors provided by user in the model yaml
 default_flavors : dict
 default tour flavors to fall back on
Expand Down

10 changes: 3 additions & 7 deletions
activitysim/abm/models/util/test/test_flexible_tour_trip_ids.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
# ActivitySim
# See full license in LICENSE.txt.

import os

import pandas as pd
import pandas.testing as pdt
import pytest

from ..canonical_ids import (
 determine_mandatory_tour_flavors,
 determine_flavors_from_alts_file,
 determine_mandatory_tour_flavors,
)


Expand All@@ -20,7 +16,7 @@ def test_mandatory_tour_flavors():
 # first test using default
 mandatory_tour_flavors = determine_mandatory_tour_flavors(
 mtf_settings,
 pd.DataFrame(columns={"random_name"}),
 pd.DataFrame(columns=["random_name"]),
 default_mandatory_tour_flavors,
 )

Expand DownExpand Up@@ -69,7 +65,7 @@ def test_tour_flavors_from_alt_files():

 # first test using default
 tour_flavors = determine_flavors_from_alts_file(
 pd.DataFrame(columns={"random_name"}),
 pd.DataFrame(columns=["random_name"]),
 provided_flavors=None,
 default_flavors=default_tour_flavors,
 )
Expand Down

25 changes: 25 additions & 0 deletions
activitysim/core/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -635,6 +635,31 @@ def filter_warnings():

 warnings.filterwarnings("default", category=PerformanceWarning)

 # pandas 1.5
 # beginning in pandas version 1.5, a new warning is emitted when a column is set via iloc
 # from an array of different dtype, the update will eventually be done in-place in future
 # versions. This is actually the preferred outcome for ActivitySim and no code changes are
 # needed.
 warnings.filterwarnings(
 "ignore",
 category=FutureWarning,
 message=(
 ".*will attempt to set the values inplace instead of always setting a new array. "
 "To retain the old behavior, use either.*"
 ),
 )

 # beginning in sharrow version 2.5, a CacheMissWarning is emitted when a sharrow
 # flow cannot be loaded from cache and needs to be compiled. These are performance
 # warnings for production runs and totally expected when running test or on new
 # machines
 try:
 from sharrow import CacheMissWarning
 except ImportError:
 pass
 else:
 warnings.filterwarnings("default", category=CacheMissWarning)


def handle_standard_args(parser=None):

Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-dev.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- numba >= 0.51.2
- numba >= 0.56.4
- numexpr
- numpy >= 1.16.1,<=1.21
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-test-larch.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,8 @@ dependencies:
- isort
- larch >=5.5.3
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/docbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ dependencies:
- larch >=5.5.3
- matplotlib
- myst-parser
- numba >= 0.51.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down

6 changes: 3 additions & 3 deletions
conda-environments/github-actions-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,11 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba = 0.55.2 # see https://github.com/conda-forge/numba-feedstock/pull/104
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0,<1.5
- pandas >= 1.1.0
- psutil >= 4.1
- pyarrow >= 2.0
- pypyr >= 5.3
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix for pandas 1.5#629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jpn--
merged 5 commits into

from

Dec 12, 2022
 Merged


Fix for pandas 1.5
#629
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
9ae54a9

handle expected warnings


jpn-- Dec 12, 2022
711dec2

unpin dependencies


jpn-- Dec 12, 2022
11d9556

unpin pandas


jpn-- Dec 12, 2022
d4ab3a3

columns cannot be a set


jpn-- Dec 12, 2022
1938b3e

numeric_only args in groupby.sum


jpn-- Dec 12, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
activitysim/abm/models/trip_matrices.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,9 @@ def write_trip_matrices(network_los):
 # write matrices by zone system type
 if network_los.zone_system == los.ONE_ZONE: # taz trips written to taz matrices
 logger.info("aggregating trips one zone...")
 aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -94,7 +96,9 @@ def write_trip_matrices(network_los):
 trips_df["dtaz"] = (
 pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
 )
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -130,7 +134,9 @@ def write_trip_matrices(network_los):
 trips_df["dtaz"] = (
 pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
 )
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand All@@ -156,7 +162,9 @@ def write_trip_matrices(network_los):
 )

 logger.info("aggregating trips three zone tap...")
 aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand Down

9 changes: 3 additions & 6 deletions
activitysim/abm/models/util/canonical_ids.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
# ActivitySim
# See full license in LICENSE.txt.
import logging
import re

import numpy as np
import pandas as pd
import re

from activitysim.core.util import reindex
from activitysim.core import config
from activitysim.core import pipeline
from activitysim.core import simulate
from activitysim.core import config, simulate

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -167,7 +164,7 @@ def determine_flavors_from_alts_file(
 Parameters
 ----------
 alts : pd.DataFrame
 provided_flavors : dict
 provided_flavors : dict, optional
 tour flavors provided by user in the model yaml
 default_flavors : dict
 default tour flavors to fall back on
Expand Down

10 changes: 3 additions & 7 deletions
activitysim/abm/models/util/test/test_flexible_tour_trip_ids.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
# ActivitySim
# See full license in LICENSE.txt.

import os

import pandas as pd
import pandas.testing as pdt
import pytest

from ..canonical_ids import (
 determine_mandatory_tour_flavors,
 determine_flavors_from_alts_file,
 determine_mandatory_tour_flavors,
)


Expand All@@ -20,7 +16,7 @@ def test_mandatory_tour_flavors():
 # first test using default
 mandatory_tour_flavors = determine_mandatory_tour_flavors(
 mtf_settings,
 pd.DataFrame(columns={"random_name"}),
 pd.DataFrame(columns=["random_name"]),
 default_mandatory_tour_flavors,
 )

Expand DownExpand Up@@ -69,7 +65,7 @@ def test_tour_flavors_from_alt_files():

 # first test using default
 tour_flavors = determine_flavors_from_alts_file(
 pd.DataFrame(columns={"random_name"}),
 pd.DataFrame(columns=["random_name"]),
 provided_flavors=None,
 default_flavors=default_tour_flavors,
 )
Expand Down

25 changes: 25 additions & 0 deletions
activitysim/core/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -635,6 +635,31 @@ def filter_warnings():

 warnings.filterwarnings("default", category=PerformanceWarning)

 # pandas 1.5
 # beginning in pandas version 1.5, a new warning is emitted when a column is set via iloc
 # from an array of different dtype, the update will eventually be done in-place in future
 # versions. This is actually the preferred outcome for ActivitySim and no code changes are
 # needed.
 warnings.filterwarnings(
 "ignore",
 category=FutureWarning,
 message=(
 ".*will attempt to set the values inplace instead of always setting a new array. "
 "To retain the old behavior, use either.*"
 ),
 )

 # beginning in sharrow version 2.5, a CacheMissWarning is emitted when a sharrow
 # flow cannot be loaded from cache and needs to be compiled. These are performance
 # warnings for production runs and totally expected when running test or on new
 # machines
 try:
 from sharrow import CacheMissWarning
 except ImportError:
 pass
 else:
 warnings.filterwarnings("default", category=CacheMissWarning)


def handle_standard_args(parser=None):

Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-dev.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- numba >= 0.51.2
- numba >= 0.56.4
- numexpr
- numpy >= 1.16.1,<=1.21
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-test-larch.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,8 @@ dependencies:
- isort
- larch >=5.5.3
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/docbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ dependencies:
- larch >=5.5.3
- matplotlib
- myst-parser
- numba >= 0.51.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down

6 changes: 3 additions & 3 deletions
conda-environments/github-actions-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,11 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba = 0.55.2 # see https://github.com/conda-forge/numba-feedstock/pull/104
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0,<1.5
- pandas >= 1.1.0
- psutil >= 4.1
- pyarrow >= 2.0
- pypyr >= 5.3
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix for pandas 1.5#629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jpn--
merged 5 commits into

from

Dec 12, 2022
 Merged


Fix for pandas 1.5
#629
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
9ae54a9

handle expected warnings


jpn-- Dec 12, 2022
711dec2

unpin dependencies


jpn-- Dec 12, 2022
11d9556

unpin pandas


jpn-- Dec 12, 2022
d4ab3a3

columns cannot be a set


jpn-- Dec 12, 2022
1938b3e

numeric_only args in groupby.sum


jpn-- Dec 12, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
activitysim/abm/models/trip_matrices.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,9 @@ def write_trip_matrices(network_los):
 # write matrices by zone system type
 if network_los.zone_system == los.ONE_ZONE: # taz trips written to taz matrices
 logger.info("aggregating trips one zone...")
 aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -94,7 +96,9 @@ def write_trip_matrices(network_los):
 trips_df["dtaz"] = (
 pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
 )
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -130,7 +134,9 @@ def write_trip_matrices(network_los):
 trips_df["dtaz"] = (
 pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
 )
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand All@@ -156,7 +162,9 @@ def write_trip_matrices(network_los):
 )

 logger.info("aggregating trips three zone tap...")
 aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand Down

9 changes: 3 additions & 6 deletions
activitysim/abm/models/util/canonical_ids.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
# ActivitySim
# See full license in LICENSE.txt.
import logging
import re

import numpy as np
import pandas as pd
import re

from activitysim.core.util import reindex
from activitysim.core import config
from activitysim.core import pipeline
from activitysim.core import simulate
from activitysim.core import config, simulate

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -167,7 +164,7 @@ def determine_flavors_from_alts_file(
 Parameters
 ----------
 alts : pd.DataFrame
 provided_flavors : dict
 provided_flavors : dict, optional
 tour flavors provided by user in the model yaml
 default_flavors : dict
 default tour flavors to fall back on
Expand Down

10 changes: 3 additions & 7 deletions
activitysim/abm/models/util/test/test_flexible_tour_trip_ids.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
# ActivitySim
# See full license in LICENSE.txt.

import os

import pandas as pd
import pandas.testing as pdt
import pytest

from ..canonical_ids import (
 determine_mandatory_tour_flavors,
 determine_flavors_from_alts_file,
 determine_mandatory_tour_flavors,
)


Expand All@@ -20,7 +16,7 @@ def test_mandatory_tour_flavors():
 # first test using default
 mandatory_tour_flavors = determine_mandatory_tour_flavors(
 mtf_settings,
 pd.DataFrame(columns={"random_name"}),
 pd.DataFrame(columns=["random_name"]),
 default_mandatory_tour_flavors,
 )

Expand DownExpand Up@@ -69,7 +65,7 @@ def test_tour_flavors_from_alt_files():

 # first test using default
 tour_flavors = determine_flavors_from_alts_file(
 pd.DataFrame(columns={"random_name"}),
 pd.DataFrame(columns=["random_name"]),
 provided_flavors=None,
 default_flavors=default_tour_flavors,
 )
Expand Down

25 changes: 25 additions & 0 deletions
activitysim/core/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -635,6 +635,31 @@ def filter_warnings():

 warnings.filterwarnings("default", category=PerformanceWarning)

 # pandas 1.5
 # beginning in pandas version 1.5, a new warning is emitted when a column is set via iloc
 # from an array of different dtype, the update will eventually be done in-place in future
 # versions. This is actually the preferred outcome for ActivitySim and no code changes are
 # needed.
 warnings.filterwarnings(
 "ignore",
 category=FutureWarning,
 message=(
 ".*will attempt to set the values inplace instead of always setting a new array. "
 "To retain the old behavior, use either.*"
 ),
 )

 # beginning in sharrow version 2.5, a CacheMissWarning is emitted when a sharrow
 # flow cannot be loaded from cache and needs to be compiled. These are performance
 # warnings for production runs and totally expected when running test or on new
 # machines
 try:
 from sharrow import CacheMissWarning
 except ImportError:
 pass
 else:
 warnings.filterwarnings("default", category=CacheMissWarning)


def handle_standard_args(parser=None):

Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-dev.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- numba >= 0.51.2
- numba >= 0.56.4
- numexpr
- numpy >= 1.16.1,<=1.21
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-test-larch.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,8 @@ dependencies:
- isort
- larch >=5.5.3
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/docbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ dependencies:
- larch >=5.5.3
- matplotlib
- myst-parser
- numba >= 0.51.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down

6 changes: 3 additions & 3 deletions
conda-environments/github-actions-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,11 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba = 0.55.2 # see https://github.com/conda-forge/numba-feedstock/pull/104
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0,<1.5
- pandas >= 1.1.0
- psutil >= 4.1
- pyarrow >= 2.0
- pypyr >= 5.3
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix for pandas 1.5#629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jpn--
merged 5 commits into

from

Dec 12, 2022
 Merged


Fix for pandas 1.5
#629
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
9ae54a9

handle expected warnings


jpn-- Dec 12, 2022
711dec2

unpin dependencies


jpn-- Dec 12, 2022
11d9556

unpin pandas


jpn-- Dec 12, 2022
d4ab3a3

columns cannot be a set


jpn-- Dec 12, 2022
1938b3e

numeric_only args in groupby.sum


jpn-- Dec 12, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
activitysim/abm/models/trip_matrices.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,9 @@ def write_trip_matrices(network_los):
 # write matrices by zone system type
 if network_los.zone_system == los.ONE_ZONE: # taz trips written to taz matrices
 logger.info("aggregating trips one zone...")
 aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -94,7 +96,9 @@ def write_trip_matrices(network_los):
 trips_df["dtaz"] = (
 pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
 )
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -130,7 +134,9 @@ def write_trip_matrices(network_los):
 trips_df["dtaz"] = (
 pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
 )
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand All@@ -156,7 +162,9 @@ def write_trip_matrices(network_los):
 )

 logger.info("aggregating trips three zone tap...")
 aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand Down

9 changes: 3 additions & 6 deletions
activitysim/abm/models/util/canonical_ids.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
# ActivitySim
# See full license in LICENSE.txt.
import logging
import re

import numpy as np
import pandas as pd
import re

from activitysim.core.util import reindex
from activitysim.core import config
from activitysim.core import pipeline
from activitysim.core import simulate
from activitysim.core import config, simulate

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -167,7 +164,7 @@ def determine_flavors_from_alts_file(
 Parameters
 ----------
 alts : pd.DataFrame
 provided_flavors : dict
 provided_flavors : dict, optional
 tour flavors provided by user in the model yaml
 default_flavors : dict
 default tour flavors to fall back on
Expand Down

10 changes: 3 additions & 7 deletions
activitysim/abm/models/util/test/test_flexible_tour_trip_ids.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
# ActivitySim
# See full license in LICENSE.txt.

import os

import pandas as pd
import pandas.testing as pdt
import pytest

from ..canonical_ids import (
 determine_mandatory_tour_flavors,
 determine_flavors_from_alts_file,
 determine_mandatory_tour_flavors,
)


Expand All@@ -20,7 +16,7 @@ def test_mandatory_tour_flavors():
 # first test using default
 mandatory_tour_flavors = determine_mandatory_tour_flavors(
 mtf_settings,
 pd.DataFrame(columns={"random_name"}),
 pd.DataFrame(columns=["random_name"]),
 default_mandatory_tour_flavors,
 )

Expand DownExpand Up@@ -69,7 +65,7 @@ def test_tour_flavors_from_alt_files():

 # first test using default
 tour_flavors = determine_flavors_from_alts_file(
 pd.DataFrame(columns={"random_name"}),
 pd.DataFrame(columns=["random_name"]),
 provided_flavors=None,
 default_flavors=default_tour_flavors,
 )
Expand Down

25 changes: 25 additions & 0 deletions
activitysim/core/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -635,6 +635,31 @@ def filter_warnings():

 warnings.filterwarnings("default", category=PerformanceWarning)

 # pandas 1.5
 # beginning in pandas version 1.5, a new warning is emitted when a column is set via iloc
 # from an array of different dtype, the update will eventually be done in-place in future
 # versions. This is actually the preferred outcome for ActivitySim and no code changes are
 # needed.
 warnings.filterwarnings(
 "ignore",
 category=FutureWarning,
 message=(
 ".*will attempt to set the values inplace instead of always setting a new array. "
 "To retain the old behavior, use either.*"
 ),
 )

 # beginning in sharrow version 2.5, a CacheMissWarning is emitted when a sharrow
 # flow cannot be loaded from cache and needs to be compiled. These are performance
 # warnings for production runs and totally expected when running test or on new
 # machines
 try:
 from sharrow import CacheMissWarning
 except ImportError:
 pass
 else:
 warnings.filterwarnings("default", category=CacheMissWarning)


def handle_standard_args(parser=None):

Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-dev.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- numba >= 0.51.2
- numba >= 0.56.4
- numexpr
- numpy >= 1.16.1,<=1.21
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-test-larch.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,8 @@ dependencies:
- isort
- larch >=5.5.3
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/docbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ dependencies:
- larch >=5.5.3
- matplotlib
- myst-parser
- numba >= 0.51.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down

6 changes: 3 additions & 3 deletions
conda-environments/github-actions-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,11 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba = 0.55.2 # see https://github.com/conda-forge/numba-feedstock/pull/104
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0,<1.5
- pandas >= 1.1.0
- psutil >= 4.1
- pyarrow >= 2.0
- pypyr >= 5.3
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix for pandas 1.5#629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jpn--
merged 5 commits into

from

Dec 12, 2022
 Merged


Fix for pandas 1.5
#629
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
9ae54a9

handle expected warnings


jpn-- Dec 12, 2022
711dec2

unpin dependencies


jpn-- Dec 12, 2022
11d9556

unpin pandas


jpn-- Dec 12, 2022
d4ab3a3

columns cannot be a set


jpn-- Dec 12, 2022
1938b3e

numeric_only args in groupby.sum


jpn-- Dec 12, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
activitysim/abm/models/trip_matrices.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,9 @@ def write_trip_matrices(network_los):
 # write matrices by zone system type
 if network_los.zone_system == los.ONE_ZONE: # taz trips written to taz matrices
 logger.info("aggregating trips one zone...")
 aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["origin", "destination"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -94,7 +96,9 @@ def write_trip_matrices(network_los):
 trips_df["dtaz"] = (
 pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
 )
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand DownExpand Up@@ -130,7 +134,9 @@ def write_trip_matrices(network_los):
 trips_df["dtaz"] = (
 pipeline.get_table("land_use").reindex(trips_df["destination"]).TAZ.tolist()
 )
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["otaz", "dtaz"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand All@@ -156,7 +162,9 @@ def write_trip_matrices(network_los):
 )

 logger.info("aggregating trips three zone tap...")
 aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum()
 aggregate_trips = trips_df.groupby(["btap", "atap"], sort=False).sum(
 numeric_only=True
 )

 # use the average household weight for all trips in the origin destination pair
 hh_weight_col = model_settings.get("HH_EXPANSION_WEIGHT_COL")
Expand Down

9 changes: 3 additions & 6 deletions
activitysim/abm/models/util/canonical_ids.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
# ActivitySim
# See full license in LICENSE.txt.
import logging
import re

import numpy as np
import pandas as pd
import re

from activitysim.core.util import reindex
from activitysim.core import config
from activitysim.core import pipeline
from activitysim.core import simulate
from activitysim.core import config, simulate

logger = logging.getLogger(__name__)

Expand DownExpand Up@@ -167,7 +164,7 @@ def determine_flavors_from_alts_file(
 Parameters
 ----------
 alts : pd.DataFrame
 provided_flavors : dict
 provided_flavors : dict, optional
 tour flavors provided by user in the model yaml
 default_flavors : dict
 default tour flavors to fall back on
Expand Down

10 changes: 3 additions & 7 deletions
activitysim/abm/models/util/test/test_flexible_tour_trip_ids.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
# ActivitySim
# See full license in LICENSE.txt.

import os

import pandas as pd
import pandas.testing as pdt
import pytest

from ..canonical_ids import (
 determine_mandatory_tour_flavors,
 determine_flavors_from_alts_file,
 determine_mandatory_tour_flavors,
)


Expand All@@ -20,7 +16,7 @@ def test_mandatory_tour_flavors():
 # first test using default
 mandatory_tour_flavors = determine_mandatory_tour_flavors(
 mtf_settings,
 pd.DataFrame(columns={"random_name"}),
 pd.DataFrame(columns=["random_name"]),
 default_mandatory_tour_flavors,
 )

Expand DownExpand Up@@ -69,7 +65,7 @@ def test_tour_flavors_from_alt_files():

 # first test using default
 tour_flavors = determine_flavors_from_alts_file(
 pd.DataFrame(columns={"random_name"}),
 pd.DataFrame(columns=["random_name"]),
 provided_flavors=None,
 default_flavors=default_tour_flavors,
 )
Expand Down

25 changes: 25 additions & 0 deletions
activitysim/core/config.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -635,6 +635,31 @@ def filter_warnings():

 warnings.filterwarnings("default", category=PerformanceWarning)

 # pandas 1.5
 # beginning in pandas version 1.5, a new warning is emitted when a column is set via iloc
 # from an array of different dtype, the update will eventually be done in-place in future
 # versions. This is actually the preferred outcome for ActivitySim and no code changes are
 # needed.
 warnings.filterwarnings(
 "ignore",
 category=FutureWarning,
 message=(
 ".*will attempt to set the values inplace instead of always setting a new array. "
 "To retain the old behavior, use either.*"
 ),
 )

 # beginning in sharrow version 2.5, a CacheMissWarning is emitted when a sharrow
 # flow cannot be loaded from cache and needs to be compiled. These are performance
 # warnings for production runs and totally expected when running test or on new
 # machines
 try:
 from sharrow import CacheMissWarning
 except ImportError:
 pass
 else:
 warnings.filterwarnings("default", category=CacheMissWarning)


def handle_standard_args(parser=None):

Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-dev.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,9 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- numba >= 0.51.2
- numba >= 0.56.4
- numexpr
- numpy >= 1.16.1,<=1.21
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-test-larch.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,8 @@ dependencies:
- isort
- larch >=5.5.3
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,8 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba >= 0.55.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0
Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/docbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ dependencies:
- larch >=5.5.3
- matplotlib
- myst-parser
- numba >= 0.51.2
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- numpydoc
- openmatrix >= 0.3.4.1
- orca >= 1.6
Expand Down

6 changes: 3 additions & 3 deletions
conda-environments/github-actions-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,11 @@ dependencies:
- cytoolz >= 0.8.1
- isort
- nbmake
- numba = 0.55.2 # see https://github.com/conda-forge/numba-feedstock/pull/104
- numpy >= 1.16.1,<=1.21
- numba >= 0.56.4
- numpy >= 1.16.1
- openmatrix >= 0.3.4.1
- orca >= 1.6
- pandas >= 1.1.0,<1.5
- pandas >= 1.1.0
- psutil >= 4.1
- pyarrow >= 2.0
- pypyr >= 5.3
Expand Down