From fde5bed101c46481587d0909744a1e2958abb43d Mon Sep 17 00:00:00 2001 From: Chad Baker Date: Thu, 25 May 2023 13:17:13 -0600 Subject: [PATCH 1/4] pyi file should now ship with `pip install fastsim` after new release is created. only need 1 pyproject.toml file now --- README.md | 6 ++-- build_and_test.sh | 7 ++-- pyproject.toml | 26 ++++++++------ {fastsim => python/fastsim}/.gitignore | 0 {fastsim => python/fastsim}/__init__.py | 0 {fastsim => python/fastsim}/auxiliaries.py | 0 {fastsim => python/fastsim}/calibration.py | 0 {fastsim => python/fastsim}/cycle.py | 0 {fastsim => python/fastsim}/docs/.gitignore | 0 .../docs/2017_Ford_F150_thermal_val.py | 0 {fastsim => python/fastsim}/docs/__init__.py | 0 .../fastsim}/docs/accel_demo.py | 0 {fastsim => python/fastsim}/docs/cav_demo.py | 0 {fastsim => python/fastsim}/docs/cav_sweep.py | 0 {fastsim => python/fastsim}/docs/demo.py | 0 .../fastsim}/docs/demo_abc_drag_coef_conv.py | 0 .../fastsim}/docs/demo_eu_vehicle_wltp.py | 0 .../docs/fastsim-icon-web-131x172.jpg | Bin .../fastsim}/docs/fusion_thermal_cal.py | 0 .../fastsim}/docs/fusion_thermal_cal_post.py | 0 .../fastsim}/docs/fusion_thermal_demo.py | 0 .../fastsim}/docs/mp_parallel_demo.py | 0 .../fastsim}/docs/stop_start_demo.py | 0 .../fastsim}/docs/time_dilation_demo.py | 0 .../fastsim}/docs/wltc_calibration.py | 0 .../fastsim}/fastsimrust.pyi | 0 {fastsim => python/fastsim}/inspect_utils.py | 0 {fastsim => python/fastsim}/parameters.py | 0 {fastsim => python/fastsim}/resample.py | 0 .../fastsim}/resources/FASTSim_py_veh_db.csv | 0 .../resources/cycles/HHDDTCruiseSmooth.csv | 0 .../fastsim}/resources/cycles/NREL13.csv | 0 .../fastsim}/resources/cycles/README.md | 0 .../cycles/TSDC_tripno_42648_cycle.csv | 0 .../fastsim}/resources/cycles/accel.csv | 0 .../cmap_subset/4033363_1/2007-08-25.csv | 0 .../cycles/cmap_subset/4033363_1/trips.csv | 0 .../cmap_subset/4033363_3/2007-08-20.csv | 0 .../cmap_subset/4033363_3/2007-08-21.csv | 0 .../cmap_subset/4033363_3/2007-08-22.csv | 0 .../cmap_subset/4033363_3/2007-08-23.csv | 0 .../cycles/cmap_subset/4033363_3/trips.csv | 0 .../cmap_subset/4105836_2/2007-05-31.csv | 0 .../cycles/cmap_subset/4105836_2/trips.csv | 0 .../cmap_subset/4107032_1/2007-05-21.csv | 0 .../cmap_subset/4107032_1/2007-05-22.csv | 0 .../cmap_subset/4107032_1/2007-05-23.csv | 0 .../cmap_subset/4107032_1/2007-05-24.csv | 0 .../cmap_subset/4107032_1/2007-05-25.csv | 0 .../cmap_subset/4107032_1/2007-05-26.csv | 0 .../cmap_subset/4107032_1/2007-05-27.csv | 0 .../cycles/cmap_subset/4107032_1/trips.csv | 0 .../cmap_subset/4108468_1/2007-06-22.csv | 0 .../cmap_subset/4108468_1/2007-06-23.csv | 0 .../cmap_subset/4108468_1/2007-06-24.csv | 0 .../cmap_subset/4108468_1/2007-06-25.csv | 0 .../cmap_subset/4108468_1/2007-06-26.csv | 0 .../cycles/cmap_subset/4108468_1/trips.csv | 0 .../cmap_subset/4108468_2/2007-06-21.csv | 0 .../cmap_subset/4108468_2/2007-06-22.csv | 0 .../cmap_subset/4108468_2/2007-06-27.csv | 0 .../cycles/cmap_subset/4108468_2/trips.csv | 0 .../cmap_subset/4109114_1/2007-05-17.csv | 0 .../cmap_subset/4109114_1/2007-05-18.csv | 0 .../cmap_subset/4109114_1/2007-05-19.csv | 0 .../cmap_subset/4109114_1/2007-05-21.csv | 0 .../cmap_subset/4109114_1/2007-05-22.csv | 0 .../cmap_subset/4109114_1/2007-05-23.csv | 0 .../cycles/cmap_subset/4109114_1/trips.csv | 0 .../cmap_subset/4111928_1/2007-05-19.csv | 0 .../cmap_subset/4111928_1/2007-05-21.csv | 0 .../cmap_subset/4111928_1/2007-05-22.csv | 0 .../cmap_subset/4111928_1/2007-05-23.csv | 0 .../cmap_subset/4111928_1/2007-05-24.csv | 0 .../cycles/cmap_subset/4111928_1/trips.csv | 0 .../cmap_subset/4112082_1/2007-07-03.csv | 0 .../cmap_subset/4112082_1/2007-07-05.csv | 0 .../cycles/cmap_subset/4112082_1/trips.csv | 0 .../cmap_subset/4113492_1/2007-05-17.csv | 0 .../cycles/cmap_subset/4113492_1/trips.csv | 0 .../cmap_subset/4114555_1/2007-05-31.csv | 0 .../cycles/cmap_subset/4114555_1/trips.csv | 0 .../cmap_subset/4115766_1/2007-03-28.csv | 0 .../cycles/cmap_subset/4115766_1/trips.csv | 0 .../cmap_subset/4115766_2/2007-03-28.csv | 0 .../cycles/cmap_subset/4115766_2/trips.csv | 0 .../cmap_subset/4115957_1/2007-04-09.csv | 0 .../cycles/cmap_subset/4115957_1/trips.csv | 0 .../cmap_subset/4115985_1/2007-04-23.csv | 0 .../cycles/cmap_subset/4115985_1/trips.csv | 0 .../cmap_subset/4116361_1/2007-03-13.csv | 0 .../cycles/cmap_subset/4116361_1/trips.csv | 0 .../cmap_subset/4116721_2/2007-04-09.csv | 0 .../cycles/cmap_subset/4116721_2/trips.csv | 0 .../cmap_subset/4116728_1/2007-04-05.csv | 0 .../cycles/cmap_subset/4116728_1/trips.csv | 0 .../cmap_subset/4116813_1/2007-04-05.csv | 0 .../cycles/cmap_subset/4116813_1/trips.csv | 0 .../cmap_subset/4116813_2/2007-04-05.csv | 0 .../cycles/cmap_subset/4116813_2/trips.csv | 0 .../cmap_subset/4116880_1/2007-04-23.csv | 0 .../cycles/cmap_subset/4116880_1/trips.csv | 0 .../cmap_subset/4118093_1/2007-08-13.csv | 0 .../cmap_subset/4118093_1/2007-08-14.csv | 0 .../cycles/cmap_subset/4118093_1/trips.csv | 0 .../fastsim}/resources/cycles/ftpmc1b.csv | 0 .../fastsim}/resources/cycles/hwfet.csv | 0 .../resources/cycles/longHaulDriveCycle.csv | 0 .../fastsim}/resources/cycles/udds.csv | 0 .../fastsim}/resources/cycles/us06.csv | 0 .../cycles/wltc_class3_extra_high3.csv | 0 .../resources/cycles/wltc_class3_high3a.csv | 0 .../resources/cycles/wltc_class3_high3b.csv | 0 .../resources/cycles/wltc_class3_low3.csv | 0 .../resources/cycles/wltc_class3_med3a.csv | 0 .../resources/cycles/wltc_class3_med3b.csv | 0 .../fastsim}/resources/cycles/wmtc_all.csv | 0 .../fastsim}/resources/cycles/wmtc_part1.csv | 0 .../fastsim}/resources/cycles/wmtc_part2.csv | 0 .../fastsim}/resources/cycles/wmtc_part3.csv | 0 .../fastsim}/resources/longparams.json | 0 .../resources/master_benchmark_vars.csv | 0 .../fastsim}/resources/res_excel.json | 0 .../resources/vehdb/2010_Mazda_3_i-Stop.csv | 0 .../resources/vehdb/2010_Mazda_3_i-Stop.yaml | 0 .../resources/vehdb/2012_Ford_Focus.csv | 0 .../resources/vehdb/2012_Ford_Focus.yaml | 0 .../resources/vehdb/2012_Ford_Fusion.csv | 0 .../resources/vehdb/2012_Ford_Fusion.yaml | 0 .../vehdb/2016_EU_VW_Golf_1.4TSI.csv | 0 .../vehdb/2016_EU_VW_Golf_1.4TSI.yaml | 0 .../vehdb/2016_TOYOTA_Corolla_4cyl_2WD.csv | 0 .../vehdb/2016_TOYOTA_Corolla_4cyl_2WD.yaml | 0 .../resources/vehdb/2016_TOYOTA_Prius_Two.csv | 0 .../vehdb/2016_TOYOTA_Prius_Two.yaml | 0 .../vehdb/2017_Ford_F-150_Ecoboost.csv | 0 .../vehdb/2017_Ford_F-150_Ecoboost.yaml | 0 .../vehdb/2017_Toyota_Highlander_3.5_L.csv | 0 .../vehdb/2017_Toyota_Highlander_3.5_L.yaml | 0 .../vehdb/2020_EU_VW_Golf_1.5TSI.csv | 0 .../vehdb/2020_EU_VW_Golf_1.5TSI.yaml | 0 .../vehdb/2020_EU_VW_Golf_2.0TDI.csv | 0 .../vehdb/2020_EU_VW_Golf_2.0TDI.yaml | 0 .../vehdb/2020_Hero_Splendor+_100cc_2W.csv | 0 .../vehdb/2022_TOYOTA_Yaris_Hybrid_Mid.csv | 0 .../vehdb/2022_TOYOTA_Yaris_Hybrid_Mid.yaml | 0 .../resources/vehdb/Class_4_Box_Truck.csv | 0 .../resources/vehdb/Class_4_Box_Truck.yaml | 0 .../resources/vehdb/Line_Haul_Conv.csv | 0 .../resources/vehdb/Line_Haul_Conv.yaml | 0 .../fastsim}/resources/vehdb/README.md | 0 .../vehdb/Regional_Delivery_Class_8_Truck.csv | 0 .../Regional_Delivery_Class_8_Truck.yaml | 0 .../resources/vehdb/fail_overrides.csv | 0 .../resources/vehdb/fail_overrides.yaml | 0 .../resources/vehdb/legacy_template.csv | 0 .../resources/vehdb/legacy_template.yaml | 0 .../fastsim}/resources/vehdb/template.csv | 0 .../fastsim}/resources/vehdb/template.yaml | 0 .../resources/vehdb/test_overrides.csv | 0 .../resources/vehdb/test_overrides.yaml | 0 .../vehdb/thermal/2012_Ford_Fusion_thrml.yaml | 0 {fastsim => python/fastsim}/rustext.py | 0 {fastsim => python/fastsim}/simdrive.py | 0 {fastsim => python/fastsim}/simdrivelabel.py | 0 {fastsim => python/fastsim}/tests/__init__.py | 0 .../fastsim}/tests/test_auxiliaries.py | 0 .../fastsim}/tests/test_cav_demo.py | 0 .../fastsim}/tests/test_cav_sweep.csv | 0 .../fastsim}/tests/test_cav_sweep.py | 0 .../fastsim}/tests/test_coasting.py | 0 .../fastsim}/tests/test_copy.py | 0 .../fastsim}/tests/test_cycle.py | 0 .../fastsim}/tests/test_demo.py | 0 .../fastsim}/tests/test_eco_cruise.py | 0 .../fastsim}/tests/test_following.py | 0 .../fastsim}/tests/test_logging.py | 0 .../fastsim}/tests/test_rust.py | 0 .../fastsim}/tests/test_simdrive.py | 0 .../fastsim}/tests/test_simdrive_sweep.py | 0 .../fastsim}/tests/test_soc_correction.py | 0 .../fastsim}/tests/test_utils.py | 0 .../fastsim}/tests/test_vehicle.py | 0 .../fastsim}/tests/test_vs_excel.py | 0 {fastsim => python/fastsim}/utilities.py | 0 {fastsim => python/fastsim}/vehicle.py | 0 {fastsim => python/fastsim}/vehicle_base.py | 0 rust/fastsim-cli/src/bin/fastsim-cli.rs | 2 ++ rust/fastsim-cli/tests/integration-tests.rs | 4 +-- rust/fastsim-core/src/cycle.rs | 2 +- rust/fastsim-core/src/params.rs | 2 +- rust/fastsim-core/src/simdrivelabel.rs | 4 +++ rust/fastsim-core/src/utils.rs | 2 +- rust/fastsim-py/pyproject.toml | 20 ----------- setup.py | 34 ------------------ 195 files changed, 33 insertions(+), 76 deletions(-) rename {fastsim => python/fastsim}/.gitignore (100%) rename {fastsim => python/fastsim}/__init__.py (100%) rename {fastsim => python/fastsim}/auxiliaries.py (100%) rename {fastsim => python/fastsim}/calibration.py (100%) rename {fastsim => python/fastsim}/cycle.py (100%) rename {fastsim => python/fastsim}/docs/.gitignore (100%) rename {fastsim => python/fastsim}/docs/2017_Ford_F150_thermal_val.py (100%) rename {fastsim => python/fastsim}/docs/__init__.py (100%) rename {fastsim => python/fastsim}/docs/accel_demo.py (100%) rename {fastsim => python/fastsim}/docs/cav_demo.py (100%) rename {fastsim => python/fastsim}/docs/cav_sweep.py (100%) rename {fastsim => python/fastsim}/docs/demo.py (100%) rename {fastsim => python/fastsim}/docs/demo_abc_drag_coef_conv.py (100%) rename {fastsim => python/fastsim}/docs/demo_eu_vehicle_wltp.py (100%) rename {fastsim => python/fastsim}/docs/fastsim-icon-web-131x172.jpg (100%) rename {fastsim => python/fastsim}/docs/fusion_thermal_cal.py (100%) rename {fastsim => python/fastsim}/docs/fusion_thermal_cal_post.py (100%) rename {fastsim => python/fastsim}/docs/fusion_thermal_demo.py (100%) rename {fastsim => python/fastsim}/docs/mp_parallel_demo.py (100%) rename {fastsim => python/fastsim}/docs/stop_start_demo.py (100%) rename {fastsim => python/fastsim}/docs/time_dilation_demo.py (100%) rename {fastsim => python/fastsim}/docs/wltc_calibration.py (100%) rename {rust/fastsim-py/python/fastsimrust => python/fastsim}/fastsimrust.pyi (100%) rename {fastsim => python/fastsim}/inspect_utils.py (100%) rename {fastsim => python/fastsim}/parameters.py (100%) rename {fastsim => python/fastsim}/resample.py (100%) rename {fastsim => python/fastsim}/resources/FASTSim_py_veh_db.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/HHDDTCruiseSmooth.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/NREL13.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/README.md (100%) rename {fastsim => python/fastsim}/resources/cycles/TSDC_tripno_42648_cycle.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/accel.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4033363_1/2007-08-25.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4033363_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4033363_3/2007-08-20.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4033363_3/2007-08-21.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4033363_3/2007-08-22.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4033363_3/2007-08-23.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4033363_3/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4105836_2/2007-05-31.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4105836_2/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4107032_1/2007-05-21.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4107032_1/2007-05-22.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4107032_1/2007-05-23.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4107032_1/2007-05-24.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4107032_1/2007-05-25.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4107032_1/2007-05-26.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4107032_1/2007-05-27.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4107032_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4108468_1/2007-06-22.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4108468_1/2007-06-23.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4108468_1/2007-06-24.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4108468_1/2007-06-25.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4108468_1/2007-06-26.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4108468_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4108468_2/2007-06-21.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4108468_2/2007-06-22.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4108468_2/2007-06-27.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4108468_2/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4109114_1/2007-05-17.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4109114_1/2007-05-18.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4109114_1/2007-05-19.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4109114_1/2007-05-21.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4109114_1/2007-05-22.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4109114_1/2007-05-23.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4109114_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4111928_1/2007-05-19.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4111928_1/2007-05-21.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4111928_1/2007-05-22.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4111928_1/2007-05-23.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4111928_1/2007-05-24.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4111928_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4112082_1/2007-07-03.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4112082_1/2007-07-05.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4112082_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4113492_1/2007-05-17.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4113492_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4114555_1/2007-05-31.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4114555_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4115766_1/2007-03-28.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4115766_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4115766_2/2007-03-28.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4115766_2/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4115957_1/2007-04-09.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4115957_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4115985_1/2007-04-23.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4115985_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4116361_1/2007-03-13.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4116361_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4116721_2/2007-04-09.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4116721_2/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4116728_1/2007-04-05.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4116728_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4116813_1/2007-04-05.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4116813_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4116813_2/2007-04-05.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4116813_2/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4116880_1/2007-04-23.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4116880_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4118093_1/2007-08-13.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4118093_1/2007-08-14.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/cmap_subset/4118093_1/trips.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/ftpmc1b.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/hwfet.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/longHaulDriveCycle.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/udds.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/us06.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/wltc_class3_extra_high3.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/wltc_class3_high3a.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/wltc_class3_high3b.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/wltc_class3_low3.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/wltc_class3_med3a.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/wltc_class3_med3b.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/wmtc_all.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/wmtc_part1.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/wmtc_part2.csv (100%) rename {fastsim => python/fastsim}/resources/cycles/wmtc_part3.csv (100%) rename {fastsim => python/fastsim}/resources/longparams.json (100%) rename {fastsim => python/fastsim}/resources/master_benchmark_vars.csv (100%) rename {fastsim => python/fastsim}/resources/res_excel.json (100%) rename {fastsim => python/fastsim}/resources/vehdb/2010_Mazda_3_i-Stop.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/2010_Mazda_3_i-Stop.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/2012_Ford_Focus.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/2012_Ford_Focus.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/2012_Ford_Fusion.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/2012_Ford_Fusion.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/2016_EU_VW_Golf_1.4TSI.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/2016_EU_VW_Golf_1.4TSI.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/2016_TOYOTA_Corolla_4cyl_2WD.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/2016_TOYOTA_Corolla_4cyl_2WD.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/2016_TOYOTA_Prius_Two.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/2016_TOYOTA_Prius_Two.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/2017_Ford_F-150_Ecoboost.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/2017_Ford_F-150_Ecoboost.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/2017_Toyota_Highlander_3.5_L.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/2017_Toyota_Highlander_3.5_L.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/2020_EU_VW_Golf_1.5TSI.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/2020_EU_VW_Golf_1.5TSI.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/2020_EU_VW_Golf_2.0TDI.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/2020_EU_VW_Golf_2.0TDI.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/2020_Hero_Splendor+_100cc_2W.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/2022_TOYOTA_Yaris_Hybrid_Mid.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/2022_TOYOTA_Yaris_Hybrid_Mid.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/Class_4_Box_Truck.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/Class_4_Box_Truck.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/Line_Haul_Conv.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/Line_Haul_Conv.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/README.md (100%) rename {fastsim => python/fastsim}/resources/vehdb/Regional_Delivery_Class_8_Truck.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/Regional_Delivery_Class_8_Truck.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/fail_overrides.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/fail_overrides.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/legacy_template.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/legacy_template.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/template.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/template.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/test_overrides.csv (100%) rename {fastsim => python/fastsim}/resources/vehdb/test_overrides.yaml (100%) rename {fastsim => python/fastsim}/resources/vehdb/thermal/2012_Ford_Fusion_thrml.yaml (100%) rename {fastsim => python/fastsim}/rustext.py (100%) rename {fastsim => python/fastsim}/simdrive.py (100%) rename {fastsim => python/fastsim}/simdrivelabel.py (100%) rename {fastsim => python/fastsim}/tests/__init__.py (100%) rename {fastsim => python/fastsim}/tests/test_auxiliaries.py (100%) rename {fastsim => python/fastsim}/tests/test_cav_demo.py (100%) rename {fastsim => python/fastsim}/tests/test_cav_sweep.csv (100%) rename {fastsim => python/fastsim}/tests/test_cav_sweep.py (100%) rename {fastsim => python/fastsim}/tests/test_coasting.py (100%) rename {fastsim => python/fastsim}/tests/test_copy.py (100%) rename {fastsim => python/fastsim}/tests/test_cycle.py (100%) rename {fastsim => python/fastsim}/tests/test_demo.py (100%) rename {fastsim => python/fastsim}/tests/test_eco_cruise.py (100%) rename {fastsim => python/fastsim}/tests/test_following.py (100%) rename {fastsim => python/fastsim}/tests/test_logging.py (100%) rename {fastsim => python/fastsim}/tests/test_rust.py (100%) rename {fastsim => python/fastsim}/tests/test_simdrive.py (100%) rename {fastsim => python/fastsim}/tests/test_simdrive_sweep.py (100%) rename {fastsim => python/fastsim}/tests/test_soc_correction.py (100%) rename {fastsim => python/fastsim}/tests/test_utils.py (100%) rename {fastsim => python/fastsim}/tests/test_vehicle.py (100%) rename {fastsim => python/fastsim}/tests/test_vs_excel.py (100%) rename {fastsim => python/fastsim}/utilities.py (100%) rename {fastsim => python/fastsim}/vehicle.py (100%) rename {fastsim => python/fastsim}/vehicle_base.py (100%) delete mode 100644 rust/fastsim-py/pyproject.toml delete mode 100644 setup.py diff --git a/README.md b/README.md index 41a6624f..7dd45f03 100644 --- a/README.md +++ b/README.md @@ -38,9 +38,9 @@ Developers might want to install the code in place so that FASTSim files can be - Easy way: run `sh build_and_test.sh` in root folder. - Hard way (a couple of extra steps are required): 1. First install the python code in place: - `DEVELOP_MODE=True pip install -e ".[dev]"` + `pip install -e ".[dev]"` if on Mac OS, Linux, or Windows Bash (e.g. git bash, VSCode bash). On Windows in Power Shell or Command Prompt, run - `set DEVELOP_MODE=True` then `pip install -e ".[dev]"`. + `pip install -e ".[dev]"`. 1. Within the same python environment, navigate to `fastsim/rust/` and run `pip install maturin`. 1. _Optional_: Within the `rust/` folder (which contains the rust `src/` folder), run `cargo test --release` to build and run the tests. @@ -49,7 +49,7 @@ Developers might want to install the code in place so that FASTSim files can be After FASTSim has been installed as editable per the above instructions, you can rebuild and test everything with `sh build_and_test.sh` in Windows bash or `./build_and_test.sh` in Linux/Unix in the `fastsim/` dir. ### Testing -At the root level of the git repository: `pytest -v fastsim/tests/`. This can also be run in the python environment directly. +At the root level of the git repository: `pytest -v python/fastsim/tests/`. This can also be run in the python environment directly. # Usage To see and run examples, navigate to fastsim/docs and run the various *demo.py files to see fastsim use cases. There are other examples in fastsim/tests. diff --git a/build_and_test.sh b/build_and_test.sh index bddb6dff..744dbfcd 100755 --- a/build_and_test.sh +++ b/build_and_test.sh @@ -1,4 +1,3 @@ -(cd rust/ && cargo test --release) && \ -(cd rust/fastsim-py/ && maturin develop --release) && \ -DEVELOP_MODE=True pip install -e ".[dev]" && \ -pytest -v fastsim/tests/ \ No newline at end of file +(cd rust/ && cargo test) && \ +pip install -qe ".[dev]" && \ +pytest -v python/fastsim/tests/ \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 47318627..03e3b8d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,6 @@ [build-system] -requires = [ - "setuptools>=40.6.0", - "wheel", - "setuptools-rust>=0.11.4", -] -build-backend = "setuptools.build_meta" +requires = ["maturin>=0.15,<0.16"] +build-backend = "maturin" [project] name = "fastsim" @@ -33,10 +29,10 @@ dependencies = [ ] [project.urls] -"Homepage" = "https://www.nrel.gov/transportation/fastsim.html" +Homepage = "https://www.nrel.gov/transportation/fastsim.html" [project.optional-dependencies] -dev = ["black", "pytest", "maturin", "plotly"] +dev = ["black", "pytest", "maturin", "plotly", "ipykernel"] [tool.setuptools] zip-safe = false @@ -46,5 +42,15 @@ where = ["."] # list of folders that contain the packages (["."] by default) include = ["fastsim*"] # package names should match these glob patterns (["*"] by default) namespaces = false # to disable scanning PEP 420 namespaces (true by default) - - +[tool.maturin] +python-source="python" +features = ["pyo3/extension-module"] +module-name = "fastsim.fastsimrust" +manifest-path = "rust/fastsim-py/Cargo.toml" +include = [ + { format = "sdist", path = "rust/fastsim-core/Cargo.toml"}, + { format = "sdist", path = "rust/fastsim-core/proc-macros/Cargo.toml"}, + { format = "sdist", path = "rust/uom/Cargo.toml"}, + { format = "sdist", path = "rust/fastsim-core/src/*"}, + { format = "sdist", path = "rust/fastsim-core/proc-macros/src/*"}, +] diff --git a/fastsim/.gitignore b/python/fastsim/.gitignore similarity index 100% rename from fastsim/.gitignore rename to python/fastsim/.gitignore diff --git a/fastsim/__init__.py b/python/fastsim/__init__.py similarity index 100% rename from fastsim/__init__.py rename to python/fastsim/__init__.py diff --git a/fastsim/auxiliaries.py b/python/fastsim/auxiliaries.py similarity index 100% rename from fastsim/auxiliaries.py rename to python/fastsim/auxiliaries.py diff --git a/fastsim/calibration.py b/python/fastsim/calibration.py similarity index 100% rename from fastsim/calibration.py rename to python/fastsim/calibration.py diff --git a/fastsim/cycle.py b/python/fastsim/cycle.py similarity index 100% rename from fastsim/cycle.py rename to python/fastsim/cycle.py diff --git a/fastsim/docs/.gitignore b/python/fastsim/docs/.gitignore similarity index 100% rename from fastsim/docs/.gitignore rename to python/fastsim/docs/.gitignore diff --git a/fastsim/docs/2017_Ford_F150_thermal_val.py b/python/fastsim/docs/2017_Ford_F150_thermal_val.py similarity index 100% rename from fastsim/docs/2017_Ford_F150_thermal_val.py rename to python/fastsim/docs/2017_Ford_F150_thermal_val.py diff --git a/fastsim/docs/__init__.py b/python/fastsim/docs/__init__.py similarity index 100% rename from fastsim/docs/__init__.py rename to python/fastsim/docs/__init__.py diff --git a/fastsim/docs/accel_demo.py b/python/fastsim/docs/accel_demo.py similarity index 100% rename from fastsim/docs/accel_demo.py rename to python/fastsim/docs/accel_demo.py diff --git a/fastsim/docs/cav_demo.py b/python/fastsim/docs/cav_demo.py similarity index 100% rename from fastsim/docs/cav_demo.py rename to python/fastsim/docs/cav_demo.py diff --git a/fastsim/docs/cav_sweep.py b/python/fastsim/docs/cav_sweep.py similarity index 100% rename from fastsim/docs/cav_sweep.py rename to python/fastsim/docs/cav_sweep.py diff --git a/fastsim/docs/demo.py b/python/fastsim/docs/demo.py similarity index 100% rename from fastsim/docs/demo.py rename to python/fastsim/docs/demo.py diff --git a/fastsim/docs/demo_abc_drag_coef_conv.py b/python/fastsim/docs/demo_abc_drag_coef_conv.py similarity index 100% rename from fastsim/docs/demo_abc_drag_coef_conv.py rename to python/fastsim/docs/demo_abc_drag_coef_conv.py diff --git a/fastsim/docs/demo_eu_vehicle_wltp.py b/python/fastsim/docs/demo_eu_vehicle_wltp.py similarity index 100% rename from fastsim/docs/demo_eu_vehicle_wltp.py rename to python/fastsim/docs/demo_eu_vehicle_wltp.py diff --git a/fastsim/docs/fastsim-icon-web-131x172.jpg b/python/fastsim/docs/fastsim-icon-web-131x172.jpg similarity index 100% rename from fastsim/docs/fastsim-icon-web-131x172.jpg rename to python/fastsim/docs/fastsim-icon-web-131x172.jpg diff --git a/fastsim/docs/fusion_thermal_cal.py b/python/fastsim/docs/fusion_thermal_cal.py similarity index 100% rename from fastsim/docs/fusion_thermal_cal.py rename to python/fastsim/docs/fusion_thermal_cal.py diff --git a/fastsim/docs/fusion_thermal_cal_post.py b/python/fastsim/docs/fusion_thermal_cal_post.py similarity index 100% rename from fastsim/docs/fusion_thermal_cal_post.py rename to python/fastsim/docs/fusion_thermal_cal_post.py diff --git a/fastsim/docs/fusion_thermal_demo.py b/python/fastsim/docs/fusion_thermal_demo.py similarity index 100% rename from fastsim/docs/fusion_thermal_demo.py rename to python/fastsim/docs/fusion_thermal_demo.py diff --git a/fastsim/docs/mp_parallel_demo.py b/python/fastsim/docs/mp_parallel_demo.py similarity index 100% rename from fastsim/docs/mp_parallel_demo.py rename to python/fastsim/docs/mp_parallel_demo.py diff --git a/fastsim/docs/stop_start_demo.py b/python/fastsim/docs/stop_start_demo.py similarity index 100% rename from fastsim/docs/stop_start_demo.py rename to python/fastsim/docs/stop_start_demo.py diff --git a/fastsim/docs/time_dilation_demo.py b/python/fastsim/docs/time_dilation_demo.py similarity index 100% rename from fastsim/docs/time_dilation_demo.py rename to python/fastsim/docs/time_dilation_demo.py diff --git a/fastsim/docs/wltc_calibration.py b/python/fastsim/docs/wltc_calibration.py similarity index 100% rename from fastsim/docs/wltc_calibration.py rename to python/fastsim/docs/wltc_calibration.py diff --git a/rust/fastsim-py/python/fastsimrust/fastsimrust.pyi b/python/fastsim/fastsimrust.pyi similarity index 100% rename from rust/fastsim-py/python/fastsimrust/fastsimrust.pyi rename to python/fastsim/fastsimrust.pyi diff --git a/fastsim/inspect_utils.py b/python/fastsim/inspect_utils.py similarity index 100% rename from fastsim/inspect_utils.py rename to python/fastsim/inspect_utils.py diff --git a/fastsim/parameters.py b/python/fastsim/parameters.py similarity index 100% rename from fastsim/parameters.py rename to python/fastsim/parameters.py diff --git a/fastsim/resample.py b/python/fastsim/resample.py similarity index 100% rename from fastsim/resample.py rename to python/fastsim/resample.py diff --git a/fastsim/resources/FASTSim_py_veh_db.csv b/python/fastsim/resources/FASTSim_py_veh_db.csv similarity index 100% rename from fastsim/resources/FASTSim_py_veh_db.csv rename to python/fastsim/resources/FASTSim_py_veh_db.csv diff --git a/fastsim/resources/cycles/HHDDTCruiseSmooth.csv b/python/fastsim/resources/cycles/HHDDTCruiseSmooth.csv similarity index 100% rename from fastsim/resources/cycles/HHDDTCruiseSmooth.csv rename to python/fastsim/resources/cycles/HHDDTCruiseSmooth.csv diff --git a/fastsim/resources/cycles/NREL13.csv b/python/fastsim/resources/cycles/NREL13.csv similarity index 100% rename from fastsim/resources/cycles/NREL13.csv rename to python/fastsim/resources/cycles/NREL13.csv diff --git a/fastsim/resources/cycles/README.md b/python/fastsim/resources/cycles/README.md similarity index 100% rename from fastsim/resources/cycles/README.md rename to python/fastsim/resources/cycles/README.md diff --git a/fastsim/resources/cycles/TSDC_tripno_42648_cycle.csv b/python/fastsim/resources/cycles/TSDC_tripno_42648_cycle.csv similarity index 100% rename from fastsim/resources/cycles/TSDC_tripno_42648_cycle.csv rename to python/fastsim/resources/cycles/TSDC_tripno_42648_cycle.csv diff --git a/fastsim/resources/cycles/accel.csv b/python/fastsim/resources/cycles/accel.csv similarity index 100% rename from fastsim/resources/cycles/accel.csv rename to python/fastsim/resources/cycles/accel.csv diff --git a/fastsim/resources/cycles/cmap_subset/4033363_1/2007-08-25.csv b/python/fastsim/resources/cycles/cmap_subset/4033363_1/2007-08-25.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4033363_1/2007-08-25.csv rename to python/fastsim/resources/cycles/cmap_subset/4033363_1/2007-08-25.csv diff --git a/fastsim/resources/cycles/cmap_subset/4033363_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4033363_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4033363_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4033363_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-20.csv b/python/fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-20.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-20.csv rename to python/fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-20.csv diff --git a/fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-21.csv b/python/fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-21.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-21.csv rename to python/fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-21.csv diff --git a/fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-22.csv b/python/fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-22.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-22.csv rename to python/fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-22.csv diff --git a/fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-23.csv b/python/fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-23.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-23.csv rename to python/fastsim/resources/cycles/cmap_subset/4033363_3/2007-08-23.csv diff --git a/fastsim/resources/cycles/cmap_subset/4033363_3/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4033363_3/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4033363_3/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4033363_3/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4105836_2/2007-05-31.csv b/python/fastsim/resources/cycles/cmap_subset/4105836_2/2007-05-31.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4105836_2/2007-05-31.csv rename to python/fastsim/resources/cycles/cmap_subset/4105836_2/2007-05-31.csv diff --git a/fastsim/resources/cycles/cmap_subset/4105836_2/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4105836_2/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4105836_2/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4105836_2/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-21.csv b/python/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-21.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-21.csv rename to python/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-21.csv diff --git a/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-22.csv b/python/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-22.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-22.csv rename to python/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-22.csv diff --git a/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-23.csv b/python/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-23.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-23.csv rename to python/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-23.csv diff --git a/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-24.csv b/python/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-24.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-24.csv rename to python/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-24.csv diff --git a/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-25.csv b/python/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-25.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-25.csv rename to python/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-25.csv diff --git a/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-26.csv b/python/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-26.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-26.csv rename to python/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-26.csv diff --git a/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-27.csv b/python/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-27.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-27.csv rename to python/fastsim/resources/cycles/cmap_subset/4107032_1/2007-05-27.csv diff --git a/fastsim/resources/cycles/cmap_subset/4107032_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4107032_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4107032_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4107032_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-22.csv b/python/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-22.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-22.csv rename to python/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-22.csv diff --git a/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-23.csv b/python/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-23.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-23.csv rename to python/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-23.csv diff --git a/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-24.csv b/python/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-24.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-24.csv rename to python/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-24.csv diff --git a/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-25.csv b/python/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-25.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-25.csv rename to python/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-25.csv diff --git a/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-26.csv b/python/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-26.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-26.csv rename to python/fastsim/resources/cycles/cmap_subset/4108468_1/2007-06-26.csv diff --git a/fastsim/resources/cycles/cmap_subset/4108468_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4108468_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4108468_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4108468_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4108468_2/2007-06-21.csv b/python/fastsim/resources/cycles/cmap_subset/4108468_2/2007-06-21.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4108468_2/2007-06-21.csv rename to python/fastsim/resources/cycles/cmap_subset/4108468_2/2007-06-21.csv diff --git a/fastsim/resources/cycles/cmap_subset/4108468_2/2007-06-22.csv b/python/fastsim/resources/cycles/cmap_subset/4108468_2/2007-06-22.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4108468_2/2007-06-22.csv rename to python/fastsim/resources/cycles/cmap_subset/4108468_2/2007-06-22.csv diff --git a/fastsim/resources/cycles/cmap_subset/4108468_2/2007-06-27.csv b/python/fastsim/resources/cycles/cmap_subset/4108468_2/2007-06-27.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4108468_2/2007-06-27.csv rename to python/fastsim/resources/cycles/cmap_subset/4108468_2/2007-06-27.csv diff --git a/fastsim/resources/cycles/cmap_subset/4108468_2/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4108468_2/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4108468_2/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4108468_2/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-17.csv b/python/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-17.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-17.csv rename to python/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-17.csv diff --git a/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-18.csv b/python/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-18.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-18.csv rename to python/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-18.csv diff --git a/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-19.csv b/python/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-19.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-19.csv rename to python/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-19.csv diff --git a/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-21.csv b/python/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-21.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-21.csv rename to python/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-21.csv diff --git a/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-22.csv b/python/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-22.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-22.csv rename to python/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-22.csv diff --git a/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-23.csv b/python/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-23.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-23.csv rename to python/fastsim/resources/cycles/cmap_subset/4109114_1/2007-05-23.csv diff --git a/fastsim/resources/cycles/cmap_subset/4109114_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4109114_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4109114_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4109114_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-19.csv b/python/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-19.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-19.csv rename to python/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-19.csv diff --git a/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-21.csv b/python/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-21.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-21.csv rename to python/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-21.csv diff --git a/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-22.csv b/python/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-22.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-22.csv rename to python/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-22.csv diff --git a/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-23.csv b/python/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-23.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-23.csv rename to python/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-23.csv diff --git a/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-24.csv b/python/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-24.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-24.csv rename to python/fastsim/resources/cycles/cmap_subset/4111928_1/2007-05-24.csv diff --git a/fastsim/resources/cycles/cmap_subset/4111928_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4111928_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4111928_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4111928_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4112082_1/2007-07-03.csv b/python/fastsim/resources/cycles/cmap_subset/4112082_1/2007-07-03.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4112082_1/2007-07-03.csv rename to python/fastsim/resources/cycles/cmap_subset/4112082_1/2007-07-03.csv diff --git a/fastsim/resources/cycles/cmap_subset/4112082_1/2007-07-05.csv b/python/fastsim/resources/cycles/cmap_subset/4112082_1/2007-07-05.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4112082_1/2007-07-05.csv rename to python/fastsim/resources/cycles/cmap_subset/4112082_1/2007-07-05.csv diff --git a/fastsim/resources/cycles/cmap_subset/4112082_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4112082_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4112082_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4112082_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4113492_1/2007-05-17.csv b/python/fastsim/resources/cycles/cmap_subset/4113492_1/2007-05-17.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4113492_1/2007-05-17.csv rename to python/fastsim/resources/cycles/cmap_subset/4113492_1/2007-05-17.csv diff --git a/fastsim/resources/cycles/cmap_subset/4113492_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4113492_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4113492_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4113492_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4114555_1/2007-05-31.csv b/python/fastsim/resources/cycles/cmap_subset/4114555_1/2007-05-31.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4114555_1/2007-05-31.csv rename to python/fastsim/resources/cycles/cmap_subset/4114555_1/2007-05-31.csv diff --git a/fastsim/resources/cycles/cmap_subset/4114555_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4114555_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4114555_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4114555_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4115766_1/2007-03-28.csv b/python/fastsim/resources/cycles/cmap_subset/4115766_1/2007-03-28.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4115766_1/2007-03-28.csv rename to python/fastsim/resources/cycles/cmap_subset/4115766_1/2007-03-28.csv diff --git a/fastsim/resources/cycles/cmap_subset/4115766_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4115766_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4115766_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4115766_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4115766_2/2007-03-28.csv b/python/fastsim/resources/cycles/cmap_subset/4115766_2/2007-03-28.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4115766_2/2007-03-28.csv rename to python/fastsim/resources/cycles/cmap_subset/4115766_2/2007-03-28.csv diff --git a/fastsim/resources/cycles/cmap_subset/4115766_2/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4115766_2/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4115766_2/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4115766_2/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4115957_1/2007-04-09.csv b/python/fastsim/resources/cycles/cmap_subset/4115957_1/2007-04-09.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4115957_1/2007-04-09.csv rename to python/fastsim/resources/cycles/cmap_subset/4115957_1/2007-04-09.csv diff --git a/fastsim/resources/cycles/cmap_subset/4115957_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4115957_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4115957_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4115957_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4115985_1/2007-04-23.csv b/python/fastsim/resources/cycles/cmap_subset/4115985_1/2007-04-23.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4115985_1/2007-04-23.csv rename to python/fastsim/resources/cycles/cmap_subset/4115985_1/2007-04-23.csv diff --git a/fastsim/resources/cycles/cmap_subset/4115985_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4115985_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4115985_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4115985_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4116361_1/2007-03-13.csv b/python/fastsim/resources/cycles/cmap_subset/4116361_1/2007-03-13.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4116361_1/2007-03-13.csv rename to python/fastsim/resources/cycles/cmap_subset/4116361_1/2007-03-13.csv diff --git a/fastsim/resources/cycles/cmap_subset/4116361_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4116361_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4116361_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4116361_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4116721_2/2007-04-09.csv b/python/fastsim/resources/cycles/cmap_subset/4116721_2/2007-04-09.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4116721_2/2007-04-09.csv rename to python/fastsim/resources/cycles/cmap_subset/4116721_2/2007-04-09.csv diff --git a/fastsim/resources/cycles/cmap_subset/4116721_2/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4116721_2/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4116721_2/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4116721_2/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4116728_1/2007-04-05.csv b/python/fastsim/resources/cycles/cmap_subset/4116728_1/2007-04-05.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4116728_1/2007-04-05.csv rename to python/fastsim/resources/cycles/cmap_subset/4116728_1/2007-04-05.csv diff --git a/fastsim/resources/cycles/cmap_subset/4116728_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4116728_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4116728_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4116728_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4116813_1/2007-04-05.csv b/python/fastsim/resources/cycles/cmap_subset/4116813_1/2007-04-05.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4116813_1/2007-04-05.csv rename to python/fastsim/resources/cycles/cmap_subset/4116813_1/2007-04-05.csv diff --git a/fastsim/resources/cycles/cmap_subset/4116813_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4116813_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4116813_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4116813_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4116813_2/2007-04-05.csv b/python/fastsim/resources/cycles/cmap_subset/4116813_2/2007-04-05.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4116813_2/2007-04-05.csv rename to python/fastsim/resources/cycles/cmap_subset/4116813_2/2007-04-05.csv diff --git a/fastsim/resources/cycles/cmap_subset/4116813_2/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4116813_2/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4116813_2/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4116813_2/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4116880_1/2007-04-23.csv b/python/fastsim/resources/cycles/cmap_subset/4116880_1/2007-04-23.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4116880_1/2007-04-23.csv rename to python/fastsim/resources/cycles/cmap_subset/4116880_1/2007-04-23.csv diff --git a/fastsim/resources/cycles/cmap_subset/4116880_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4116880_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4116880_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4116880_1/trips.csv diff --git a/fastsim/resources/cycles/cmap_subset/4118093_1/2007-08-13.csv b/python/fastsim/resources/cycles/cmap_subset/4118093_1/2007-08-13.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4118093_1/2007-08-13.csv rename to python/fastsim/resources/cycles/cmap_subset/4118093_1/2007-08-13.csv diff --git a/fastsim/resources/cycles/cmap_subset/4118093_1/2007-08-14.csv b/python/fastsim/resources/cycles/cmap_subset/4118093_1/2007-08-14.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4118093_1/2007-08-14.csv rename to python/fastsim/resources/cycles/cmap_subset/4118093_1/2007-08-14.csv diff --git a/fastsim/resources/cycles/cmap_subset/4118093_1/trips.csv b/python/fastsim/resources/cycles/cmap_subset/4118093_1/trips.csv similarity index 100% rename from fastsim/resources/cycles/cmap_subset/4118093_1/trips.csv rename to python/fastsim/resources/cycles/cmap_subset/4118093_1/trips.csv diff --git a/fastsim/resources/cycles/ftpmc1b.csv b/python/fastsim/resources/cycles/ftpmc1b.csv similarity index 100% rename from fastsim/resources/cycles/ftpmc1b.csv rename to python/fastsim/resources/cycles/ftpmc1b.csv diff --git a/fastsim/resources/cycles/hwfet.csv b/python/fastsim/resources/cycles/hwfet.csv similarity index 100% rename from fastsim/resources/cycles/hwfet.csv rename to python/fastsim/resources/cycles/hwfet.csv diff --git a/fastsim/resources/cycles/longHaulDriveCycle.csv b/python/fastsim/resources/cycles/longHaulDriveCycle.csv similarity index 100% rename from fastsim/resources/cycles/longHaulDriveCycle.csv rename to python/fastsim/resources/cycles/longHaulDriveCycle.csv diff --git a/fastsim/resources/cycles/udds.csv b/python/fastsim/resources/cycles/udds.csv similarity index 100% rename from fastsim/resources/cycles/udds.csv rename to python/fastsim/resources/cycles/udds.csv diff --git a/fastsim/resources/cycles/us06.csv b/python/fastsim/resources/cycles/us06.csv similarity index 100% rename from fastsim/resources/cycles/us06.csv rename to python/fastsim/resources/cycles/us06.csv diff --git a/fastsim/resources/cycles/wltc_class3_extra_high3.csv b/python/fastsim/resources/cycles/wltc_class3_extra_high3.csv similarity index 100% rename from fastsim/resources/cycles/wltc_class3_extra_high3.csv rename to python/fastsim/resources/cycles/wltc_class3_extra_high3.csv diff --git a/fastsim/resources/cycles/wltc_class3_high3a.csv b/python/fastsim/resources/cycles/wltc_class3_high3a.csv similarity index 100% rename from fastsim/resources/cycles/wltc_class3_high3a.csv rename to python/fastsim/resources/cycles/wltc_class3_high3a.csv diff --git a/fastsim/resources/cycles/wltc_class3_high3b.csv b/python/fastsim/resources/cycles/wltc_class3_high3b.csv similarity index 100% rename from fastsim/resources/cycles/wltc_class3_high3b.csv rename to python/fastsim/resources/cycles/wltc_class3_high3b.csv diff --git a/fastsim/resources/cycles/wltc_class3_low3.csv b/python/fastsim/resources/cycles/wltc_class3_low3.csv similarity index 100% rename from fastsim/resources/cycles/wltc_class3_low3.csv rename to python/fastsim/resources/cycles/wltc_class3_low3.csv diff --git a/fastsim/resources/cycles/wltc_class3_med3a.csv b/python/fastsim/resources/cycles/wltc_class3_med3a.csv similarity index 100% rename from fastsim/resources/cycles/wltc_class3_med3a.csv rename to python/fastsim/resources/cycles/wltc_class3_med3a.csv diff --git a/fastsim/resources/cycles/wltc_class3_med3b.csv b/python/fastsim/resources/cycles/wltc_class3_med3b.csv similarity index 100% rename from fastsim/resources/cycles/wltc_class3_med3b.csv rename to python/fastsim/resources/cycles/wltc_class3_med3b.csv diff --git a/fastsim/resources/cycles/wmtc_all.csv b/python/fastsim/resources/cycles/wmtc_all.csv similarity index 100% rename from fastsim/resources/cycles/wmtc_all.csv rename to python/fastsim/resources/cycles/wmtc_all.csv diff --git a/fastsim/resources/cycles/wmtc_part1.csv b/python/fastsim/resources/cycles/wmtc_part1.csv similarity index 100% rename from fastsim/resources/cycles/wmtc_part1.csv rename to python/fastsim/resources/cycles/wmtc_part1.csv diff --git a/fastsim/resources/cycles/wmtc_part2.csv b/python/fastsim/resources/cycles/wmtc_part2.csv similarity index 100% rename from fastsim/resources/cycles/wmtc_part2.csv rename to python/fastsim/resources/cycles/wmtc_part2.csv diff --git a/fastsim/resources/cycles/wmtc_part3.csv b/python/fastsim/resources/cycles/wmtc_part3.csv similarity index 100% rename from fastsim/resources/cycles/wmtc_part3.csv rename to python/fastsim/resources/cycles/wmtc_part3.csv diff --git a/fastsim/resources/longparams.json b/python/fastsim/resources/longparams.json similarity index 100% rename from fastsim/resources/longparams.json rename to python/fastsim/resources/longparams.json diff --git a/fastsim/resources/master_benchmark_vars.csv b/python/fastsim/resources/master_benchmark_vars.csv similarity index 100% rename from fastsim/resources/master_benchmark_vars.csv rename to python/fastsim/resources/master_benchmark_vars.csv diff --git a/fastsim/resources/res_excel.json b/python/fastsim/resources/res_excel.json similarity index 100% rename from fastsim/resources/res_excel.json rename to python/fastsim/resources/res_excel.json diff --git a/fastsim/resources/vehdb/2010_Mazda_3_i-Stop.csv b/python/fastsim/resources/vehdb/2010_Mazda_3_i-Stop.csv similarity index 100% rename from fastsim/resources/vehdb/2010_Mazda_3_i-Stop.csv rename to python/fastsim/resources/vehdb/2010_Mazda_3_i-Stop.csv diff --git a/fastsim/resources/vehdb/2010_Mazda_3_i-Stop.yaml b/python/fastsim/resources/vehdb/2010_Mazda_3_i-Stop.yaml similarity index 100% rename from fastsim/resources/vehdb/2010_Mazda_3_i-Stop.yaml rename to python/fastsim/resources/vehdb/2010_Mazda_3_i-Stop.yaml diff --git a/fastsim/resources/vehdb/2012_Ford_Focus.csv b/python/fastsim/resources/vehdb/2012_Ford_Focus.csv similarity index 100% rename from fastsim/resources/vehdb/2012_Ford_Focus.csv rename to python/fastsim/resources/vehdb/2012_Ford_Focus.csv diff --git a/fastsim/resources/vehdb/2012_Ford_Focus.yaml b/python/fastsim/resources/vehdb/2012_Ford_Focus.yaml similarity index 100% rename from fastsim/resources/vehdb/2012_Ford_Focus.yaml rename to python/fastsim/resources/vehdb/2012_Ford_Focus.yaml diff --git a/fastsim/resources/vehdb/2012_Ford_Fusion.csv b/python/fastsim/resources/vehdb/2012_Ford_Fusion.csv similarity index 100% rename from fastsim/resources/vehdb/2012_Ford_Fusion.csv rename to python/fastsim/resources/vehdb/2012_Ford_Fusion.csv diff --git a/fastsim/resources/vehdb/2012_Ford_Fusion.yaml b/python/fastsim/resources/vehdb/2012_Ford_Fusion.yaml similarity index 100% rename from fastsim/resources/vehdb/2012_Ford_Fusion.yaml rename to python/fastsim/resources/vehdb/2012_Ford_Fusion.yaml diff --git a/fastsim/resources/vehdb/2016_EU_VW_Golf_1.4TSI.csv b/python/fastsim/resources/vehdb/2016_EU_VW_Golf_1.4TSI.csv similarity index 100% rename from fastsim/resources/vehdb/2016_EU_VW_Golf_1.4TSI.csv rename to python/fastsim/resources/vehdb/2016_EU_VW_Golf_1.4TSI.csv diff --git a/fastsim/resources/vehdb/2016_EU_VW_Golf_1.4TSI.yaml b/python/fastsim/resources/vehdb/2016_EU_VW_Golf_1.4TSI.yaml similarity index 100% rename from fastsim/resources/vehdb/2016_EU_VW_Golf_1.4TSI.yaml rename to python/fastsim/resources/vehdb/2016_EU_VW_Golf_1.4TSI.yaml diff --git a/fastsim/resources/vehdb/2016_TOYOTA_Corolla_4cyl_2WD.csv b/python/fastsim/resources/vehdb/2016_TOYOTA_Corolla_4cyl_2WD.csv similarity index 100% rename from fastsim/resources/vehdb/2016_TOYOTA_Corolla_4cyl_2WD.csv rename to python/fastsim/resources/vehdb/2016_TOYOTA_Corolla_4cyl_2WD.csv diff --git a/fastsim/resources/vehdb/2016_TOYOTA_Corolla_4cyl_2WD.yaml b/python/fastsim/resources/vehdb/2016_TOYOTA_Corolla_4cyl_2WD.yaml similarity index 100% rename from fastsim/resources/vehdb/2016_TOYOTA_Corolla_4cyl_2WD.yaml rename to python/fastsim/resources/vehdb/2016_TOYOTA_Corolla_4cyl_2WD.yaml diff --git a/fastsim/resources/vehdb/2016_TOYOTA_Prius_Two.csv b/python/fastsim/resources/vehdb/2016_TOYOTA_Prius_Two.csv similarity index 100% rename from fastsim/resources/vehdb/2016_TOYOTA_Prius_Two.csv rename to python/fastsim/resources/vehdb/2016_TOYOTA_Prius_Two.csv diff --git a/fastsim/resources/vehdb/2016_TOYOTA_Prius_Two.yaml b/python/fastsim/resources/vehdb/2016_TOYOTA_Prius_Two.yaml similarity index 100% rename from fastsim/resources/vehdb/2016_TOYOTA_Prius_Two.yaml rename to python/fastsim/resources/vehdb/2016_TOYOTA_Prius_Two.yaml diff --git a/fastsim/resources/vehdb/2017_Ford_F-150_Ecoboost.csv b/python/fastsim/resources/vehdb/2017_Ford_F-150_Ecoboost.csv similarity index 100% rename from fastsim/resources/vehdb/2017_Ford_F-150_Ecoboost.csv rename to python/fastsim/resources/vehdb/2017_Ford_F-150_Ecoboost.csv diff --git a/fastsim/resources/vehdb/2017_Ford_F-150_Ecoboost.yaml b/python/fastsim/resources/vehdb/2017_Ford_F-150_Ecoboost.yaml similarity index 100% rename from fastsim/resources/vehdb/2017_Ford_F-150_Ecoboost.yaml rename to python/fastsim/resources/vehdb/2017_Ford_F-150_Ecoboost.yaml diff --git a/fastsim/resources/vehdb/2017_Toyota_Highlander_3.5_L.csv b/python/fastsim/resources/vehdb/2017_Toyota_Highlander_3.5_L.csv similarity index 100% rename from fastsim/resources/vehdb/2017_Toyota_Highlander_3.5_L.csv rename to python/fastsim/resources/vehdb/2017_Toyota_Highlander_3.5_L.csv diff --git a/fastsim/resources/vehdb/2017_Toyota_Highlander_3.5_L.yaml b/python/fastsim/resources/vehdb/2017_Toyota_Highlander_3.5_L.yaml similarity index 100% rename from fastsim/resources/vehdb/2017_Toyota_Highlander_3.5_L.yaml rename to python/fastsim/resources/vehdb/2017_Toyota_Highlander_3.5_L.yaml diff --git a/fastsim/resources/vehdb/2020_EU_VW_Golf_1.5TSI.csv b/python/fastsim/resources/vehdb/2020_EU_VW_Golf_1.5TSI.csv similarity index 100% rename from fastsim/resources/vehdb/2020_EU_VW_Golf_1.5TSI.csv rename to python/fastsim/resources/vehdb/2020_EU_VW_Golf_1.5TSI.csv diff --git a/fastsim/resources/vehdb/2020_EU_VW_Golf_1.5TSI.yaml b/python/fastsim/resources/vehdb/2020_EU_VW_Golf_1.5TSI.yaml similarity index 100% rename from fastsim/resources/vehdb/2020_EU_VW_Golf_1.5TSI.yaml rename to python/fastsim/resources/vehdb/2020_EU_VW_Golf_1.5TSI.yaml diff --git a/fastsim/resources/vehdb/2020_EU_VW_Golf_2.0TDI.csv b/python/fastsim/resources/vehdb/2020_EU_VW_Golf_2.0TDI.csv similarity index 100% rename from fastsim/resources/vehdb/2020_EU_VW_Golf_2.0TDI.csv rename to python/fastsim/resources/vehdb/2020_EU_VW_Golf_2.0TDI.csv diff --git a/fastsim/resources/vehdb/2020_EU_VW_Golf_2.0TDI.yaml b/python/fastsim/resources/vehdb/2020_EU_VW_Golf_2.0TDI.yaml similarity index 100% rename from fastsim/resources/vehdb/2020_EU_VW_Golf_2.0TDI.yaml rename to python/fastsim/resources/vehdb/2020_EU_VW_Golf_2.0TDI.yaml diff --git a/fastsim/resources/vehdb/2020_Hero_Splendor+_100cc_2W.csv b/python/fastsim/resources/vehdb/2020_Hero_Splendor+_100cc_2W.csv similarity index 100% rename from fastsim/resources/vehdb/2020_Hero_Splendor+_100cc_2W.csv rename to python/fastsim/resources/vehdb/2020_Hero_Splendor+_100cc_2W.csv diff --git a/fastsim/resources/vehdb/2022_TOYOTA_Yaris_Hybrid_Mid.csv b/python/fastsim/resources/vehdb/2022_TOYOTA_Yaris_Hybrid_Mid.csv similarity index 100% rename from fastsim/resources/vehdb/2022_TOYOTA_Yaris_Hybrid_Mid.csv rename to python/fastsim/resources/vehdb/2022_TOYOTA_Yaris_Hybrid_Mid.csv diff --git a/fastsim/resources/vehdb/2022_TOYOTA_Yaris_Hybrid_Mid.yaml b/python/fastsim/resources/vehdb/2022_TOYOTA_Yaris_Hybrid_Mid.yaml similarity index 100% rename from fastsim/resources/vehdb/2022_TOYOTA_Yaris_Hybrid_Mid.yaml rename to python/fastsim/resources/vehdb/2022_TOYOTA_Yaris_Hybrid_Mid.yaml diff --git a/fastsim/resources/vehdb/Class_4_Box_Truck.csv b/python/fastsim/resources/vehdb/Class_4_Box_Truck.csv similarity index 100% rename from fastsim/resources/vehdb/Class_4_Box_Truck.csv rename to python/fastsim/resources/vehdb/Class_4_Box_Truck.csv diff --git a/fastsim/resources/vehdb/Class_4_Box_Truck.yaml b/python/fastsim/resources/vehdb/Class_4_Box_Truck.yaml similarity index 100% rename from fastsim/resources/vehdb/Class_4_Box_Truck.yaml rename to python/fastsim/resources/vehdb/Class_4_Box_Truck.yaml diff --git a/fastsim/resources/vehdb/Line_Haul_Conv.csv b/python/fastsim/resources/vehdb/Line_Haul_Conv.csv similarity index 100% rename from fastsim/resources/vehdb/Line_Haul_Conv.csv rename to python/fastsim/resources/vehdb/Line_Haul_Conv.csv diff --git a/fastsim/resources/vehdb/Line_Haul_Conv.yaml b/python/fastsim/resources/vehdb/Line_Haul_Conv.yaml similarity index 100% rename from fastsim/resources/vehdb/Line_Haul_Conv.yaml rename to python/fastsim/resources/vehdb/Line_Haul_Conv.yaml diff --git a/fastsim/resources/vehdb/README.md b/python/fastsim/resources/vehdb/README.md similarity index 100% rename from fastsim/resources/vehdb/README.md rename to python/fastsim/resources/vehdb/README.md diff --git a/fastsim/resources/vehdb/Regional_Delivery_Class_8_Truck.csv b/python/fastsim/resources/vehdb/Regional_Delivery_Class_8_Truck.csv similarity index 100% rename from fastsim/resources/vehdb/Regional_Delivery_Class_8_Truck.csv rename to python/fastsim/resources/vehdb/Regional_Delivery_Class_8_Truck.csv diff --git a/fastsim/resources/vehdb/Regional_Delivery_Class_8_Truck.yaml b/python/fastsim/resources/vehdb/Regional_Delivery_Class_8_Truck.yaml similarity index 100% rename from fastsim/resources/vehdb/Regional_Delivery_Class_8_Truck.yaml rename to python/fastsim/resources/vehdb/Regional_Delivery_Class_8_Truck.yaml diff --git a/fastsim/resources/vehdb/fail_overrides.csv b/python/fastsim/resources/vehdb/fail_overrides.csv similarity index 100% rename from fastsim/resources/vehdb/fail_overrides.csv rename to python/fastsim/resources/vehdb/fail_overrides.csv diff --git a/fastsim/resources/vehdb/fail_overrides.yaml b/python/fastsim/resources/vehdb/fail_overrides.yaml similarity index 100% rename from fastsim/resources/vehdb/fail_overrides.yaml rename to python/fastsim/resources/vehdb/fail_overrides.yaml diff --git a/fastsim/resources/vehdb/legacy_template.csv b/python/fastsim/resources/vehdb/legacy_template.csv similarity index 100% rename from fastsim/resources/vehdb/legacy_template.csv rename to python/fastsim/resources/vehdb/legacy_template.csv diff --git a/fastsim/resources/vehdb/legacy_template.yaml b/python/fastsim/resources/vehdb/legacy_template.yaml similarity index 100% rename from fastsim/resources/vehdb/legacy_template.yaml rename to python/fastsim/resources/vehdb/legacy_template.yaml diff --git a/fastsim/resources/vehdb/template.csv b/python/fastsim/resources/vehdb/template.csv similarity index 100% rename from fastsim/resources/vehdb/template.csv rename to python/fastsim/resources/vehdb/template.csv diff --git a/fastsim/resources/vehdb/template.yaml b/python/fastsim/resources/vehdb/template.yaml similarity index 100% rename from fastsim/resources/vehdb/template.yaml rename to python/fastsim/resources/vehdb/template.yaml diff --git a/fastsim/resources/vehdb/test_overrides.csv b/python/fastsim/resources/vehdb/test_overrides.csv similarity index 100% rename from fastsim/resources/vehdb/test_overrides.csv rename to python/fastsim/resources/vehdb/test_overrides.csv diff --git a/fastsim/resources/vehdb/test_overrides.yaml b/python/fastsim/resources/vehdb/test_overrides.yaml similarity index 100% rename from fastsim/resources/vehdb/test_overrides.yaml rename to python/fastsim/resources/vehdb/test_overrides.yaml diff --git a/fastsim/resources/vehdb/thermal/2012_Ford_Fusion_thrml.yaml b/python/fastsim/resources/vehdb/thermal/2012_Ford_Fusion_thrml.yaml similarity index 100% rename from fastsim/resources/vehdb/thermal/2012_Ford_Fusion_thrml.yaml rename to python/fastsim/resources/vehdb/thermal/2012_Ford_Fusion_thrml.yaml diff --git a/fastsim/rustext.py b/python/fastsim/rustext.py similarity index 100% rename from fastsim/rustext.py rename to python/fastsim/rustext.py diff --git a/fastsim/simdrive.py b/python/fastsim/simdrive.py similarity index 100% rename from fastsim/simdrive.py rename to python/fastsim/simdrive.py diff --git a/fastsim/simdrivelabel.py b/python/fastsim/simdrivelabel.py similarity index 100% rename from fastsim/simdrivelabel.py rename to python/fastsim/simdrivelabel.py diff --git a/fastsim/tests/__init__.py b/python/fastsim/tests/__init__.py similarity index 100% rename from fastsim/tests/__init__.py rename to python/fastsim/tests/__init__.py diff --git a/fastsim/tests/test_auxiliaries.py b/python/fastsim/tests/test_auxiliaries.py similarity index 100% rename from fastsim/tests/test_auxiliaries.py rename to python/fastsim/tests/test_auxiliaries.py diff --git a/fastsim/tests/test_cav_demo.py b/python/fastsim/tests/test_cav_demo.py similarity index 100% rename from fastsim/tests/test_cav_demo.py rename to python/fastsim/tests/test_cav_demo.py diff --git a/fastsim/tests/test_cav_sweep.csv b/python/fastsim/tests/test_cav_sweep.csv similarity index 100% rename from fastsim/tests/test_cav_sweep.csv rename to python/fastsim/tests/test_cav_sweep.csv diff --git a/fastsim/tests/test_cav_sweep.py b/python/fastsim/tests/test_cav_sweep.py similarity index 100% rename from fastsim/tests/test_cav_sweep.py rename to python/fastsim/tests/test_cav_sweep.py diff --git a/fastsim/tests/test_coasting.py b/python/fastsim/tests/test_coasting.py similarity index 100% rename from fastsim/tests/test_coasting.py rename to python/fastsim/tests/test_coasting.py diff --git a/fastsim/tests/test_copy.py b/python/fastsim/tests/test_copy.py similarity index 100% rename from fastsim/tests/test_copy.py rename to python/fastsim/tests/test_copy.py diff --git a/fastsim/tests/test_cycle.py b/python/fastsim/tests/test_cycle.py similarity index 100% rename from fastsim/tests/test_cycle.py rename to python/fastsim/tests/test_cycle.py diff --git a/fastsim/tests/test_demo.py b/python/fastsim/tests/test_demo.py similarity index 100% rename from fastsim/tests/test_demo.py rename to python/fastsim/tests/test_demo.py diff --git a/fastsim/tests/test_eco_cruise.py b/python/fastsim/tests/test_eco_cruise.py similarity index 100% rename from fastsim/tests/test_eco_cruise.py rename to python/fastsim/tests/test_eco_cruise.py diff --git a/fastsim/tests/test_following.py b/python/fastsim/tests/test_following.py similarity index 100% rename from fastsim/tests/test_following.py rename to python/fastsim/tests/test_following.py diff --git a/fastsim/tests/test_logging.py b/python/fastsim/tests/test_logging.py similarity index 100% rename from fastsim/tests/test_logging.py rename to python/fastsim/tests/test_logging.py diff --git a/fastsim/tests/test_rust.py b/python/fastsim/tests/test_rust.py similarity index 100% rename from fastsim/tests/test_rust.py rename to python/fastsim/tests/test_rust.py diff --git a/fastsim/tests/test_simdrive.py b/python/fastsim/tests/test_simdrive.py similarity index 100% rename from fastsim/tests/test_simdrive.py rename to python/fastsim/tests/test_simdrive.py diff --git a/fastsim/tests/test_simdrive_sweep.py b/python/fastsim/tests/test_simdrive_sweep.py similarity index 100% rename from fastsim/tests/test_simdrive_sweep.py rename to python/fastsim/tests/test_simdrive_sweep.py diff --git a/fastsim/tests/test_soc_correction.py b/python/fastsim/tests/test_soc_correction.py similarity index 100% rename from fastsim/tests/test_soc_correction.py rename to python/fastsim/tests/test_soc_correction.py diff --git a/fastsim/tests/test_utils.py b/python/fastsim/tests/test_utils.py similarity index 100% rename from fastsim/tests/test_utils.py rename to python/fastsim/tests/test_utils.py diff --git a/fastsim/tests/test_vehicle.py b/python/fastsim/tests/test_vehicle.py similarity index 100% rename from fastsim/tests/test_vehicle.py rename to python/fastsim/tests/test_vehicle.py diff --git a/fastsim/tests/test_vs_excel.py b/python/fastsim/tests/test_vs_excel.py similarity index 100% rename from fastsim/tests/test_vs_excel.py rename to python/fastsim/tests/test_vs_excel.py diff --git a/fastsim/utilities.py b/python/fastsim/utilities.py similarity index 100% rename from fastsim/utilities.py rename to python/fastsim/utilities.py diff --git a/fastsim/vehicle.py b/python/fastsim/vehicle.py similarity index 100% rename from fastsim/vehicle.py rename to python/fastsim/vehicle.py diff --git a/fastsim/vehicle_base.py b/python/fastsim/vehicle_base.py similarity index 100% rename from fastsim/vehicle_base.py rename to python/fastsim/vehicle_base.py diff --git a/rust/fastsim-cli/src/bin/fastsim-cli.rs b/rust/fastsim-cli/src/bin/fastsim-cli.rs index d4f3ef96..d15c95a9 100644 --- a/rust/fastsim-cli/src/bin/fastsim-cli.rs +++ b/rust/fastsim-cli/src/bin/fastsim-cli.rs @@ -301,6 +301,8 @@ pub fn main() { main_separator!(), "..", main_separator!(), + "python", + main_separator!(), "fastsim", main_separator!(), "resources", diff --git a/rust/fastsim-cli/tests/integration-tests.rs b/rust/fastsim-cli/tests/integration-tests.rs index 09611e8f..48d794c0 100644 --- a/rust/fastsim-cli/tests/integration-tests.rs +++ b/rust/fastsim-cli/tests/integration-tests.rs @@ -8,12 +8,12 @@ use predicates::prelude::predicate; fn test_that_cli_app_produces_result() -> Result<(), Box> { let mut cmd = Command::cargo_bin("fastsim-cli")?; let mut cyc_file = project_root::get_project_root().unwrap(); - cyc_file.push(Path::new("../fastsim/resources/cycles/udds.csv")); + cyc_file.push(Path::new("../python/fastsim/resources/cycles/udds.csv")); cyc_file = cyc_file.canonicalize().unwrap(); assert!(cyc_file.exists()); let mut veh_file = project_root::get_project_root().unwrap(); veh_file.push(Path::new( - "../fastsim/resources/vehdb/2012_Ford_Fusion.yaml", + "../python/fastsim/resources/vehdb/2012_Ford_Fusion.yaml", )); veh_file = veh_file.canonicalize().unwrap(); assert!(veh_file.exists()); diff --git a/rust/fastsim-core/src/cycle.rs b/rust/fastsim-core/src/cycle.rs index 04cfb364..9cfce43d 100644 --- a/rust/fastsim-core/src/cycle.rs +++ b/rust/fastsim-core/src/cycle.rs @@ -1081,7 +1081,7 @@ mod tests { #[test] fn test_loading_a_cycle_from_the_filesystem() { - let pathstr = String::from("../../fastsim/resources/cycles/udds.csv"); + let pathstr = String::from("../../python/fastsim/resources/cycles/udds.csv"); let expected_udds_length: usize = 1370; let cyc = RustCycle::from_csv_file(&pathstr).unwrap(); assert_eq!(cyc.name, String::from("udds")); diff --git a/rust/fastsim-core/src/params.rs b/rust/fastsim-core/src/params.rs index fcae3d02..69c8d8fa 100644 --- a/rust/fastsim-core/src/params.rs +++ b/rust/fastsim-core/src/params.rs @@ -151,7 +151,7 @@ pub struct AdjCoef { impl Default for RustLongParams { fn default() -> Self { - let long_params_str: &str = include_str!("../../../fastsim/resources/longparams.json"); + let long_params_str: &str = include_str!("../../../python/fastsim/resources/longparams.json"); let long_params: Self = from_str(long_params_str).unwrap(); return long_params; } diff --git a/rust/fastsim-core/src/simdrivelabel.rs b/rust/fastsim-core/src/simdrivelabel.rs index 4061e655..b701a6c5 100644 --- a/rust/fastsim-core/src/simdrivelabel.rs +++ b/rust/fastsim-core/src/simdrivelabel.rs @@ -194,6 +194,8 @@ pub fn get_label_fe( main_separator!(), "..", main_separator!(), + "python", + main_separator!(), "fastsim", main_separator!(), "resources", @@ -209,6 +211,8 @@ pub fn get_label_fe( main_separator!(), "..", main_separator!(), + "python", + main_separator!(), "fastsim", main_separator!(), "resources", diff --git a/rust/fastsim-core/src/utils.rs b/rust/fastsim-core/src/utils.rs index 6b35f3c4..b12bc254 100644 --- a/rust/fastsim-core/src/utils.rs +++ b/rust/fastsim-core/src/utils.rs @@ -8,7 +8,7 @@ use crate::pyo3imports::*; #[cfg(test)] pub fn resources_path() -> PathBuf { - let pb = PathBuf::from("../../fastsim/resources"); + let pb = PathBuf::from("../../python/fastsim/resources"); assert!(pb.exists()); pb } diff --git a/rust/fastsim-py/pyproject.toml b/rust/fastsim-py/pyproject.toml deleted file mode 100644 index 58656e3d..00000000 --- a/rust/fastsim-py/pyproject.toml +++ /dev/null @@ -1,20 +0,0 @@ -[build-system] -requires = ["maturin>=0.12,<0.13"] -build-backend = "maturin" - -# Setting `python-source = "python"` did not seem to work, possibly due to the fact that `fastsim-py` is -# being compiled as `fastsimrust`, which may be bad practice. Placing `fastsimrust.pyi` in parallel with -# this file results in generation of a stub file in the appropriate site package. Also, when `python-source` -# is not explicitly provided, the compiled executable that python uses lives in site-packages/fastsimrust, -# which is convenient because then `pip uninstall fastsimrust` kills that file. -# [package.metadata.maturin] -# python-source = "python" - -[project] -name = "fastsimrust" -requires-python = ">=3.8" -classifiers = [ - "Programming Language :: Rust", - "Programming Language :: Python :: Implementation :: CPython", - "Programming Language :: Python :: Implementation :: PyPy", -] \ No newline at end of file diff --git a/setup.py b/setup.py deleted file mode 100644 index 2db88fd9..00000000 --- a/setup.py +++ /dev/null @@ -1,34 +0,0 @@ -""" -PyPI setup script. To use it, run `python setup.py sdist bdist_wheel` from this directory. -""" - -import setuptools -from setuptools_rust import RustExtension, Binding - -import os -import sys -develop_mode = os.environ.get("DEVELOP_MODE", False) -if develop_mode: - rust_extensions = [] - print("make sure to install the rust extensions manually\n cd rust; maturin develop;") -else: - rust_extensions = [ - RustExtension( - "fastsimrust", - "rust/fastsim-py/Cargo.toml", - binding=Binding.PyO3, - py_limited_api=True, - ), - ] - -with open("README.md", "r") as fh: - long_description = fh.read() - -setuptools.setup( - # rust extension - rust_extensions=rust_extensions, - include_package_data=True, - data_files=[ - ("fastsim", ["README.md", "LICENSE.md"]), - ] -) From 1bd1baa0e2163b4a5ced415515255b03c1eea1c3 Mon Sep 17 00:00:00 2001 From: Chad Baker Date: Thu, 25 May 2023 13:29:42 -0600 Subject: [PATCH 2/4] made use of `resources_path()` --- rust/fastsim-core/src/cycle.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rust/fastsim-core/src/cycle.rs b/rust/fastsim-core/src/cycle.rs index 9cfce43d..fe20adfd 100644 --- a/rust/fastsim-core/src/cycle.rs +++ b/rust/fastsim-core/src/cycle.rs @@ -1081,9 +1081,10 @@ mod tests { #[test] fn test_loading_a_cycle_from_the_filesystem() { - let pathstr = String::from("../../python/fastsim/resources/cycles/udds.csv"); + let mut cyc_file_path = resources_path(); + cyc_file_path.push("cycles/udds.csv"); let expected_udds_length: usize = 1370; - let cyc = RustCycle::from_csv_file(&pathstr).unwrap(); + let cyc = RustCycle::from_csv_file(cyc_file_path.as_os_str().to_str().unwrap()).unwrap(); assert_eq!(cyc.name, String::from("udds")); let num_entries = cyc.time_s.len(); assert!(num_entries > 0); From fd587c2fc52c67664f16001ddc6ffdaedf2302e6 Mon Sep 17 00:00:00 2001 From: Chad Baker Date: Thu, 25 May 2023 14:28:56 -0600 Subject: [PATCH 3/4] fixed path to `tests/` in yaml files --- .github/workflows/release.yaml | 2 +- .github/workflows/tests.yaml | 2 +- .github/workflows/wheels.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index bbf67d87..7eddf476 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -69,7 +69,7 @@ jobs: CIBW_SKIP: "*-win32 *-musllinux* *i686 *ppc64le *s390x *aarch64" CIBW_PLATFORM: ${{ matrix.platform || matrix.os }} CIBW_TEST_REQUIRES: "pytest" - CIBW_TEST_COMMAND: "pytest -v {project}/fastsim/tests" + CIBW_TEST_COMMAND: "pytest -v {project}/python/fastsim/tests" CIBW_ARCHS_MACOS: 'universal2' # see https://cibuildwheel.readthedocs.io/en/stable/faq/#universal2 CIBW_TEST_SKIP: '*_universal2:arm64' diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 58760bf5..4e961e3f 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -38,4 +38,4 @@ jobs: run: | pip install setuptools_rust pytest plotly pip install . - pytest -v fastsim/tests/ + pytest -v python/fastsim/tests/ diff --git a/.github/workflows/wheels.yaml b/.github/workflows/wheels.yaml index f50a1aa2..1b233abc 100644 --- a/.github/workflows/wheels.yaml +++ b/.github/workflows/wheels.yaml @@ -68,7 +68,7 @@ jobs: CIBW_SKIP: "*-win32 *-musllinux* *i686 *ppc64le *s390x *aarch64" CIBW_PLATFORM: ${{ matrix.platform || matrix.os }} CIBW_TEST_REQUIRES: "pytest" - CIBW_TEST_COMMAND: "pytest -v {project}/fastsim/tests" + CIBW_TEST_COMMAND: "pytest -v {project}/python/fastsim/tests" CIBW_ARCHS_MACOS: 'universal2' # see https://cibuildwheel.readthedocs.io/en/stable/faq/#universal2 CIBW_TEST_SKIP: '*_universal2:arm64' From 1a80d7ad64ccb3822168f18183507e0bb239d485 Mon Sep 17 00:00:00 2001 From: Chad Baker Date: Thu, 25 May 2023 15:53:39 -0600 Subject: [PATCH 4/4] trying to fix tests on server --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 03e3b8d3..30538cbd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ namespaces = false # to disable scanning PEP 420 namespaces (true by default) [tool.maturin] python-source="python" features = ["pyo3/extension-module"] -module-name = "fastsim.fastsimrust" +module-name = "fastsimrust" manifest-path = "rust/fastsim-py/Cargo.toml" include = [ { format = "sdist", path = "rust/fastsim-core/Cargo.toml"},