Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI #388

Merged
merged 6 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .github/workflows/license-audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@ on: [push, pull_request]

jobs:
license-audit:
# TODO: a GH action update broke the 'ubuntu-latest' image
# when it's fixed, we should switch back
runs-on: ubuntu-20.04
runs-on: 'ubuntu-latest'

steps:
- uses: actions/checkout@v2

- name: Set up Python
uses: actions/setup-python@v2
with:
# License Finder's Docker image uses Python 3.5
python-version: 3.5
# License Finder's Docker image uses Python 3.10
python-version: '3.10'

- name: Fetch decisions.yml
run: curl https://raw.githubusercontent.com/bugsnag/license-audit/master/config/decision_files/global.yml -o decisions.yml
Expand All @@ -32,6 +30,10 @@ jobs:
run: >
docker run -v $PWD:/scan licensefinder/license_finder /bin/bash -lc "
cd /scan &&
pip3 install -r requirements.txt --quiet &&
apt-get update &&
apt-get install -y python3-venv &&
python3 -m venv .venv &&
source .venv/bin/activate &&
pip3 install -r requirements.txt &&
license_finder --decisions-file decisions.yml --python-version 3 --enabled-package-managers=pip
"
7 changes: 5 additions & 2 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,19 @@ jobs:
include:
- python-version: '3.5'
os: 'ubuntu-20.04'
pip-trusted-host: 'pypi.python.org pypi.org files.pythonhosted.org'
- python-version: '3.6'
os: 'ubuntu-20.04'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
env:
PIP_TRUSTED_HOST: ${{ matrix.pip-trusted-host }}

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion tests/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def deliver(foo, config, payload, options={}):

# test for a regression caused by reading '__code__', which does not exist
# on Mock objects, nor can it be mocked
# see: https://github.com/bugsnag/bugsnag-python/commit/77e11747c293ba715bc764d17b49fb32918c030a#r142130768
# see: https://github.com/bugsnag/bugsnag-python/commit/77e11747c293ba715bc764d17b49fb32918c030a#r142130768 # noqa: E501
def test_delivery_can_be_mocked(self):
delivery = Mock(spec=Delivery)

Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ deps=
flask: flask
flask: blinker
tornado: tornado
tornado: pytest<8.2
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11
Expand Down
Loading