Merge branch 'master' of github.com:Loop3D/LoopStructural

Author: lachlangrose

.github/workflows/conda.yml

@@ -3,14 +3,46 @@ name: publish_conda
 on:
   release:
     types: [created, edited]
+
 jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Publish Loop Conda
-        uses: Loop3D/conda-publish-action@1.8
+        uses: Loop3D/conda-publish-action@1.9
         with:
           subdir: "conda"
           anacondatoken: ${{ secrets.CONDA }}
-          platforms: "win osx linux"
+          platforms: "linux"
+  windows:
+    runs-on: windows-2016
+    strategy:
+      matrix:
+        python: ['3.6']
+    steps:
+    - uses: actions/checkout@v2
+    - name: submodules
+      shell: bash -l {0}
+      run: |
+        git submodule update --init --recursive
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1.0.2
+    - uses: conda-incubator/setup-miniconda@v2
+      with:
+        python-version: ${{ matrix.python }} 
+        activate-environment: loop    
+    - name: Conda build
+      shell: powershell
+      run: |
+        python --version
+        conda install -c conda-forge conda-build scikit-build numpy cython
+        cd conda
+        conda build -c anaconda -c conda-forge -c loop3d -c conda-forge/label/cf202003  -c pytorch -c fcakyon -c districtdatalabs --output-folder . .
+    - name: upload
+      shell: powershell
+      env:
+        ANACONDA_API_TOKEN: ${{ secrets.CONDA }}
+      run: | 
+        conda install anaconda-client
+        anaconda upload --label main win-64/*.tar.bz2 

.github/workflows/python-publish.yml

@@ -5,82 +5,26 @@ on:
     types: [created, edited]
 
 jobs:
-  flake8:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.8
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install flake8
-    - name: Lint with flake8 for syntax errors
-      run: |
-        pip install flake8
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-  manylinux:
-    runs-on: ubuntu-latest
-    needs: flake8
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.8
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install twine 
-    - name: Build manylinux Python wheels
-      uses: RalfG/python-wheels-manylinux-build@v0.2.2-manylinux2010_x86_64
-      with:
-        python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38'
-        build-requirements: 'cython numpy scipy scikit-learn'
-        system-packages: ''
-        package-path: ''
-        pip-wheel-args: '--no-deps'
-    - name: Publish wheels to PyPI
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        twine upload wheelhouse/*-manylinux*.whl
-        
-        
-  build-windows:
-    runs-on: windows-latest
-    needs: flake8
+  build_wheels_macos:
+    name: Build wheels
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python: ['3.6','3.7','3.8']
+        os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
-    - uses: actions/checkout@v2
-    - uses: conda-incubator/setup-miniconda@v2
-      with:
-        python-version: ${{ matrix.python }} 
-        activate-environment: loop    
-    - name: Installing dependencies
-      shell: bash -l {0}
-      run: |
-        python --version
-        pip install -r requirements.txt
-        conda info
-        conda list
-    - name: Building Loop wheel and installing
-      shell: bash -l {0}
-      run: |
-        python setup.py bdist_wheel
-        python setup.py bdist
-    - name: Publish wheels to PyPI
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      shell: bash -l {0}
-      run : |
-        pip install twine
-        twine upload dist/*.whl
-        
+      - uses: actions/checkout@v2
+
+      - name: Build wheels
+        uses: joerick/cibuildwheel@v1.10.0
+        env:
+          CIBW_ARCHS_MACOS: x86_64 universal2
+          CIBW_BUILD: "cp36-* cp37-* cp38-* cp39-*"
+          CIBW_BEFORE_BUILD: "pip install numpy==1.18 cython" #make sure numpy is the same version as required by LS
+
+      - name: Publish wheels to PyPI
+        env:
+          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        run : |
+          pip install twine
+          python -m twine upload ./wheelhouse/*.whl       

LoopStructural/__init__.py

@@ -29,7 +29,7 @@
 ch.setFormatter(formatter)
 ch.setLevel(logging.WARNING)
 loggers = {}
-__version__ = '1.0.83'
+__version__ = '1.0.89'
 from .modelling.core.geological_model import GeologicalModel
 from .utils import log_to_console, log_to_file, getLogger
 logger = getLogger(__name__)

conda/conda_build

@@ -0,0 +1,5 @@
+python:
+  - 3.6
+  - 3.7
+  - 3.8
+  - 3.9