Merge pull request NREL#8 from NREL/develop

Develop
dzalkind · Mar 4, 2020 · 22fbab0 · 22fbab0
2 parents 69545dc + e950eb4
commit 22fbab0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/ROSCO b/ROSCO
diff --git a/setup.py b/setup.py
@@ -25,13 +25,13 @@
 from setuptools import find_packages, setup, Command
 
 # Package meta-data.
-NAME = 'ROSCO_toolbox'
+NAME = 'rosco-toolbox'
 DESCRIPTION = 'A toolbox for development of wind turbine controllers.'
 URL = 'https://github.com/NREL/ROSCO_toolbox'
 EMAIL = '[email protected]'
 AUTHOR = 'NREL National Wind Technology Center'
 REQUIRES_PYTHON = '>=3.3.0'
-VERSION = '1.0.0'
+VERSION = '2.0.0'
 
 # These packages are required for all of the code to be executed. 
 # - Maybe you can get away with older versions...
@@ -41,8 +41,6 @@
     'pytest>=4',
     'scipy>=1.1',
     'pyYAML>=5.3'
-    # 'wisdem>=2.0'   # This is NREL's distrubtion of WISDEM. CC-Blade and Aeroelastic SE are used as of January 2020
-                    # https://github.com/wisdem/wisdem
 ]
 
 # Read the docs, one day, so we'll throw it in here!
@@ -62,9 +60,8 @@
 here = os.path.abspath(os.path.dirname(__file__))
 
 # Import the README and use it as the long-description.
-# Note: this will only work if 'README.md' is present in your MANIFEST.in file!
 try:
-    with io.open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
+    with io.open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
         long_description = '\n' + f.read()
 except FileNotFoundError:
     long_description = DESCRIPTION
@@ -137,7 +134,7 @@ def run(self):
     install_requires=REQUIRED,
     extras_require=EXTRAS,
     include_package_data=True,
-    license='Apache-2.0',
+    license='Apache License, Version 2.0',
     classifiers=[
         # Trove classifiers
         # Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
+1 −1		parameter_files/DTU10MW/DISCON.IN
+1 −1		parameter_files/NREL5MW/DISCON.IN
+5 −8		src/ControllerBlocks.f90
+6 −13		src/Controllers.f90
+7 −1		src/Filters.f90
+1 −1		src/Functions.f90
+2 −2		src/ROSCO_Types.f90
+2 −3		src/ReadSetParameters.f90