From ea75bf17d43e70fa434c4dd91f5a5f97fa1bd97c Mon Sep 17 00:00:00 2001 From: Rafael M Mudafort Date: Sun, 27 Feb 2022 12:06:56 -0600 Subject: [PATCH] Fix the deployment infrastructure (#343) * Move version file into the src dir * Fix setuptools package search * Update version to 3.0rc4 * Move floris package to root * Update pull request template --- .github/PULL_REQUEST_TEMPLATE.md | 24 +++++++++++++------ README.md | 2 +- VERSION | 1 - docs/index.md | 2 +- floris/VERSION | 1 + {src/floris => floris}/__init__.py | 2 +- {src/floris => floris}/logging_manager.py | 0 {src/floris => floris}/simulation/__init__.py | 0 {src/floris => floris}/simulation/base.py | 0 {src/floris => floris}/simulation/farm.py | 0 {src/floris => floris}/simulation/floris.py | 0 .../simulation/flow_field.py | 0 {src/floris => floris}/simulation/grid.py | 0 {src/floris => floris}/simulation/solver.py | 0 {src/floris => floris}/simulation/turbine.py | 0 {src/floris => floris}/simulation/wake.py | 0 .../simulation/wake_combination/__init__.py | 0 .../simulation/wake_combination/fls.py | 0 .../simulation/wake_combination/max.py | 0 .../simulation/wake_combination/sosfs.py | 0 .../simulation/wake_deflection/__init__.py | 0 .../simulation/wake_deflection/curl.py | 0 .../simulation/wake_deflection/gauss.py | 0 .../simulation/wake_deflection/jimenez.py | 0 .../simulation/wake_turbulence/__init__.py | 0 .../wake_turbulence/crespo_hernandez.py | 0 .../simulation/wake_velocity/__init__.py | 0 .../wake_velocity/cumulative_gauss_curl.py | 0 .../simulation/wake_velocity/gauss.py | 0 .../simulation/wake_velocity/jensen.py | 0 {src/floris => floris}/tools/__init__.py | 0 .../tools/cc_blade_utilities.py | 0 {src/floris => floris}/tools/cut_plane.py | 0 {src/floris => floris}/tools/energy_ratio.py | 0 .../tools/energy_ratio_single.py | 0 .../tools/energy_wake_loss.py | 0 .../tools/floris_interface.py | 0 {src/floris => floris}/tools/flow_data.py | 0 .../tools/interface_utilities.py | 0 .../tools/layout_functions.py | 0 .../tools/optimization/__init__.py | 0 .../tools/optimization/other/__init__.py | 0 .../tools/optimization/other/boundary_grid.py | 0 .../optimization/pyoptsparse/__init__.py | 0 .../tools/optimization/pyoptsparse/layout.py | 0 .../optimization/pyoptsparse/optimization.py | 0 .../optimization/pyoptsparse/power_density.py | 0 .../tools/optimization/pyoptsparse/yaw.py | 0 .../tools/optimization/scipy/__init__.py | 0 .../tools/optimization/scipy/base_COE.py | 0 .../optimization/scipy/cluster_turbines.py | 0 .../scipy/derive_downstream_turbines.py | 0 .../tools/optimization/scipy/layout.py | 0 .../tools/optimization/scipy/layout_height.py | 0 .../tools/optimization/scipy/optimization.py | 0 .../tools/optimization/scipy/power_density.py | 0 .../optimization/scipy/power_density_1D.py | 0 .../tools/optimization/scipy/yaw.py | 0 .../tools/optimization/scipy/yaw_clustered.py | 0 .../tools/optimization/scipy/yaw_wind_rose.py | 0 .../scipy/yaw_wind_rose_clustered.py | 0 .../scipy/yaw_wind_rose_parallel.py | 0 .../scipy/yaw_wind_rose_parallel_clustered.py | 0 .../yaw_optimization/yaw_optimization_base.py | 0 .../yaw_optimization_tools.py | 0 .../yaw_optimization/yaw_optimizer_scipy.py | 0 .../yaw_optimization/yaw_optimizer_sr.py | 0 {src/floris => floris}/tools/plotting.py | 0 {src/floris => floris}/tools/power_rose.py | 0 {src/floris => floris}/tools/rews.py | 0 .../tools/sowfa_utilities.py | 0 {src/floris => floris}/tools/visualization.py | 0 {src/floris => floris}/tools/wind_rose.py | 0 {src/floris => floris}/type_dec.py | 0 {src/floris => floris}/utilities.py | 0 pyproject.toml | 2 +- setup.py | 12 +++------- 77 files changed, 25 insertions(+), 21 deletions(-) delete mode 100644 VERSION create mode 100644 floris/VERSION rename {src/floris => floris}/__init__.py (89%) rename {src/floris => floris}/logging_manager.py (100%) rename {src/floris => floris}/simulation/__init__.py (100%) rename {src/floris => floris}/simulation/base.py (100%) rename {src/floris => floris}/simulation/farm.py (100%) rename {src/floris => floris}/simulation/floris.py (100%) rename {src/floris => floris}/simulation/flow_field.py (100%) rename {src/floris => floris}/simulation/grid.py (100%) rename {src/floris => floris}/simulation/solver.py (100%) rename {src/floris => floris}/simulation/turbine.py (100%) rename {src/floris => floris}/simulation/wake.py (100%) rename {src/floris => floris}/simulation/wake_combination/__init__.py (100%) rename {src/floris => floris}/simulation/wake_combination/fls.py (100%) rename {src/floris => floris}/simulation/wake_combination/max.py (100%) rename {src/floris => floris}/simulation/wake_combination/sosfs.py (100%) rename {src/floris => floris}/simulation/wake_deflection/__init__.py (100%) rename {src/floris => floris}/simulation/wake_deflection/curl.py (100%) rename {src/floris => floris}/simulation/wake_deflection/gauss.py (100%) rename {src/floris => floris}/simulation/wake_deflection/jimenez.py (100%) rename {src/floris => floris}/simulation/wake_turbulence/__init__.py (100%) rename {src/floris => floris}/simulation/wake_turbulence/crespo_hernandez.py (100%) rename {src/floris => floris}/simulation/wake_velocity/__init__.py (100%) rename {src/floris => floris}/simulation/wake_velocity/cumulative_gauss_curl.py (100%) rename {src/floris => floris}/simulation/wake_velocity/gauss.py (100%) rename {src/floris => floris}/simulation/wake_velocity/jensen.py (100%) rename {src/floris => floris}/tools/__init__.py (100%) rename {src/floris => floris}/tools/cc_blade_utilities.py (100%) rename {src/floris => floris}/tools/cut_plane.py (100%) rename {src/floris => floris}/tools/energy_ratio.py (100%) rename {src/floris => floris}/tools/energy_ratio_single.py (100%) rename {src/floris => floris}/tools/energy_wake_loss.py (100%) rename {src/floris => floris}/tools/floris_interface.py (100%) rename {src/floris => floris}/tools/flow_data.py (100%) rename {src/floris => floris}/tools/interface_utilities.py (100%) rename {src/floris => floris}/tools/layout_functions.py (100%) rename {src/floris => floris}/tools/optimization/__init__.py (100%) rename {src/floris => floris}/tools/optimization/other/__init__.py (100%) rename {src/floris => floris}/tools/optimization/other/boundary_grid.py (100%) rename {src/floris => floris}/tools/optimization/pyoptsparse/__init__.py (100%) rename {src/floris => floris}/tools/optimization/pyoptsparse/layout.py (100%) rename {src/floris => floris}/tools/optimization/pyoptsparse/optimization.py (100%) rename {src/floris => floris}/tools/optimization/pyoptsparse/power_density.py (100%) rename {src/floris => floris}/tools/optimization/pyoptsparse/yaw.py (100%) rename {src/floris => floris}/tools/optimization/scipy/__init__.py (100%) rename {src/floris => floris}/tools/optimization/scipy/base_COE.py (100%) rename {src/floris => floris}/tools/optimization/scipy/cluster_turbines.py (100%) rename {src/floris => floris}/tools/optimization/scipy/derive_downstream_turbines.py (100%) rename {src/floris => floris}/tools/optimization/scipy/layout.py (100%) rename {src/floris => floris}/tools/optimization/scipy/layout_height.py (100%) rename {src/floris => floris}/tools/optimization/scipy/optimization.py (100%) rename {src/floris => floris}/tools/optimization/scipy/power_density.py (100%) rename {src/floris => floris}/tools/optimization/scipy/power_density_1D.py (100%) rename {src/floris => floris}/tools/optimization/scipy/yaw.py (100%) rename {src/floris => floris}/tools/optimization/scipy/yaw_clustered.py (100%) rename {src/floris => floris}/tools/optimization/scipy/yaw_wind_rose.py (100%) rename {src/floris => floris}/tools/optimization/scipy/yaw_wind_rose_clustered.py (100%) rename {src/floris => floris}/tools/optimization/scipy/yaw_wind_rose_parallel.py (100%) rename {src/floris => floris}/tools/optimization/scipy/yaw_wind_rose_parallel_clustered.py (100%) rename {src/floris => floris}/tools/optimization/yaw_optimization/yaw_optimization_base.py (100%) rename {src/floris => floris}/tools/optimization/yaw_optimization/yaw_optimization_tools.py (100%) rename {src/floris => floris}/tools/optimization/yaw_optimization/yaw_optimizer_scipy.py (100%) rename {src/floris => floris}/tools/optimization/yaw_optimization/yaw_optimizer_sr.py (100%) rename {src/floris => floris}/tools/plotting.py (100%) rename {src/floris => floris}/tools/power_rose.py (100%) rename {src/floris => floris}/tools/rews.py (100%) rename {src/floris => floris}/tools/sowfa_utilities.py (100%) rename {src/floris => floris}/tools/visualization.py (100%) rename {src/floris => floris}/tools/wind_rose.py (100%) rename {src/floris => floris}/type_dec.py (100%) rename {src/floris => floris}/utilities.py (100%) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f31304e65..686c0f738 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,18 +1,28 @@ -**Complete this sentence** -THIS PULL REQUEST __ [IS/IS NOT] __ READY TO MERGE + + + **Feature or improvement description** - + **Related issue, if one exists** - + **Impacted areas of the software** - + **Additional supporting information** - + **Test results, if applicable** - + + + \ No newline at end of file diff --git a/README.md b/README.md index 93a6d2df5..87492fe67 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ and importing FLORIS: 3.0rc2 FILE - ~/floris/src/floris/__init__.py + ~/floris/floris/__init__.py ``` It is important to regularly check for new updates and releases as new diff --git a/VERSION b/VERSION deleted file mode 100644 index 6ffd5359c..000000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.0rc2 diff --git a/docs/index.md b/docs/index.md index fccc97eca..bbe65f2b8 100644 --- a/docs/index.md +++ b/docs/index.md @@ -76,7 +76,7 @@ and importing FLORIS: 3.0rc2 FILE - ~/floris/src/floris/__init__.py + ~/floris/floris/__init__.py ``` It is important to regularly check for new updates and releases as new diff --git a/floris/VERSION b/floris/VERSION new file mode 100644 index 000000000..139d7c5cf --- /dev/null +++ b/floris/VERSION @@ -0,0 +1 @@ +3.0rc4 diff --git a/src/floris/__init__.py b/floris/__init__.py similarity index 89% rename from src/floris/__init__.py rename to floris/__init__.py index 91ed5df44..670b27fda 100644 --- a/src/floris/__init__.py +++ b/floris/__init__.py @@ -14,5 +14,5 @@ from pathlib import Path -with open(Path(__file__).parent.parent.parent / "VERSION") as _version_file: +with open(Path(__file__).parent / "VERSION") as _version_file: __version__ = _version_file.read().strip() diff --git a/src/floris/logging_manager.py b/floris/logging_manager.py similarity index 100% rename from src/floris/logging_manager.py rename to floris/logging_manager.py diff --git a/src/floris/simulation/__init__.py b/floris/simulation/__init__.py similarity index 100% rename from src/floris/simulation/__init__.py rename to floris/simulation/__init__.py diff --git a/src/floris/simulation/base.py b/floris/simulation/base.py similarity index 100% rename from src/floris/simulation/base.py rename to floris/simulation/base.py diff --git a/src/floris/simulation/farm.py b/floris/simulation/farm.py similarity index 100% rename from src/floris/simulation/farm.py rename to floris/simulation/farm.py diff --git a/src/floris/simulation/floris.py b/floris/simulation/floris.py similarity index 100% rename from src/floris/simulation/floris.py rename to floris/simulation/floris.py diff --git a/src/floris/simulation/flow_field.py b/floris/simulation/flow_field.py similarity index 100% rename from src/floris/simulation/flow_field.py rename to floris/simulation/flow_field.py diff --git a/src/floris/simulation/grid.py b/floris/simulation/grid.py similarity index 100% rename from src/floris/simulation/grid.py rename to floris/simulation/grid.py diff --git a/src/floris/simulation/solver.py b/floris/simulation/solver.py similarity index 100% rename from src/floris/simulation/solver.py rename to floris/simulation/solver.py diff --git a/src/floris/simulation/turbine.py b/floris/simulation/turbine.py similarity index 100% rename from src/floris/simulation/turbine.py rename to floris/simulation/turbine.py diff --git a/src/floris/simulation/wake.py b/floris/simulation/wake.py similarity index 100% rename from src/floris/simulation/wake.py rename to floris/simulation/wake.py diff --git a/src/floris/simulation/wake_combination/__init__.py b/floris/simulation/wake_combination/__init__.py similarity index 100% rename from src/floris/simulation/wake_combination/__init__.py rename to floris/simulation/wake_combination/__init__.py diff --git a/src/floris/simulation/wake_combination/fls.py b/floris/simulation/wake_combination/fls.py similarity index 100% rename from src/floris/simulation/wake_combination/fls.py rename to floris/simulation/wake_combination/fls.py diff --git a/src/floris/simulation/wake_combination/max.py b/floris/simulation/wake_combination/max.py similarity index 100% rename from src/floris/simulation/wake_combination/max.py rename to floris/simulation/wake_combination/max.py diff --git a/src/floris/simulation/wake_combination/sosfs.py b/floris/simulation/wake_combination/sosfs.py similarity index 100% rename from src/floris/simulation/wake_combination/sosfs.py rename to floris/simulation/wake_combination/sosfs.py diff --git a/src/floris/simulation/wake_deflection/__init__.py b/floris/simulation/wake_deflection/__init__.py similarity index 100% rename from src/floris/simulation/wake_deflection/__init__.py rename to floris/simulation/wake_deflection/__init__.py diff --git a/src/floris/simulation/wake_deflection/curl.py b/floris/simulation/wake_deflection/curl.py similarity index 100% rename from src/floris/simulation/wake_deflection/curl.py rename to floris/simulation/wake_deflection/curl.py diff --git a/src/floris/simulation/wake_deflection/gauss.py b/floris/simulation/wake_deflection/gauss.py similarity index 100% rename from src/floris/simulation/wake_deflection/gauss.py rename to floris/simulation/wake_deflection/gauss.py diff --git a/src/floris/simulation/wake_deflection/jimenez.py b/floris/simulation/wake_deflection/jimenez.py similarity index 100% rename from src/floris/simulation/wake_deflection/jimenez.py rename to floris/simulation/wake_deflection/jimenez.py diff --git a/src/floris/simulation/wake_turbulence/__init__.py b/floris/simulation/wake_turbulence/__init__.py similarity index 100% rename from src/floris/simulation/wake_turbulence/__init__.py rename to floris/simulation/wake_turbulence/__init__.py diff --git a/src/floris/simulation/wake_turbulence/crespo_hernandez.py b/floris/simulation/wake_turbulence/crespo_hernandez.py similarity index 100% rename from src/floris/simulation/wake_turbulence/crespo_hernandez.py rename to floris/simulation/wake_turbulence/crespo_hernandez.py diff --git a/src/floris/simulation/wake_velocity/__init__.py b/floris/simulation/wake_velocity/__init__.py similarity index 100% rename from src/floris/simulation/wake_velocity/__init__.py rename to floris/simulation/wake_velocity/__init__.py diff --git a/src/floris/simulation/wake_velocity/cumulative_gauss_curl.py b/floris/simulation/wake_velocity/cumulative_gauss_curl.py similarity index 100% rename from src/floris/simulation/wake_velocity/cumulative_gauss_curl.py rename to floris/simulation/wake_velocity/cumulative_gauss_curl.py diff --git a/src/floris/simulation/wake_velocity/gauss.py b/floris/simulation/wake_velocity/gauss.py similarity index 100% rename from src/floris/simulation/wake_velocity/gauss.py rename to floris/simulation/wake_velocity/gauss.py diff --git a/src/floris/simulation/wake_velocity/jensen.py b/floris/simulation/wake_velocity/jensen.py similarity index 100% rename from src/floris/simulation/wake_velocity/jensen.py rename to floris/simulation/wake_velocity/jensen.py diff --git a/src/floris/tools/__init__.py b/floris/tools/__init__.py similarity index 100% rename from src/floris/tools/__init__.py rename to floris/tools/__init__.py diff --git a/src/floris/tools/cc_blade_utilities.py b/floris/tools/cc_blade_utilities.py similarity index 100% rename from src/floris/tools/cc_blade_utilities.py rename to floris/tools/cc_blade_utilities.py diff --git a/src/floris/tools/cut_plane.py b/floris/tools/cut_plane.py similarity index 100% rename from src/floris/tools/cut_plane.py rename to floris/tools/cut_plane.py diff --git a/src/floris/tools/energy_ratio.py b/floris/tools/energy_ratio.py similarity index 100% rename from src/floris/tools/energy_ratio.py rename to floris/tools/energy_ratio.py diff --git a/src/floris/tools/energy_ratio_single.py b/floris/tools/energy_ratio_single.py similarity index 100% rename from src/floris/tools/energy_ratio_single.py rename to floris/tools/energy_ratio_single.py diff --git a/src/floris/tools/energy_wake_loss.py b/floris/tools/energy_wake_loss.py similarity index 100% rename from src/floris/tools/energy_wake_loss.py rename to floris/tools/energy_wake_loss.py diff --git a/src/floris/tools/floris_interface.py b/floris/tools/floris_interface.py similarity index 100% rename from src/floris/tools/floris_interface.py rename to floris/tools/floris_interface.py diff --git a/src/floris/tools/flow_data.py b/floris/tools/flow_data.py similarity index 100% rename from src/floris/tools/flow_data.py rename to floris/tools/flow_data.py diff --git a/src/floris/tools/interface_utilities.py b/floris/tools/interface_utilities.py similarity index 100% rename from src/floris/tools/interface_utilities.py rename to floris/tools/interface_utilities.py diff --git a/src/floris/tools/layout_functions.py b/floris/tools/layout_functions.py similarity index 100% rename from src/floris/tools/layout_functions.py rename to floris/tools/layout_functions.py diff --git a/src/floris/tools/optimization/__init__.py b/floris/tools/optimization/__init__.py similarity index 100% rename from src/floris/tools/optimization/__init__.py rename to floris/tools/optimization/__init__.py diff --git a/src/floris/tools/optimization/other/__init__.py b/floris/tools/optimization/other/__init__.py similarity index 100% rename from src/floris/tools/optimization/other/__init__.py rename to floris/tools/optimization/other/__init__.py diff --git a/src/floris/tools/optimization/other/boundary_grid.py b/floris/tools/optimization/other/boundary_grid.py similarity index 100% rename from src/floris/tools/optimization/other/boundary_grid.py rename to floris/tools/optimization/other/boundary_grid.py diff --git a/src/floris/tools/optimization/pyoptsparse/__init__.py b/floris/tools/optimization/pyoptsparse/__init__.py similarity index 100% rename from src/floris/tools/optimization/pyoptsparse/__init__.py rename to floris/tools/optimization/pyoptsparse/__init__.py diff --git a/src/floris/tools/optimization/pyoptsparse/layout.py b/floris/tools/optimization/pyoptsparse/layout.py similarity index 100% rename from src/floris/tools/optimization/pyoptsparse/layout.py rename to floris/tools/optimization/pyoptsparse/layout.py diff --git a/src/floris/tools/optimization/pyoptsparse/optimization.py b/floris/tools/optimization/pyoptsparse/optimization.py similarity index 100% rename from src/floris/tools/optimization/pyoptsparse/optimization.py rename to floris/tools/optimization/pyoptsparse/optimization.py diff --git a/src/floris/tools/optimization/pyoptsparse/power_density.py b/floris/tools/optimization/pyoptsparse/power_density.py similarity index 100% rename from src/floris/tools/optimization/pyoptsparse/power_density.py rename to floris/tools/optimization/pyoptsparse/power_density.py diff --git a/src/floris/tools/optimization/pyoptsparse/yaw.py b/floris/tools/optimization/pyoptsparse/yaw.py similarity index 100% rename from src/floris/tools/optimization/pyoptsparse/yaw.py rename to floris/tools/optimization/pyoptsparse/yaw.py diff --git a/src/floris/tools/optimization/scipy/__init__.py b/floris/tools/optimization/scipy/__init__.py similarity index 100% rename from src/floris/tools/optimization/scipy/__init__.py rename to floris/tools/optimization/scipy/__init__.py diff --git a/src/floris/tools/optimization/scipy/base_COE.py b/floris/tools/optimization/scipy/base_COE.py similarity index 100% rename from src/floris/tools/optimization/scipy/base_COE.py rename to floris/tools/optimization/scipy/base_COE.py diff --git a/src/floris/tools/optimization/scipy/cluster_turbines.py b/floris/tools/optimization/scipy/cluster_turbines.py similarity index 100% rename from src/floris/tools/optimization/scipy/cluster_turbines.py rename to floris/tools/optimization/scipy/cluster_turbines.py diff --git a/src/floris/tools/optimization/scipy/derive_downstream_turbines.py b/floris/tools/optimization/scipy/derive_downstream_turbines.py similarity index 100% rename from src/floris/tools/optimization/scipy/derive_downstream_turbines.py rename to floris/tools/optimization/scipy/derive_downstream_turbines.py diff --git a/src/floris/tools/optimization/scipy/layout.py b/floris/tools/optimization/scipy/layout.py similarity index 100% rename from src/floris/tools/optimization/scipy/layout.py rename to floris/tools/optimization/scipy/layout.py diff --git a/src/floris/tools/optimization/scipy/layout_height.py b/floris/tools/optimization/scipy/layout_height.py similarity index 100% rename from src/floris/tools/optimization/scipy/layout_height.py rename to floris/tools/optimization/scipy/layout_height.py diff --git a/src/floris/tools/optimization/scipy/optimization.py b/floris/tools/optimization/scipy/optimization.py similarity index 100% rename from src/floris/tools/optimization/scipy/optimization.py rename to floris/tools/optimization/scipy/optimization.py diff --git a/src/floris/tools/optimization/scipy/power_density.py b/floris/tools/optimization/scipy/power_density.py similarity index 100% rename from src/floris/tools/optimization/scipy/power_density.py rename to floris/tools/optimization/scipy/power_density.py diff --git a/src/floris/tools/optimization/scipy/power_density_1D.py b/floris/tools/optimization/scipy/power_density_1D.py similarity index 100% rename from src/floris/tools/optimization/scipy/power_density_1D.py rename to floris/tools/optimization/scipy/power_density_1D.py diff --git a/src/floris/tools/optimization/scipy/yaw.py b/floris/tools/optimization/scipy/yaw.py similarity index 100% rename from src/floris/tools/optimization/scipy/yaw.py rename to floris/tools/optimization/scipy/yaw.py diff --git a/src/floris/tools/optimization/scipy/yaw_clustered.py b/floris/tools/optimization/scipy/yaw_clustered.py similarity index 100% rename from src/floris/tools/optimization/scipy/yaw_clustered.py rename to floris/tools/optimization/scipy/yaw_clustered.py diff --git a/src/floris/tools/optimization/scipy/yaw_wind_rose.py b/floris/tools/optimization/scipy/yaw_wind_rose.py similarity index 100% rename from src/floris/tools/optimization/scipy/yaw_wind_rose.py rename to floris/tools/optimization/scipy/yaw_wind_rose.py diff --git a/src/floris/tools/optimization/scipy/yaw_wind_rose_clustered.py b/floris/tools/optimization/scipy/yaw_wind_rose_clustered.py similarity index 100% rename from src/floris/tools/optimization/scipy/yaw_wind_rose_clustered.py rename to floris/tools/optimization/scipy/yaw_wind_rose_clustered.py diff --git a/src/floris/tools/optimization/scipy/yaw_wind_rose_parallel.py b/floris/tools/optimization/scipy/yaw_wind_rose_parallel.py similarity index 100% rename from src/floris/tools/optimization/scipy/yaw_wind_rose_parallel.py rename to floris/tools/optimization/scipy/yaw_wind_rose_parallel.py diff --git a/src/floris/tools/optimization/scipy/yaw_wind_rose_parallel_clustered.py b/floris/tools/optimization/scipy/yaw_wind_rose_parallel_clustered.py similarity index 100% rename from src/floris/tools/optimization/scipy/yaw_wind_rose_parallel_clustered.py rename to floris/tools/optimization/scipy/yaw_wind_rose_parallel_clustered.py diff --git a/src/floris/tools/optimization/yaw_optimization/yaw_optimization_base.py b/floris/tools/optimization/yaw_optimization/yaw_optimization_base.py similarity index 100% rename from src/floris/tools/optimization/yaw_optimization/yaw_optimization_base.py rename to floris/tools/optimization/yaw_optimization/yaw_optimization_base.py diff --git a/src/floris/tools/optimization/yaw_optimization/yaw_optimization_tools.py b/floris/tools/optimization/yaw_optimization/yaw_optimization_tools.py similarity index 100% rename from src/floris/tools/optimization/yaw_optimization/yaw_optimization_tools.py rename to floris/tools/optimization/yaw_optimization/yaw_optimization_tools.py diff --git a/src/floris/tools/optimization/yaw_optimization/yaw_optimizer_scipy.py b/floris/tools/optimization/yaw_optimization/yaw_optimizer_scipy.py similarity index 100% rename from src/floris/tools/optimization/yaw_optimization/yaw_optimizer_scipy.py rename to floris/tools/optimization/yaw_optimization/yaw_optimizer_scipy.py diff --git a/src/floris/tools/optimization/yaw_optimization/yaw_optimizer_sr.py b/floris/tools/optimization/yaw_optimization/yaw_optimizer_sr.py similarity index 100% rename from src/floris/tools/optimization/yaw_optimization/yaw_optimizer_sr.py rename to floris/tools/optimization/yaw_optimization/yaw_optimizer_sr.py diff --git a/src/floris/tools/plotting.py b/floris/tools/plotting.py similarity index 100% rename from src/floris/tools/plotting.py rename to floris/tools/plotting.py diff --git a/src/floris/tools/power_rose.py b/floris/tools/power_rose.py similarity index 100% rename from src/floris/tools/power_rose.py rename to floris/tools/power_rose.py diff --git a/src/floris/tools/rews.py b/floris/tools/rews.py similarity index 100% rename from src/floris/tools/rews.py rename to floris/tools/rews.py diff --git a/src/floris/tools/sowfa_utilities.py b/floris/tools/sowfa_utilities.py similarity index 100% rename from src/floris/tools/sowfa_utilities.py rename to floris/tools/sowfa_utilities.py diff --git a/src/floris/tools/visualization.py b/floris/tools/visualization.py similarity index 100% rename from src/floris/tools/visualization.py rename to floris/tools/visualization.py diff --git a/src/floris/tools/wind_rose.py b/floris/tools/wind_rose.py similarity index 100% rename from src/floris/tools/wind_rose.py rename to floris/tools/wind_rose.py diff --git a/src/floris/type_dec.py b/floris/type_dec.py similarity index 100% rename from src/floris/type_dec.py rename to floris/type_dec.py diff --git a/src/floris/utilities.py b/floris/utilities.py similarity index 100% rename from src/floris/utilities.py rename to floris/utilities.py diff --git a/pyproject.toml b/pyproject.toml index 4a64b22d6..598930934 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,7 +56,7 @@ known_third_party = [ "scipy", "attr" ] -known_first_party = ["floris", "src"] +known_first_party = ["floris"] combine_as_imports = true force_grid_wrap = 0 include_trailing_comma = true diff --git a/setup.py b/setup.py index d45ff10ea..206e6bca1 100644 --- a/setup.py +++ b/setup.py @@ -13,13 +13,7 @@ # See https://floris.readthedocs.io for documentation -# Note: To use the 'upload' functionality of this file, you must: -# $ pip install twine - -import io -import os from pathlib import Path - from setuptools import setup, find_packages @@ -56,7 +50,7 @@ } ROOT = Path(__file__).parent -with open(ROOT / "VERSION") as version_file: +with open(ROOT / "floris" / "VERSION") as version_file: VERSION = version_file.read().strip() setup( @@ -69,8 +63,8 @@ author_email=EMAIL, python_requires=REQUIRES_PYTHON, url=URL, - package_dir={"": "src"}, - packages=find_packages(where="src"), + packages=find_packages(exclude=["tests", "*.tests", "*.tests.*", "tests.*"]), + package_data={'floris': ['VERSION']}, install_requires=REQUIRED, extras_require=EXTRAS, include_package_data=True,