Merge pull request #179 from nRiccobo/release/1.1

Final clean up in dev for Release v1.1

.github/workflows/publish-to-pypi.yml

@@ -1,25 +1,35 @@
-name: Upload to PyPi
+# This workflow will upload a Python Package using Twine when a release is created
+# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
 
-on: push
+name: Deploy to PyPI
+
+on:
+  release:
+    types: [published]
 
 jobs:
-  deploy:
+  release-pypi:
+    environment: release
+    # Upload to PyPI on every published release
+    if: github.event.action == 'published'
     runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.10'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-    - name: Build and publish
-      if: startsWith(github.ref, 'refs/tags/v')
-      env:
-        TWINE_USERNAME: __token__
-        TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
-      run: |
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Build package
+        run: |
+          python -m pip install --upgrade pip
+          pip install setuptools build wheel twine
+          python -m build
+          twine check --strict dist/*
+
+      - name: Publish package to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          verbose: True

.github/workflows/publish-to-test-pypi.yml

@@ -0,0 +1,37 @@
+# This workflow will upload a Python Package using Twine when a release is created
+# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
+
+name: Deploy to Test PyPI
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release-test-pypi:
+    # Upload to Test PyPI on every pushed tag.
+    environment: release
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Build package
+        run: |
+          python -m pip install --upgrade pip
+          pip install setuptools build wheel twine
+          python -m build
+          twine check --strict dist/*
+
+      - name: Publish package to Test PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          verbose: True
+          repository-url: https://test.pypi.org/legacy/

ORBIT/__init__.py

@@ -1,9 +1,14 @@
 """Initializes ORBIT and provides the top-level import objects."""
 
-__author__ = ["Jake Nunemaker", "Matt Shields", "Rob Hammond"]
+__author__ = [
+    "Jake Nunemaker",
+    "Matt Shields",
+    "Rob Hammond",
+    "Nick Riccobono",
+]
 __copyright__ = "Copyright 2020, National Renewable Energy Laboratory"
-__maintainer__ = "Jake Nunemaker"
-__email__ = ["jake.nunemaker@nrel.gov", "robert[email protected]"]
+__maintainer__ = "Nick Riccobono"
+__email__ = ["nicholas.riccobono@nrel.gov", "rob[email protected]"]
 __status__ = "Development"
 
 
@@ -12,4 +17,4 @@
 from ORBIT.parametric import ParametricManager
 from ORBIT.supply_chain import SupplyChainManager
 
-__version__ = "1.0.8"
+__version__ = "1.1"

ORBIT/core/library.py

@@ -27,7 +27,7 @@
 __author__ = "Rob Hammond"
 __copyright__ = "Copyright 2020, National Renewable Energy Laboratory"
 __maintainer__ = "Rob Hammond"
-__email__ = "robert[email protected]"
+__email__ = "rob[email protected]"
 
 
 import os

ORBIT/manager.py

@@ -40,7 +40,6 @@
     SemiSubmersibleDesign,
     CustomArraySystemDesign,
     OffshoreSubstationDesign,
-    SemiTautMooringSystemDesign,
     OffshoreFloatingSubstationDesign,
 )
 from ORBIT.phases.install import (
@@ -78,7 +77,6 @@ class ProjectManager:
         OffshoreSubstationDesign,
         OffshoreFloatingSubstationDesign,
         MooringSystemDesign,
-        SemiTautMooringSystemDesign,
         SemiSubmersibleDesign,
         SparDesign,
         ElectricalDesign,

ORBIT/phases/__init__.py

@@ -6,7 +6,7 @@
 __author__ = ["Jake Nunemaker", "Rob Hammond"]
 __copyright__ = "Copyright 2020, National Renewable Energy Laboratory"
 __maintainer__ = ["Jake Nunemaker", "Rob Hammond"]
-__email__ = ["[email protected]" "robert[email protected]"]
+__email__ = ["[email protected]" "rob[email protected]"]
 
 
 from .base import BasePhase

ORBIT/phases/design/__init__.py

@@ -3,7 +3,7 @@
 __author__ = ["Jake Nunemaker", "Rob Hammond"]
 __copyright__ = "Copyright 2020, National Renewable Energy Laboratory"
 __maintainer__ = ["Jake Nunemaker", "Rob Hammond"]
-__email__ = ["[email protected]" "robert[email protected]"]
+__email__ = ["[email protected]" "rob[email protected]"]
 
 
 from .design_phase import DesignPhase  # isort:skip
@@ -17,4 +17,3 @@
 from .mooring_system_design import MooringSystemDesign
 from .scour_protection_design import ScourProtectionDesign
 from .semi_submersible_design import SemiSubmersibleDesign
-from .SemiTaut_mooring_system_design import SemiTautMooringSystemDesign

ORBIT/phases/design/_cables.py

@@ -3,7 +3,7 @@
 __author__ = ["Matt Shields", "Rob Hammond"]
 __copyright__ = "Copyright 2020, National Renewable Energy Laboratory"
 __maintainer__ = "Rob Hammond"
-__email__ = "robert[email protected]"
+__email__ = "rob[email protected]"
 
 
 import math

ORBIT/phases/design/array_system_design.py

@@ -3,7 +3,7 @@
 __author__ = "Rob Hammond"
 __copyright__ = "Copyright 2020, National Renewable Energy Laboratory"
 __maintainer__ = "Rob Hammond"
-__email__ = "robert[email protected]"
+__email__ = "rob[email protected]"
 
 
 import warnings

ORBIT/phases/design/export_system_design.py

@@ -3,7 +3,7 @@
 __author__ = "Rob Hammond"
 __copyright__ = "Copyright 2020, National Renewable Energy Laboratory"
 __maintainer__ = "Rob Hammond"
-__email__ = "robert[email protected]"
+__email__ = "rob[email protected]"
 
 from warnings import warn
 

ORBIT/phases/design/oss_design_floating.py

@@ -289,7 +289,7 @@ def calc_substructure_mass_and_cost(self):
             substructure_mass * oss_substructure_cost_rate
             + substructure_pile_mass * oss_pile_cost_rate
         )
-        # print('substructure cost:' + str(self.substructure_cost))
+
         self.substructure_mass = substructure_mass + substructure_pile_mass
 
     @property