Merge pull request #180 from WISDEM/dev

Release v1.1

.git-blame-ignore-revs

@@ -0,0 +1,3 @@
+# Adopting ruff in place of flake8 & pylint, and cleaning up the previously ignored errors
+faeab2d971c6de9d1afbb7f8b63c0c8dfc4c85ec
+66a52fa234cb3296a28b06cb2f5ccf42637326bb

.github/workflows/gh_pages.yml

@@ -8,11 +8,11 @@ jobs:
   make-pages:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: select python version
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.10'
       - name: install dependencies
         run: |
           python -m pip install --upgrade pip

.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@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
-    - 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/

.github/workflows/tests.yml

@@ -12,15 +12,17 @@ jobs:
       max-parallel: 3
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.7, 3.8]
+        python-version: ['3.9', '3.10', '3.11']
+        exclude:
+          - os: macos-latest
+            python-version: '3.9'
+          - os: macos-latest
+            python-version: '3.10'
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: ${{ github.event.pull_request.head.ref }}
-        fetch-depth: 1
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.pre-commit-config.yaml

@@ -2,20 +2,19 @@ ci:
     skip: [isort, black, pylint]
 
 repos:
--   repo: https://github.com/timothycrosley/isort
-    rev: 4.3.21
+-   repo: https://github.com/pycqa/isort
+    rev:  5.13.2
     hooks:
-        - id: isort
-          name: isort
-          stages: [commit]
+    -   id: isort
+        name: isort (python)
 
 -   repo: https://github.com/psf/black
-    rev: stable
+    rev: 24.2.0
     hooks:
-        - id: black
-          name: black
-          stages: [commit]
-          exclude: ^ORBIT/api/wisdem
+    -   id: black
+        name: black
+        stages: [commit]
+        exclude: ^ORBIT/api/wisdem
 
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.3.0
@@ -25,16 +24,16 @@ repos:
     -   id: check-executables-have-shebangs
     -   id: check-json
     -   id: check-yaml
+        args: [--unsafe]  # allow Python constructors
     -   id: check-merge-conflict
     -   id: check-symlinks
-    -   id: flake8
-        exclude: ^tests/
     -   id: mixed-line-ending
     -   id: pretty-format-json
         args: [--autofix]
 
--   repo: https://github.com/pre-commit/mirrors-pylint
-    rev: v2.1.1
+-   repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.4.10
     hooks:
-    -   id: pylint
-        exclude: ^tests/
+    -   id: ruff
+        args: [--fix]