Skip to content
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.

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

Move modules #84

Merged
merged 2 commits into from
Apr 24, 2020
Merged

Move modules #84

merged 2 commits into from
Apr 24, 2020

Conversation

rouille
Copy link
Collaborator

@rouille rouille commented Apr 24, 2020

Purpose

Make PowerSimData independent of PreREISE.

Where to look

The constants module has been moved to PowerSimData. Import statements have been updated.

Time estimate

5 min

Note

All tests pass

(v1) [~/REM/PreREISE] (move_modules) brdo$ pytest . --verbose
================================================================ test session starts =================================================================
platform darwin -- Python 3.6.5, pytest-4.5.0, py-1.8.0, pluggy-0.13.0 -- /Users/brdo/PyEnv/REM/v1/bin/python
cachedir: .pytest_cache
rootdir: /Users/brdo/REM/PreREISE
collected 38 items                                                                                                                                   

prereise/gather/demanddata/eia/tests/test_clean_data.py::test_slope_interpolate PASSED                                                         [  2%]
prereise/gather/demanddata/eia/tests/test_get_eia_data.py::test_eia_download SKIPPED                                                           [  5%]
prereise/gather/demanddata/eia/tests/test_get_eia_data.py::test_from_excel PASSED                                                              [  7%]
prereise/gather/demanddata/eia/tests/test_map_ba.py::test_loadzone_mapping_case PASSED                                                         [ 10%]
prereise/gather/demanddata/eia/tests/test_map_ba.py::test_loadzone_mapping_has_equal_total_demand PASSED                                       [ 13%]
prereise/gather/demanddata/eia/tests/test_map_ba.py::test_transform_ba_to_region_sums_first_three_columns PASSED                               [ 15%]
prereise/gather/demanddata/eia/tests/test_map_ba.py::test_transform_ba_to_region_sums_first_columns_pairs PASSED                               [ 18%]
prereise/gather/solardata/tests/test_pv_tracking.py::test_state_type PASSED                                                                    [ 21%]
prereise/gather/solardata/tests/test_pv_tracking.py::test_state_exists PASSED                                                                  [ 23%]
prereise/gather/solardata/tests/test_pv_tracking.py::test_state_without_no_solar_return_none PASSED                                            [ 26%]
prereise/gather/solardata/tests/test_pv_tracking.py::test_state_with_solar_return_3ple PASSED                                                  [ 28%]
prereise/gather/solardata/tests/test_pv_tracking.py::test_sum_ratio_state_with_single_plant_and_tracking_system PASSED                         [ 31%]
prereise/gather/solardata/tests/test_pv_tracking.py::test_sum_ratio_state_with_single_plant_and_multiple_tracking_systems PASSED               [ 34%]
prereise/gather/solardata/tests/test_pv_tracking.py::test_sum_ratio_state_with_multiple_plants_and_tracking_systems PASSED                     [ 36%]
prereise/gather/solardata/tests/test_pv_tracking.py::test_ratio_state_with_single_plant_and_unique_tracking PASSED                             [ 39%]
prereise/gather/solardata/tests/test_pv_tracking.py::test_ratio_state_with_single_plant_and_multiple_tracking PASSED                           [ 42%]
prereise/gather/solardata/tests/test_pv_tracking.py::test_ratio_state_with_multiple_plants_and_tracking_systems PASSED                         [ 44%]
prereise/gather/tests/test_get_monthly_net_generation.py::test_get_monthly_net_generation PASSED                                               [ 47%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestBuildStateCurves::test_build_state_curves PASSED                                  [ 50%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestShiftTurbineCurve::test_shift_turbine_curve_higher_hub PASSED                     [ 52%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestShiftTurbineCurve::test_shift_turbine_curve_lower_hub PASSED                      [ 55%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestShiftTurbineCurve::test_shift_turbine_curve_sameheight_hub PASSED                 [ 57%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetPower::test_get_power_badstate_ten_different_default PASSED                    [ 60%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetPower::test_get_power_default_five PASSED                                      [ 63%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetPower::test_get_power_default_ten PASSED                                       [ 65%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetPower::test_get_power_default_thirty PASSED                                    [ 68%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetPower::test_get_power_default_twenty PASSED                                    [ 71%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetPower::test_get_power_default_zero PASSED                                      [ 73%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetPower::test_get_power_named_ten PASSED                                         [ 76%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetPower::test_get_power_named_ten2 PASSED                                        [ 78%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetForm860::test_bad_dir PASSED                                                   [ 81%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetForm860::test_bad_year PASSED                                                  [ 84%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetForm860::test_default_year PASSED                                              [ 86%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetForm860::test_good_year PASSED                                                 [ 89%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetForm860::test_year_str PASSED                                                  [ 92%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetTurbinePowerCurves::test_get_turbine_power_curves PASSED                       [ 94%]
prereise/gather/winddata/rap/tests/test_power_curves.py::TestGetStatePowerCurves::test_get_state_power_curves PASSED                           [ 97%]
prereise/gather/winddata/te_wind/tests/test_te_wind.py::test PASSED                                                                            [100%]

================================================================== warnings summary ==================================================================
prereise/gather/demanddata/eia/tests/test_get_eia_data.py::test_from_excel
prereise/gather/demanddata/eia/tests/test_get_eia_data.py::test_from_excel
prereise/gather/demanddata/eia/tests/test_get_eia_data.py::test_from_excel
prereise/gather/demanddata/eia/tests/test_get_eia_data.py::test_from_excel
prereise/gather/demanddata/eia/tests/test_get_eia_data.py::test_from_excel
prereise/gather/demanddata/eia/tests/test_get_eia_data.py::test_from_excel
  /Users/brdo/PyEnv/REM/v1/lib/python3.6/site-packages/xlrd/xlsx.py:266: PendingDeprecationWarning: This method will be removed in future versions.  Use 'tree.iter()' or 'list(tree.iter())' instead.
    for elem in self.tree.iter() if Element_has_iter else self.tree.getiterator():

prereise/gather/demanddata/eia/tests/test_get_eia_data.py::test_from_excel
prereise/gather/demanddata/eia/tests/test_get_eia_data.py::test_from_excel
prereise/gather/demanddata/eia/tests/test_get_eia_data.py::test_from_excel
  /Users/brdo/PyEnv/REM/v1/lib/python3.6/site-packages/xlrd/xlsx.py:312: PendingDeprecationWarning: This method will be removed in future versions.  Use 'tree.iter()' or 'list(tree.iter())' instead.
    for elem in self.tree.iter() if Element_has_iter else self.tree.getiterator():

prereise/gather/winddata/te_wind/tests/test_te_wind.py::test
  /Users/brdo/REM/PowerSimData/powersimdata/input/grid.py:99: DeprecationWarning: Grid property access is moving to dictionary indexing, i.e. grid['branch'] consistent with REISE.jl
    DeprecationWarning

-- Docs: https://docs.pytest.org/en/latest/warnings.html
================================================ 37 passed, 1 skipped, 10 warnings in 102.09 seconds =================================================

@rouille rouille added this to the Egg Hunt milestone Apr 24, 2020
Copy link
Contributor

@kasparm kasparm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.
One point: In a previous pr the call/add_path.m was not removed from setup.py.

@rouille
Copy link
Collaborator Author

rouille commented Apr 24, 2020

I take care of it tomorrow

@rouille rouille merged commit 9d44fc2 into develop Apr 24, 2020
@rouille rouille deleted the move_modules branch April 24, 2020 17:19
@ahurli ahurli mentioned this pull request Mar 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants