[python-control-developers] [python-control/python-control] 25114f: use pytest-timeout for rlocus test

[Richard M. <no...@gi...>]

  Branch: refs/heads/master
  Home:   https://github.com/python-control/python-control
  Commit: 25114f5de239329cbf78541ac969716228482964
      https://github.com/python-control/python-control/commit/25114f5de239329cbf78541ac969716228482964
  Author: Ben Greiner <co...@bn...>
  Date:   2021-02-07 (Sun, 07 Feb 2021)

  Changed paths:
    M .github/workflows/control-slycot-src.yml
    M .github/workflows/python-package-conda.yml
    M control/tests/rlocus_test.py
    M setup.py

  Log Message:
  -----------
  use pytest-timeout for rlocus test


  Commit: 0320595b08038c8c2746ae05acb6450d848a1224
      https://github.com/python-control/python-control/commit/0320595b08038c8c2746ae05acb6450d848a1224
  Author: Richard Murray <mu...@cd...>
  Date:   2021-02-07 (Sun, 07 Feb 2021)

  Changed paths:
    M .github/workflows/control-slycot-src.yml
    M .github/workflows/python-package-conda.yml
    M control/tests/rlocus_test.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #537 from bnavigator/pytest-timeout

Use pytest-timeout for rlocus test


Compare: https://github.com/python-control/python-control/compare/3adc610a1ad7...0320595b0803