Merge branch 'master' of https://github.com/bab2min/tomotopy into dev…

…elop
bab2min · Nov 30, 2019 · d459344 · d459344
2 parents cbe38ee + 0c42e4a
commit d459344
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 40 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -8,35 +8,32 @@ jobs:
   build_manylinux:
     name: Build for manylinux
     runs-on: ubuntu-latest
-    strategy:
-      max-parallel: 4
-      matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8]
+    container:
+      image: docker://quay.io/pypa/manylinux1_x86_64
 
-    steps:
-    - name: Use docker
-      uses: docker://quay.io/pypa/manylinux1_x86_64
+    steps:        
     - uses: actions/checkout@v1
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        wget https://github.com/eigenteam/eigen-git-mirror/archive/3.3.7.tar.gz
-        tar -zxvf 3.3.7.tar.gz
-        mv eigen-git-mirror-3.3.7 include
+        git clone https://github.com/eigenteam/eigen-git-mirror
+        cd eigen-git-mirror
+        git checkout tags/3.3.7
+        cd ..
+        mv eigen-git-mirror include
     - name: Deploy
+      continue-on-error: True
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        export AUDITWHEEL_PLAT=many
-        python -m pip install twine wheel auditwheel
-        python setup.py bdist_wheel
-        python -m auditwheel repair dist/*.whl
-        twine upload wheelhouse/*
+        for cp in cp34-cp34m cp35-cp35m cp36-cp36m cp37-cp37m cp38-cp38
+        do
+          /opt/python/${cp}/bin/python -m pip install twine wheel
+          /opt/python/${cp}/bin/python setup.py build sdist bdist_wheel
+          auditwheel repair dist/*-${cp}-linux_x86_64.whl
+        done
+        /opt/python/cp38-cp38/bin/python -m twine upload bdist/*.tar.gz
+        /opt/python/cp38-cp38/bin/python -m twine upload wheelhouse/*.whl
 
   build_macos:
     name: Build for macOS
@@ -59,13 +56,15 @@ jobs:
         tar -zxvf 3.3.7.tar.gz
         mv eigen-git-mirror-3.3.7 include
     - name: Deploy
+      continue-on-error: True
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
         export AUDITWHEEL_PLAT=many
         python -m pip install twine wheel
-        python setup.py sdist bdist_wheel
+        python setup.py bdist_wheel
+        cat tomotopy/documentation.rst
         twine upload dist/*
 
   build_windows:
@@ -91,10 +90,11 @@ jobs:
         tar -zxvf 3.3.7.tar.gz
         mv eigen-git-mirror-3.3.7 include
     - name: Deploy
+      continue-on-error: True
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
         python -m pip install twine wheel
-        python setup.py sdist bdist_wheel
+        python setup.py bdist_wheel
         twine upload dist/*
diff --git a/.github/workflows/pull_request_test.yml b/.github/workflows/pull_request_test.yml
@@ -9,32 +9,27 @@ jobs:
   build_manylinux:
     name: Build for manylinux
     runs-on: ubuntu-latest
+    container:
+      image: docker://quay.io/pypa/manylinux1_x86_64
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        cp: [cp34-cp34m, cp35-cp35m, cp36-cp36m, cp37-cp37m, cp38-cp38]
 
-    steps:
-    - name: Use docker
-      uses: docker://quay.io/pypa/manylinux1_x86_64
+    steps:        
     - uses: actions/checkout@v1
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        wget https://github.com/eigenteam/eigen-git-mirror/archive/3.3.7.tar.gz
-        tar -zxvf 3.3.7.tar.gz
-        mv eigen-git-mirror-3.3.7 include
-    - name: Build
-      run: |
-        python setup.py build install
-    - name: Test
+        git clone https://github.com/eigenteam/eigen-git-mirror
+        cd eigen-git-mirror
+        git checkout tags/3.3.7
+        cd ..
+        mv eigen-git-mirror include
+    - name: Build & Test
       run: |
-        python -m pip install pytest
-        python -m pytest test/unit_test.py
+        /opt/python/${{ matrix.cp }}/bin/python -m pip install pytest
+        /opt/python/${{ matrix.cp }}/bin/python setup.py build install
+        /opt/python/${{ matrix.cp }}/bin/python -m pytest test/unit_test.py
 
   build_macos:
     name: Build for macOS