fix: manually update version, only pypi on release

Loop3D · Nov 30, 2023 · 2162871 · 2162871
1 parent 9ef0081
commit 2162871
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 54 deletions.
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -3,30 +3,30 @@ on:
 name: release-please
 jobs:
   continuous-integration:
-    name: Continuous integration ${{ matrix.os }} python ${{ matrix.python-version }} 
+    name: Continuous integration ${{ matrix.os }} python ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-latest",  "windows-latest"] #"macos-latest",
-        python-version: ["3.8","3.9","3.10"]
+        os: ["ubuntu-latest", "windows-latest"] #"macos-latest",
+        python-version: ["3.8", "3.9", "3.10"]
     steps:
       - uses: actions/checkout@v2
       - uses: conda-incubator/setup-miniconda@v2
         with:
-          python-version: ${{ matrix.python }} 
+          python-version: ${{ matrix.python }}
       - name: Installing dependencies
         shell: bash -l {0}
         run: |
           conda install -c conda-forge cython numpy scipy scikit-image scikit-learn pyamg flake8 pytest networkx osqp matplotlib -y
       - name: Checking formatting of code
         shell: bash -l {0}
         run: |
-            # stop the build if there are Python syntax errors or undefined names
-            flake8 LoopStructural --count --select=E9,F63,F7,F82 --show-source --statistics
-            # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-            flake8 LoopStructural --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-      - name: Building and install 
+          # stop the build if there are Python syntax errors or undefined names
+          flake8 LoopStructural --count --select=E9,F63,F7,F82 --show-source --statistics
+          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+          flake8 LoopStructural --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+      - name: Building and install
         shell: bash -l {0}
         run: |
           python setup.py install build_ext --inplace
@@ -78,62 +78,61 @@ jobs:
         with:
           branch: gh-pages # The branch the action should deploy to.
           folder: docs/build/html # The folder the action should deploy.
-          
+
   conda-deploy:
     name: Uploading to Loop3d for python ${{ matrix.os }})
     needs: ["documentation-test", "continuous-integration"]
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-latest",  "windows-latest"]
-        python-version: ["3.10","3.9","3.8"]
+        os: ["ubuntu-latest", "windows-latest"]
+        python-version: ["3.10", "3.9", "3.8"]
     steps:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
-    
+
       - uses: actions/checkout@v2
       - name: update submodules
-#       shell: bash -l {0}
+        #       shell: bash -l {0}
         run: |
-            git submodule update --init --recursive
+          git submodule update --init --recursive
       - name: Add msbuild to PATH
         if: matrix.os == 'windows-latest'
-        uses: microsoft/setup-msbuild@v1.0.2  
+        uses: microsoft/setup-msbuild@v1.0.2
       - name: Conda build'
         env:
           ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN  }}
         shell: bash -l {0}
         run: |
-           conda install -c conda-forge conda-build scikit-build numpy cython anaconda-client -y
-           conda build -c anaconda -c conda-forge -c loop3d --output-folder conda conda --numpy 1.21
-           conda install anaconda-client -y
+          conda install -c conda-forge conda-build scikit-build numpy cython anaconda-client -y
+          conda build -c anaconda -c conda-forge -c loop3d --output-folder conda conda --numpy 1.21
+          conda install anaconda-client -y
       - name: upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: conda
           path: conda
-
 
   make_sdist:
     needs: ["documentation-test", "continuous-integration"]
     name: Make SDist
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Build SDist
-      run: |
-        pip install numpy cython
-        python setup.py sdist
+      - uses: actions/checkout@v3
+
+      - name: Build SDist
+        run: |
+          pip install numpy cython
+          python setup.py sdist
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: dist
+          path: dist/*.tar.gz
 
-    - uses: actions/upload-artifact@v3
-      with:
-        name: dist
-        path: dist/*.tar.gz
-
   build_wheels:
     needs: ["documentation-test", "continuous-integration"]
     name: Build wheels
@@ -155,32 +154,31 @@ jobs:
         with:
           name: dist
           path: ./wheelhouse/*.whl
-          
+
   upload_to_pypi:
-    needs: ["release-please","build_wheels","make_sdist","conda-deploy"]
+    needs: ["release-please", "build_wheels", "make_sdist", "conda-deploy"]
     runs-on: ubuntu-latest
-    #if: ${{ needs.release-please.outputs.release_created }}
+    if: ${{ needs.release-please.outputs.release_created }}
     steps:
-    - uses: actions/download-artifact@v3
-      with:
+      - uses: actions/download-artifact@v3
+        with:
           name: dist
           path: dist
-    - uses: actions/download-artifact@v3
-      with:
+      - uses: actions/download-artifact@v3
+        with:
           name: conda
           path: conda
-    - uses: pypa/gh-action-pypi-publish@v1.6.4
-      with:
-        skip_existing: true
-        verbose: true
-        user: ${{ secrets.PYPI_USERNAME }}
-        password: ${{ secrets.PYPI_PASSWORD }}
-    - uses: conda-incubator/setup-miniconda@v2
-    - name: upload all files to conda-forge
-      shell: bash -l {0}
-      env:
-        ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN  }}
-      run: |
-           conda install -c anaconda anaconda-client -y
-           anaconda upload --label main conda/*/*.tar.bz2 
-    
+      - uses: pypa/gh-action-pypi-publish@v1.6.4
+        with:
+          skip_existing: true
+          verbose: true
+          user: ${{ secrets.PYPI_USERNAME }}
+          password: ${{ secrets.PYPI_PASSWORD }}
+      - uses: conda-incubator/setup-miniconda@v2
+      - name: upload all files to conda-forge
+        shell: bash -l {0}
+        env:
+          ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN  }}
+        run: |
+          conda install -c anaconda anaconda-client -y
+          anaconda upload --label main conda/*/*.tar.bz2
diff --git a/LoopStructural/version.py b/LoopStructural/version.py
@@ -1 +1 @@
-__version__ = "1.5.10" 
+__version__ = "1.5.11"