Merge remote-tracking branch 'origin/master'

matsim-vsp · Oct 31, 2023 · 917bf8a · 917bf8a
2 parents 5a52968 + 24d4a2e
commit 917bf8a
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 1,460 deletions.
diff --git a/matsim/cli/main.py b/matsim/cli/main.py
@@ -3,8 +3,7 @@
 
 from argparse import ArgumentParser
 
-import clean_iters as ci
-
+from . import clean_iters as ci
 
 def main():
     """ Main entry point. """

diff --git a/matsim/pb/Events_pb2.py b/matsim/pb/Events_pb2.py
diff --git a/matsim/pb/Ids_pb2.py b/matsim/pb/Ids_pb2.py
diff --git a/matsim/pb/Model_pb2.py b/matsim/pb/Model_pb2.py
diff --git a/matsim/pb/Wireformat_pb2.py b/matsim/pb/Wireformat_pb2.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,6 @@
-pandas>=1.4.4
+pandas>=2.1.0
 geopandas>=0.6.0
 shapely>=1.8.0
 xopen>=1.7.0
-protobuf>=3.10.0
-protobuf<=3.19.0
-optuna>=2.7.0
+protobuf>=3.20.0
+optuna>=3.3.0