diff options
| -rw-r--r-- | .github/workflows/ci-macos.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/ci-windows.yml | 17 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 22 |
3 files changed, 21 insertions, 28 deletions
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 02a67d6..4a09619 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -22,12 +22,12 @@ jobs: python-version: ["3.7", "3.8", "3.9", "3.10"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Select Xcode version # Note: had to select a Version of Xcode that has macOS 11.x SDK run: sudo xcode-select -s '/Applications/Xcode_13.0.app/Contents/Developer' - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -36,8 +36,6 @@ jobs: pip install flake8 pytest if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi - name: Build - run: | - make + run: make - name: Test with pytest - run: | - make test + run: make test diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index fb2febd..b8f5357 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -18,12 +18,12 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/actions/msvc-dev-cmd with: arch: 'x86' - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} architecture: 'x86' @@ -38,21 +38,18 @@ jobs: -username "pycurl" -password "${{ secrets.GITHUB_TOKEN }}" - name: Install packages - run: | - vcpkg install curl[core,http2,non-http,openssl,ssh]:x86-windows + run: vcpkg install curl[core,http2,non-http,openssl,ssh]:x86-windows - name: Install dependencies run: | python -m pip install --upgrade pip - pip install flake8 pytest wheel delvewheel - pip install -r requirements-dev.txt + pip install wheel delvewheel + pip install flake8 pytest -r requirements-dev.txt - name: Build - run: | - python setup.py bdist_wheel --with-openssl --curl-dir=$env:VCPKG_INSTALLATION_ROOT/packages/curl_x86-windows --openssl-dir=$env:VCPKG_INSTALLATION_ROOT/packages/openssl_x86-windows --openssl-lib-name=libssl.lib --link-arg=libcrypto.lib + run: python setup.py bdist_wheel --with-openssl --curl-dir=$env:VCPKG_INSTALLATION_ROOT/packages/curl_x86-windows --openssl-dir=$env:VCPKG_INSTALLATION_ROOT/packages/openssl_x86-windows --openssl-lib-name=libssl.lib --link-arg=libcrypto.lib - name: Repair & install built wheel run: | delvewheel repair --add-path $VCPKG_INSTALLATION_ROOT/installed/x86-windows/bin dist/*.whl pip install wheelhouse/*.whl shell: bash - name: Test with pytest - run: | - pytest -v + run: pytest -v diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99ec64d..ab20b4f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,9 +18,9 @@ jobs: python-version: ["3.7", "3.8", "3.9", "3.10"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - name: Install packages @@ -30,15 +30,13 @@ jobs: python -m pip install --upgrade pip pip install flake8 pytest if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi -# - name: Lint with flake8 -# run: | -# # stop the build if there are Python syntax errors or undefined names -# flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics -# # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide -# flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - - name: Build + - name: Lint with flake8 run: | - make + # stop the build if there are Python syntax errors or undefined names + flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + # exit-zero treats all errors as warnings. + flake8 . --count --exit-zero --max-complexity=10 --max-line-length=88 --statistics + - name: Build + run: make - name: Test with pytest - run: | - make test + run: make test |