Pin FLORIS version

rafmudaf · Apr 23, 2024 · 7cebfbf · 7cebfbf
1 parent db2d84f
commit 7cebfbf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/deploy-pages.yaml b/.github/workflows/deploy-pages.yaml
@@ -24,8 +24,6 @@ jobs:
       run: |
         git clone https://github.com/rafmudaf/PyWake
         pip install -e PyWake
-        git clone https://github.com/NREL/floris -b develop
-        pip install -e floris
         pip install -e ".[docs]"
 
     # Generate any required diagrams

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ Documentation for `wcomp` is available at https://rafmudaf.github.io/wcomp/.
 Currently, `wcomp` must be installed manually `pip`. The dependencies are:
 
 - windIO v1.0, can be installed directly from PyPI
-- FLORIS v3.6 (current develop branch), not yet released so must be installed from locally from https://github.com/nrel/floris
+- FLORIS v3.6 can be installed directly from PyPI
 - foxes v0.6.2, can be installed directly from PyPI
 - PyWake v2.5.0 plus three additional commits, must be installed from https://github.com/rafmudaf/PyWake at master branch
 
@@ -36,8 +36,8 @@ Follow these steps to install the dependencies and `wcomp`:
 
 ```bash
 pip install windIO
-pip install foxes==0.6.2
-git clone https://github.com/nrel/floris -b develop && pip install -e floris/
+pip install foxes==v0.6.2
+pip install floris==v3.6
 git clone https://github.com/rafmudaf/PyWake && pip install -e PyWake/
 ```
 

diff --git a/docs/index.md b/docs/index.md
@@ -43,7 +43,7 @@ Here's the third card.
 Currently, `wcomp` must be installed manually with `pip`. The dependencies are:
 
 - windIO v1.0, can be installed directly from PyPI
-- FLORIS v3.6 (current develop branch), not yet released so must be installed from locally from https://github.com/nrel/floris
+- FLORIS v3.6, can be installed directly from PyPI
 - foxes v0.6.2, can be installed directly from PyPI
 - PyWake v2.5.0 plus three additional commits, must be installed from https://github.com/rafmudaf/PyWake at master branch
 

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 
 # What packages are required for this module to be executed?
 REQUIRED = [
-    "floris",   # At develop, latest hash is c7f8f36
+    "floris==v3.6",
     "foxes==v0.6.2",
     "py-wake",  # At master with two additional commits on rafmudaf/PyWake, latest hash is 35e63b7
     "numpy>=1.20",