Merge branch 'release-0.4.0'

sametz · Feb 22, 2020 · 03566cd · 03566cd
2 parents aee1269 + abafaa9
commit 03566cd
Show file tree

Hide file tree

Showing 37 changed files with 1,550 additions and 203 deletions.
diff --git a/.flake8 b/.flake8
@@ -3,7 +3,9 @@ exclude =
     .git,
     __pycache__,
     docs/source/conf.py,
+    env,
     venv,
+    .tox,
     jupyter,
     tests/dnmr_standards.py,
     build,
@@ -12,3 +14,4 @@ ignore =
     # allowing I for Intensity/Integration *for now*
     E741
 max-line-length = 119
+
diff --git a/.github/disabled_workflows/build_linux.yml b/.github/disabled_workflows/build_linux.yml
@@ -0,0 +1,33 @@
+name: build wheels for linux
+
+on:
+  create:
+    tags:
+      - '*'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/workflows/actions/manylinux1_x86_64/
+    - uses: ./.github/workflows/actions/manylinux1_i686/
+    - name: copy manylinux wheels
+      run: |
+        mkdir dist
+        cp wheelhouse/nmrsim*-manylinux1_x86_64.whl dist/
+        cp wheelhouse/nmrsim*-manylinux1_i686.whl dist/
+    - name: upload wheels
+      uses: actions/upload-artifact@v1
+      with:
+        name: dist
+        path: dist
+    - name: Publish to PyPI
+      env:
+        PYPI_USERNAME: ${{ secrets.test_pypi_user }}
+        PYPI_PASSWORD: ${{ secrets.test_pypi_password }}
+      run: |
+        pip install twine
+        python -m twine upload -u ${PYPI_USERNAME} -p ${PYPI_PASSWORD} --repository-url https://test.pypi.org/legacy/ dist/*
diff --git a/.github/disabled_workflows/linting.yml b/.github/disabled_workflows/linting.yml
@@ -0,0 +1,26 @@
+name: lint
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python: [3.6, 3.7, 3.8]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Install Tox and Dependencies
+        run: pip install tox
+      - name: Run Tox Linting
+        run: tox -e flake8
diff --git a/.github/disabled_workflows/platform-smoke.yml b/.github/disabled_workflows/platform-smoke.yml
@@ -0,0 +1,34 @@
+name: Cross-Platform Smoke Test
+
+on:
+  push:
+    branches:
+      - tox
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, windows-latest, ubuntu-latest]
+        python: [3.6, 3.7, 3.8]
+
+    steps:
+#      - name: Enter
+#        run: |
+#          echo 'Initiated runner.'
+#          echo 'Checkout at ${{ steps.hello.outputs.time }}'
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Install Tox and Dependencies
+        run: |
+          pip install tox
+          echo 'Smoke test successful through tox intallation.'
+      - name: Run Tox
+        run: |
+            echo 'About to run tox'
+            tox -e py
diff --git a/.github/disabled_workflows/test_build_mac.yml b/.github/disabled_workflows/test_build_mac.yml
@@ -0,0 +1,42 @@
+name: build wheels for macos
+
+on:
+  create:
+    tags:
+      - '*'
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [macos-latest]
+        architecture: [x64]
+        python-version: [3.6, 3.7, 3.8]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        architecture: ${{ matrix.architecture }}
+        python-version: ${{ matrix.python-version }}
+    - name: build wheel
+      run: |
+        pip install -U wheel
+        python setup.py bdist_wheel
+      shell: bash
+    - name: upload wheel
+      uses: actions/upload-artifact@v1
+      with:
+        name: dist_${{ matrix.os }}_${{ matrix.architecture }}_${{ matrix.python-version }}
+        path: dist
+    - name: Publish to PyPI
+      env:
+        PYPI_PASSWORD: ${{ secrets.test_pypi_password }}
+      run: |
+        pip install twine
+        python -m twine upload --skip-existing -u __token__ -p ${PYPI_PASSWORD} --repository-url https://test.pypi.org/legacy/ dist/*
+      shell: bash
diff --git a/.github/disabled_workflows/test_build_win.yml b/.github/disabled_workflows/test_build_win.yml
@@ -0,0 +1,42 @@
+name: build wheels for windows
+
+on:
+  create:
+    tags:
+      - '*'
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [windows-latest]
+        architecture: [x64, x86]
+        python-version: [3.6, 3.7, 3.8]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        architecture: ${{ matrix.architecture }}
+        python-version: ${{ matrix.python-version }}
+    - name: build wheel
+      run: |
+        pip install -U wheel
+        python setup.py bdist_wheel
+      shell: bash
+    - name: upload wheel
+      uses: actions/upload-artifact@v1
+      with:
+        name: dist_${{ matrix.os }}_${{ matrix.architecture }}_${{ matrix.python-version }}
+        path: dist
+    - name: Publish to PyPI
+      env:
+        PYPI_PASSWORD: ${{ secrets.test_pypi_password }}
+      run: |
+        pip install twine
+        python -m twine upload --skip-existing -u __token__ -p ${PYPI_PASSWORD} --repository-url https://test.pypi.org/legacy/ dist/*
+      shell: bash
diff --git a/.github/disabled_workflows/test_make_sdist.yml b/.github/disabled_workflows/test_make_sdist.yml
@@ -0,0 +1,33 @@
+name: make source distribution
+
+on:
+  create:
+    tags:
+      - '*'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.7
+    - name: make sdist
+      run:
+        python setup.py sdist
+    - name: upload sdist
+      uses: actions/upload-artifact@v1
+      with:
+        name: dist
+        path: dist
+    - name: Publish to TestPyPI
+      env:
+        PYPI_PASSWORD: ${{ secrets.test_pypi_password }}
+      run: |
+        pip install twine
+        python -m twine check dist/*
+        python -m twine upload --verbose -u __token__ -p ${PYPI_PASSWORD} --repository-url https://test.pypi.org/legacy/ dist/*
diff --git a/.github/disabled_workflows/tox.yml b/.github/disabled_workflows/tox.yml
@@ -0,0 +1,27 @@
+name: tox
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+      - tox
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python: [3.6, 3.7, 3.8]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Install Tox and Dependencies
+        run: pip install tox
+      - name: Run Tox
+        run: tox -e py
diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml
@@ -0,0 +1,42 @@
+name: build wheels for macos
+
+on:
+  create:
+    tags:
+      - '*'
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [macos-latest]
+        architecture: [x64]
+        python-version: [3.6, 3.7, 3.8]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        architecture: ${{ matrix.architecture }}
+        python-version: ${{ matrix.python-version }}
+    - name: build wheel
+      run: |
+        pip install -U wheel
+        python setup.py bdist_wheel
+      shell: bash
+    - name: upload wheel
+      uses: actions/upload-artifact@v1
+      with:
+        name: dist_${{ matrix.os }}_${{ matrix.architecture }}_${{ matrix.python-version }}
+        path: dist
+    - name: Publish to PyPI
+      env:
+        PYPI_PASSWORD: ${{ secrets.test_pypi_password }}
+      run: |
+        pip install twine
+        python -m twine upload --skip-existing -u __token__ -p ${PYPI_PASSWORD} dist/*
+      shell: bash
diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
@@ -0,0 +1,42 @@
+name: build wheels for windows
+
+on:
+  create:
+    tags:
+      - '*'
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [windows-latest]
+        architecture: [x64, x86]
+        python-version: [3.6, 3.7, 3.8]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        architecture: ${{ matrix.architecture }}
+        python-version: ${{ matrix.python-version }}
+    - name: build wheel
+      run: |
+        pip install -U wheel
+        python setup.py bdist_wheel
+      shell: bash
+    - name: upload wheel
+      uses: actions/upload-artifact@v1
+      with:
+        name: dist_${{ matrix.os }}_${{ matrix.architecture }}_${{ matrix.python-version }}
+        path: dist
+    - name: Publish to PyPI
+      env:
+        PYPI_PASSWORD: ${{ secrets.test_pypi_password }}
+      run: |
+        pip install twine
+        python -m twine upload --skip-existing -u __token__ -p ${PYPI_PASSWORD} dist/*
+      shell: bash
diff --git a/.github/workflows/make_sdist.yml b/.github/workflows/make_sdist.yml
@@ -0,0 +1,33 @@
+name: make source distribution
+
+on:
+  create:
+    tags:
+      - '*'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.7
+    - name: make sdist
+      run:
+        python setup.py sdist
+    - name: upload sdist
+      uses: actions/upload-artifact@v1
+      with:
+        name: dist
+        path: dist
+    - name: Publish to TestPyPI
+      env:
+        PYPI_PASSWORD: ${{ secrets.test_pypi_password }}
+      run: |
+        pip install twine
+        python -m twine check dist/*
+        python -m twine upload --verbose -u __token__ -p ${PYPI_PASSWORD} dist/*