diff --git a/.github/python-nosetests-3.sh b/.github/python-nosetests-3.sh index c7e6782e6cf..e18f5370a80 100644 --- a/.github/python-nosetests-3.sh +++ b/.github/python-nosetests-3.sh @@ -3,7 +3,7 @@ set -uex -sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe" +sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ jammy main universe" sudo apt-get update sudo apt-get install -y python3-mock python3-nose pip3 install mock diff --git a/.github/python-nosetests.sh b/.github/python-nosetests.sh index 882b82e1a7a..44b7ae660b4 100644 --- a/.github/python-nosetests.sh +++ b/.github/python-nosetests.sh @@ -3,11 +3,10 @@ set -uex -sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe" sudo apt-get update -sudo apt-get install -y python-mock python-nose -curl https://bootstrap.pypa.io/pip/2.7/get-pip.py |sudo python2 -pip install enum +sudo apt-get install python2 +curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | sudo python2 +pip install enum nose mock nosetests scripts scripts/examples scripts/examples/python PYTHONPATH=scripts/plugins python2 -m unittest -v test_extauth_hook_AD diff --git a/.github/workflows/1.249-lcm.yml b/.github/workflows/1.249-lcm.yml index 070ef741abf..89119c30259 100644 --- a/.github/workflows/1.249-lcm.yml +++ b/.github/workflows/1.249-lcm.yml @@ -7,7 +7,7 @@ on: jobs: python-test: name: Python tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: @@ -21,7 +21,7 @@ jobs: ocaml-test: name: Ocaml tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout code diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 121fa282033..ace99bfda43 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -10,7 +10,7 @@ on: jobs: ocaml-format: name: Ocaml files - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout code diff --git a/scripts/test_usb_scan.py b/scripts/test_usb_scan.py index 57944ea7951..95757aadbab 100644 --- a/scripts/test_usb_scan.py +++ b/scripts/test_usb_scan.py @@ -2,7 +2,11 @@ # # unittest for usb_scan.py -from collections import Mapping, Container, Iterable +try: + from collections import Mapping, Container, Iterable +except: + from collections.abc import Mapping, Container, Iterable + import mock from nose.tools import nottest import os