foxes 0.7.4.25__tar.gz → 0.8.1__tar.gz

{foxes-0.7.4.25/foxes.egg-info → foxes-0.8.1}/PKG-INFO

@@ -1,15 +1,23 @@
 Metadata-Version: 2.1
 Name: foxes
-Version: 0.7.4.25
+Version: 0.8.1
 Summary: Farm Optimization and eXtended yield Evaluation Software
 Author: Fraunhofer IWES
-Author-email: jonas.schmidt@iwes.fraunhofer.de
+Author-email: jonas.schulte@iwes.fraunhofer.de
 License: MIT
 Project-URL: Source Code, https://github.com/FraunhoferIWES/foxes
 Project-URL: Bug Tracker, https://github.com/FraunhoferIWES/foxes/issues
 Project-URL: Documentation, https://fraunhoferiwes.github.io/foxes.docs/index.html
 Keywords: Wind farm,Wake modelling,Wind farm optimization
+Classifier: Topic :: Scientific/Engineering
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Science/Research
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 4 - Beta
@@ -17,7 +25,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: matplotlib
-Requires-Dist: numpy<2
+Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: xarray
 Requires-Dist: dask
@@ -25,14 +33,14 @@ Requires-Dist: distributed
 Requires-Dist: scipy
 Requires-Dist: netcdf4
 Requires-Dist: windrose
-Requires-Dist: iwopy>=0.1.4
 Requires-Dist: pyarrow
 Provides-Extra: io
 Requires-Dist: windio>=1; extra == "io"
+Provides-Extra: opt
+Requires-Dist: foxes-opt; extra == "opt"
 Provides-Extra: test
 Requires-Dist: flake8; extra == "test"
 Requires-Dist: pytest; extra == "test"
-Requires-Dist: pymoo>=0.6; extra == "test"
 Provides-Extra: doc
 Requires-Dist: sphinx; extra == "doc"
 Requires-Dist: sphinx-immaterial; extra == "doc"
@@ -45,13 +53,14 @@ Provides-Extra: all
 Requires-Dist: windio>=1; extra == "all"
 Requires-Dist: flake8; extra == "all"
 Requires-Dist: pytest; extra == "all"
-Requires-Dist: pymoo>=0.6; extra == "all"
+Requires-Dist: foxes-opt; extra == "all"
 Requires-Dist: sphinx; extra == "all"
 Requires-Dist: sphinx-immaterial; extra == "all"
 Requires-Dist: nbsphinx; extra == "all"
 Requires-Dist: ipykernel; extra == "all"
 Requires-Dist: ipywidgets; extra == "all"
 Requires-Dist: m2r2; extra == "all"
+Requires-Dist: lxml_html_clean; extra == "all"
 Provides-Extra: scripts
 
 # Welcome to foxes
@@ -105,7 +114,7 @@ Evaluation Software"`
 }
  ```
 
-## Installation via pip
+## Requirements
 
 The supported Python versions are: 
 
@@ -115,125 +124,20 @@ The supported Python versions are:
 - `Python 3.11`
 - `Python 3.12`
 
-### Virtual Python environment
+## Installation
 
-First create a new `venv` environment, for example called `foxes` and located at `~/venv/foxes` (choose any other convenient name and location in your file system if you prefer), by
-
-```console
-python3 -m venv ~/venv/foxes
-```
-
-Then activate the environment every time you work with `foxes`, by
-
-```console
-source ~/venv/foxes/bin/activate
-```
-
-You can leave the environment by
-
-```console
-deactivate
-```
-
-The `pip` installation commands below should be executed within the active `foxes` environment.
-
-### Standard users
-
-As a standard user, you can install the latest release via [pip](https://pypi.org/project/foxes/) by
+Either install via pip:
 
 ```console
 pip install foxes
 ```
 
-This commands installs the version that correspond to the `main` branch at [github](https://github.com/FraunhoferIWES/foxes). Alternatively, you can decide to install the latest pre-release developments (non-stable) by
-
-```console
-pip install git+https://github.com/FraunhoferIWES/foxes@dev#egg=foxes
-```
-
-### Developers
-
-For developers using `pip`, simply invoke the `-e` flag in the installation command in your local clone:
-
-```console
-git clone https://github.com/FraunhoferIWES/foxes.git
-cd foxes
-pip install -e .
-```
-The last line makes sure that all your code changes are included whenever importing `foxes`. Concerning the `git clone` line, we actually recommend that you fork `foxes` on GitHub and then replace that command by cloning your fork instead.
-
-## Installation via conda
-
-The supported Python versions are: 
-
-- `Python 3.8`
-- `Python 3.9`
-- `Python 3.10`
-- `Python 3.11`
-- `Python 3.12`
-
-### Preparation (optional)
-
-It is strongly recommend to use the `libmamba` dependency solver instead of the default solver. Install it once by
-
-```console
-conda install conda-libmamba-solver -n base -c conda-forge
-```
-
-We recommend that you set this to be your default solver, by
-
-```console
-conda config --set solver libmamba
-```
-
-### Virtual Python environment
-
-First create a new `conda` environment, for example called `foxes`, by
-
-```console
-conda create -n foxes -c conda-forge
-```
-
-Then activate the environment every time you work with `foxes`, by
-
-```console
-conda activate foxes
-```
-
-You can leave the environment by
+Alternatively, install via conda:
 
 ```console
-conda deactivate
+conda install foxes -c conda-forge
 ```
 
-The `conda` installation commands below should be executed within the active `foxes` environment.
-
-### Standard users
-
-The `foxes` package is available on the channel [conda-forge](https://anaconda.org/conda-forge/foxes). You can install the latest version by
-
-```console
-conda install foxes -c conda-forge --solver=libmamba
-```
-
-The `--solver=libmamba` is optional. Note that it is not necessary if you have set the `libmamba` solver as your default, see above.
-
-### Developers
-
-For developers using `conda`, we recommend first installing foxes as described above, then removing only the `foxes` package while keeping the dependencies, and then adding `foxes` again from a git using `conda develop`:
-
-```console
-conda install foxes conda-build -c conda-forge --solver=libmamba
-conda remove foxes --force
-git clone https://github.com/FraunhoferIWES/foxes.git
-cd foxes
-conda develop .
-```
-
-The last line makes sure that all your code changes are included whenever importing `foxes`. The `--solver=libmamba` is optional. Note that it is not necessary if you have set the `libmamba` solver as your default, see above.
-
-Concerning the `git clone` line, we actually recommend that you fork `foxes` on GitHub and then replace that command by cloning your fork instead.
-
 ## Usage
 
 For detailed examples of how to run _foxes_, check the `examples` and `notebooks` folders in this repository. A minimal running example is the following, based on provided static `csv` data files:

{foxes-0.7.4.25 → foxes-0.8.1}/README.md

@@ -49,7 +49,7 @@ Evaluation Software"`
 }
  ```
 
-## Installation via pip
+## Requirements
 
 The supported Python versions are: 
 
@@ -59,125 +59,20 @@ The supported Python versions are:
 - `Python 3.11`
 - `Python 3.12`
 
-### Virtual Python environment
+## Installation
 
-First create a new `venv` environment, for example called `foxes` and located at `~/venv/foxes` (choose any other convenient name and location in your file system if you prefer), by
-
-```console
-python3 -m venv ~/venv/foxes
-```
-
-Then activate the environment every time you work with `foxes`, by
-
-```console
-source ~/venv/foxes/bin/activate
-```
-
-You can leave the environment by
-
-```console
-deactivate
-```
-
-The `pip` installation commands below should be executed within the active `foxes` environment.
-
-### Standard users
-
-As a standard user, you can install the latest release via [pip](https://pypi.org/project/foxes/) by
+Either install via pip:
 
 ```console
 pip install foxes
 ```
 
-This commands installs the version that correspond to the `main` branch at [github](https://github.com/FraunhoferIWES/foxes). Alternatively, you can decide to install the latest pre-release developments (non-stable) by
-
-```console
-pip install git+https://github.com/FraunhoferIWES/foxes@dev#egg=foxes
-```
-
-### Developers
-
-For developers using `pip`, simply invoke the `-e` flag in the installation command in your local clone:
-
-```console
-git clone https://github.com/FraunhoferIWES/foxes.git
-cd foxes
-pip install -e .
-```
-The last line makes sure that all your code changes are included whenever importing `foxes`. Concerning the `git clone` line, we actually recommend that you fork `foxes` on GitHub and then replace that command by cloning your fork instead.
-
-## Installation via conda
-
-The supported Python versions are: 
-
-- `Python 3.8`
-- `Python 3.9`
-- `Python 3.10`
-- `Python 3.11`
-- `Python 3.12`
-
-### Preparation (optional)
-
-It is strongly recommend to use the `libmamba` dependency solver instead of the default solver. Install it once by
-
-```console
-conda install conda-libmamba-solver -n base -c conda-forge
-```
-
-We recommend that you set this to be your default solver, by
-
-```console
-conda config --set solver libmamba
-```
-
-### Virtual Python environment
-
-First create a new `conda` environment, for example called `foxes`, by
-
-```console
-conda create -n foxes -c conda-forge
-```
-
-Then activate the environment every time you work with `foxes`, by
-
-```console
-conda activate foxes
-```
-
-You can leave the environment by
+Alternatively, install via conda:
 
 ```console
-conda deactivate
+conda install foxes -c conda-forge
 ```
 
-The `conda` installation commands below should be executed within the active `foxes` environment.
-
-### Standard users
-
-The `foxes` package is available on the channel [conda-forge](https://anaconda.org/conda-forge/foxes). You can install the latest version by
-
-```console
-conda install foxes -c conda-forge --solver=libmamba
-```
-
-The `--solver=libmamba` is optional. Note that it is not necessary if you have set the `libmamba` solver as your default, see above.
-
-### Developers
-
-For developers using `conda`, we recommend first installing foxes as described above, then removing only the `foxes` package while keeping the dependencies, and then adding `foxes` again from a git using `conda develop`:
-
-```console
-conda install foxes conda-build -c conda-forge --solver=libmamba
-conda remove foxes --force
-git clone https://github.com/FraunhoferIWES/foxes.git
-cd foxes
-conda develop .
-```
-
-The last line makes sure that all your code changes are included whenever importing `foxes`. The `--solver=libmamba` is optional. Note that it is not necessary if you have set the `libmamba` solver as your default, see above.
-
-Concerning the `git clone` line, we actually recommend that you fork `foxes` on GitHub and then replace that command by cloning your fork instead.
-
 ## Usage
 
 For detailed examples of how to run _foxes_, check the `examples` and `notebooks` folders in this repository. A minimal running example is the following, based on provided static `csv` data files:

foxes-0.8.1/foxes/VERSION

@@ -0,0 +1 @@
+0.8.1

{foxes-0.7.4.25 → foxes-0.8.1/foxes.egg-info}/PKG-INFO

@@ -1,15 +1,23 @@
 Metadata-Version: 2.1
 Name: foxes
-Version: 0.7.4.25
+Version: 0.8.1
 Summary: Farm Optimization and eXtended yield Evaluation Software
 Author: Fraunhofer IWES
-Author-email: jonas.schmidt@iwes.fraunhofer.de
+Author-email: jonas.schulte@iwes.fraunhofer.de
 License: MIT
 Project-URL: Source Code, https://github.com/FraunhoferIWES/foxes
 Project-URL: Bug Tracker, https://github.com/FraunhoferIWES/foxes/issues
 Project-URL: Documentation, https://fraunhoferiwes.github.io/foxes.docs/index.html
 Keywords: Wind farm,Wake modelling,Wind farm optimization
+Classifier: Topic :: Scientific/Engineering
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Science/Research
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 4 - Beta
@@ -17,7 +25,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: matplotlib
-Requires-Dist: numpy<2
+Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: xarray
 Requires-Dist: dask
@@ -25,14 +33,14 @@ Requires-Dist: distributed
 Requires-Dist: scipy
 Requires-Dist: netcdf4
 Requires-Dist: windrose
-Requires-Dist: iwopy>=0.1.4
 Requires-Dist: pyarrow
 Provides-Extra: io
 Requires-Dist: windio>=1; extra == "io"
+Provides-Extra: opt
+Requires-Dist: foxes-opt; extra == "opt"
 Provides-Extra: test
 Requires-Dist: flake8; extra == "test"
 Requires-Dist: pytest; extra == "test"
-Requires-Dist: pymoo>=0.6; extra == "test"
 Provides-Extra: doc
 Requires-Dist: sphinx; extra == "doc"
 Requires-Dist: sphinx-immaterial; extra == "doc"
@@ -45,13 +53,14 @@ Provides-Extra: all
 Requires-Dist: windio>=1; extra == "all"
 Requires-Dist: flake8; extra == "all"
 Requires-Dist: pytest; extra == "all"
-Requires-Dist: pymoo>=0.6; extra == "all"
+Requires-Dist: foxes-opt; extra == "all"
 Requires-Dist: sphinx; extra == "all"
 Requires-Dist: sphinx-immaterial; extra == "all"
 Requires-Dist: nbsphinx; extra == "all"
 Requires-Dist: ipykernel; extra == "all"
 Requires-Dist: ipywidgets; extra == "all"
 Requires-Dist: m2r2; extra == "all"
+Requires-Dist: lxml_html_clean; extra == "all"
 Provides-Extra: scripts
 
 # Welcome to foxes
@@ -105,7 +114,7 @@ Evaluation Software"`
 }
  ```
 
-## Installation via pip
+## Requirements
 
 The supported Python versions are: 
 
@@ -115,125 +124,20 @@ The supported Python versions are:
 - `Python 3.11`
 - `Python 3.12`
 
-### Virtual Python environment
+## Installation
 
-First create a new `venv` environment, for example called `foxes` and located at `~/venv/foxes` (choose any other convenient name and location in your file system if you prefer), by
-
-```console
-python3 -m venv ~/venv/foxes
-```
-
-Then activate the environment every time you work with `foxes`, by
-
-```console
-source ~/venv/foxes/bin/activate
-```
-
-You can leave the environment by
-
-```console
-deactivate
-```
-
-The `pip` installation commands below should be executed within the active `foxes` environment.
-
-### Standard users
-
-As a standard user, you can install the latest release via [pip](https://pypi.org/project/foxes/) by
+Either install via pip:
 
 ```console
 pip install foxes
 ```
 
-This commands installs the version that correspond to the `main` branch at [github](https://github.com/FraunhoferIWES/foxes). Alternatively, you can decide to install the latest pre-release developments (non-stable) by
-
-```console
-pip install git+https://github.com/FraunhoferIWES/foxes@dev#egg=foxes
-```
-
-### Developers
-
-For developers using `pip`, simply invoke the `-e` flag in the installation command in your local clone:
-
-```console
-git clone https://github.com/FraunhoferIWES/foxes.git
-cd foxes
-pip install -e .
-```
-The last line makes sure that all your code changes are included whenever importing `foxes`. Concerning the `git clone` line, we actually recommend that you fork `foxes` on GitHub and then replace that command by cloning your fork instead.
-
-## Installation via conda
-
-The supported Python versions are: 
-
-- `Python 3.8`
-- `Python 3.9`
-- `Python 3.10`
-- `Python 3.11`
-- `Python 3.12`
-
-### Preparation (optional)
-
-It is strongly recommend to use the `libmamba` dependency solver instead of the default solver. Install it once by
-
-```console
-conda install conda-libmamba-solver -n base -c conda-forge
-```
-
-We recommend that you set this to be your default solver, by
-
-```console
-conda config --set solver libmamba
-```
-
-### Virtual Python environment
-
-First create a new `conda` environment, for example called `foxes`, by
-
-```console
-conda create -n foxes -c conda-forge
-```
-
-Then activate the environment every time you work with `foxes`, by
-
-```console
-conda activate foxes
-```
-
-You can leave the environment by
+Alternatively, install via conda:
 
 ```console
-conda deactivate
+conda install foxes -c conda-forge
 ```
 
-The `conda` installation commands below should be executed within the active `foxes` environment.
-
-### Standard users
-
-The `foxes` package is available on the channel [conda-forge](https://anaconda.org/conda-forge/foxes). You can install the latest version by
-
-```console
-conda install foxes -c conda-forge --solver=libmamba
-```
-
-The `--solver=libmamba` is optional. Note that it is not necessary if you have set the `libmamba` solver as your default, see above.
-
-### Developers
-
-For developers using `conda`, we recommend first installing foxes as described above, then removing only the `foxes` package while keeping the dependencies, and then adding `foxes` again from a git using `conda develop`:
-
-```console
-conda install foxes conda-build -c conda-forge --solver=libmamba
-conda remove foxes --force
-git clone https://github.com/FraunhoferIWES/foxes.git
-cd foxes
-conda develop .
-```
-
-The last line makes sure that all your code changes are included whenever importing `foxes`. The `--solver=libmamba` is optional. Note that it is not necessary if you have set the `libmamba` solver as your default, see above.
-
-Concerning the `git clone` line, we actually recommend that you fork `foxes` on GitHub and then replace that command by cloning your fork instead.
-
 ## Usage
 
 For detailed examples of how to run _foxes_, check the `examples` and `notebooks` folders in this repository. A minimal running example is the following, based on provided static `csv` data files:

{foxes-0.7.4.25 → foxes-0.8.1}/foxes.egg-info/SOURCES.txt

@@ -199,32 +199,6 @@ foxes/models/wake_superpositions/ws_max.py
 foxes/models/wake_superpositions/ws_pow.py
 foxes/models/wake_superpositions/ws_product.py
 foxes/models/wake_superpositions/ws_quadratic.py
-foxes/opt/__init__.py
-foxes/opt/constraints/__init__.py
-foxes/opt/constraints/area_geometry.py
-foxes/opt/constraints/min_dist.py
-foxes/opt/core/__init__.py
-foxes/opt/core/farm_constraint.py
-foxes/opt/core/farm_objective.py
-foxes/opt/core/farm_opt_problem.py
-foxes/opt/core/farm_vars_problem.py
-foxes/opt/core/pop_states.py
-foxes/opt/objectives/__init__.py
-foxes/opt/objectives/farm_vars.py
-foxes/opt/objectives/max_n_turbines.py
-foxes/opt/problems/__init__.py
-foxes/opt/problems/opt_farm_vars.py
-foxes/opt/problems/layout/__init__.py
-foxes/opt/problems/layout/farm_layout.py
-foxes/opt/problems/layout/reggrids_layout.py
-foxes/opt/problems/layout/regular_layout.py
-foxes/opt/problems/layout/geom_layouts/__init__.py
-foxes/opt/problems/layout/geom_layouts/constraints.py
-foxes/opt/problems/layout/geom_layouts/geom_layout.py
-foxes/opt/problems/layout/geom_layouts/geom_layout_gridded.py
-foxes/opt/problems/layout/geom_layouts/geom_reggrid.py
-foxes/opt/problems/layout/geom_layouts/geom_reggrids.py
-foxes/opt/problems/layout/geom_layouts/objectives.py
 foxes/output/__init__.py
 foxes/output/animation.py
 foxes/output/calc_points.py

{foxes-0.7.4.25 → foxes-0.8.1}/foxes.egg-info/requires.txt

@@ -1,5 +1,5 @@
 matplotlib
-numpy<2
+numpy
 pandas
 xarray
 dask
@@ -7,20 +7,20 @@ distributed
 scipy
 netcdf4
 windrose
-iwopy>=0.1.4
 pyarrow
 
 [all]
 windio>=1
 flake8
 pytest
-pymoo>=0.6
+foxes-opt
 sphinx
 sphinx-immaterial
 nbsphinx
 ipykernel
 ipywidgets
 m2r2
+lxml_html_clean
 
 [doc]
 sphinx
@@ -34,9 +34,11 @@ lxml_html_clean
 [io]
 windio>=1
 
+[opt]
+foxes-opt
+
 [scripts]
 
 [test]
 flake8
 pytest
-pymoo>=0.6

{foxes-0.7.4.25 → foxes-0.8.1}/setup.cfg

@@ -2,7 +2,7 @@
 name = foxes
 version = file: foxes/VERSION
 author = Fraunhofer IWES
-author_email = jonas.schmidt@iwes.fraunhofer.de
+author_email = jonas.schulte@iwes.fraunhofer.de
 description = Farm Optimization and eXtended yield Evaluation Software
 keywords = Wind farm, Wake modelling, Wind farm optimization
 license = MIT
@@ -13,7 +13,15 @@ project_urls =
 	Bug Tracker = https://github.com/FraunhoferIWES/foxes/issues
 	Documentation = https://fraunhoferiwes.github.io/foxes.docs/index.html
 classifiers = 
+	Topic :: Scientific/Engineering
+	Intended Audience :: Developers
+	Intended Audience :: Science/Research
 	Programming Language :: Python :: 3
+	Programming Language :: Python :: 3.8
+	Programming Language :: Python :: 3.9
+	Programming Language :: Python :: 3.10
+	Programming Language :: Python :: 3.11
+	Programming Language :: Python :: 3.12
 	License :: OSI Approved :: MIT License
 	Operating System :: OS Independent
 	Development Status :: 4 - Beta
@@ -27,7 +35,7 @@ python_requires =
 	>=3.8
 install_requires = 
 	matplotlib
-	numpy<2
+	numpy
 	pandas
 	xarray
 	dask
@@ -35,16 +43,16 @@ install_requires =
 	scipy
 	netcdf4
 	windrose
-	iwopy>=0.1.4
 	pyarrow
 
 [options.extras_require]
 io = 
 	windio>=1
+opt = 
+	foxes-opt
 test = 
 	flake8
 	pytest
-	pymoo>=0.6
 doc = 
 	sphinx
 	sphinx-immaterial
@@ -57,13 +65,14 @@ all =
 	windio>=1
 	flake8
 	pytest
-	pymoo>=0.6
+	foxes-opt
 	sphinx
 	sphinx-immaterial
 	nbsphinx
 	ipykernel
 	ipywidgets
 	m2r2
+	lxml_html_clean
 scripts = 
 
 [egg_info]

foxes-0.7.4.25/foxes/VERSION

@@ -1 +0,0 @@
-0.7.4.25