mirror of
https://github.com/GNS3/gns3-server.git
synced 2024-12-30 17:46:59 +00:00
Merge pull request #2101 from GNS3/upgrade-dev-dependencies
Upgrade dev dependencies
This commit is contained in:
commit
3444615253
.github/workflows
appveyor.ymldev-requirements.txtgns3server/web
pytest.initests
compute
controller/gns3vm
8
.github/workflows/testing.yml
vendored
8
.github/workflows/testing.yml
vendored
@ -2,9 +2,13 @@ name: testing
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ master ]
|
||||
branches:
|
||||
- master
|
||||
- 2.2
|
||||
pull_request:
|
||||
branches: [ master ]
|
||||
branches:
|
||||
- master
|
||||
- 2.2
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
@ -5,7 +5,7 @@ image: Visual Studio 2015
|
||||
platform: x64
|
||||
|
||||
environment:
|
||||
PYTHON: "C:\\Python36-x64"
|
||||
PYTHON: "C:\\Python37-x64"
|
||||
DISTUTILS_USE_SDK: "1"
|
||||
API_TOKEN:
|
||||
secure: VEKn4bYH3QO0ixtQW5ni4Enmn8cS1NlZV246ludBDgQ=
|
||||
|
@ -1,6 +1,8 @@
|
||||
-rrequirements.txt
|
||||
|
||||
pytest==7.0.0
|
||||
flake8==4.0.1
|
||||
pytest-timeout==1.4.2
|
||||
pytest-aiohttp==0.3.0
|
||||
pytest==7.0.1; python_version < '3.7' # last version to support Python 3.6
|
||||
pytest==7.1.2; python_version >= '3.7'
|
||||
flake8==5.0.4
|
||||
pytest-timeout==2.1.0
|
||||
pytest-aiohttp==0.3.0; python_version < '3.7' # last version to support Python 3.6
|
||||
pytest-aiohttp==1.0.4; python_version >= '3.7'
|
||||
|
@ -147,7 +147,7 @@ class Route(object):
|
||||
else:
|
||||
route = path
|
||||
|
||||
# Compute metadata for the documentation
|
||||
# Compute metadata for the documentation
|
||||
if api_version:
|
||||
handler = func.__module__.replace("_handler", "").replace("gns3server.handlers.api.", "")
|
||||
cls._documentation.setdefault(handler, {})
|
||||
|
@ -1,3 +1,4 @@
|
||||
[pytest]
|
||||
asyncio_mode=auto
|
||||
log_level=NOTSET
|
||||
ignore=env
|
@ -18,7 +18,6 @@
|
||||
import os
|
||||
import uuid
|
||||
import pytest
|
||||
import asyncio
|
||||
|
||||
from gns3server.compute.dynamips.nodes.router import Router
|
||||
from gns3server.compute.dynamips.dynamips_error import DynamipsError
|
||||
|
@ -18,7 +18,6 @@
|
||||
from collections import OrderedDict
|
||||
|
||||
import pytest
|
||||
import asyncio
|
||||
|
||||
from tests.utils import asyncio_patch, AsyncioMagicMock
|
||||
|
||||
|
@ -15,7 +15,6 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
import pytest
|
||||
|
||||
from gns3server.compute.vmware import VMware
|
||||
|
@ -16,7 +16,6 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import pytest
|
||||
import asyncio
|
||||
|
||||
from gns3server.compute.vmware.vmware_vm import VMwareVM
|
||||
from gns3server.compute.vmware import VMware
|
||||
|
@ -16,7 +16,6 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import pytest
|
||||
import asyncio
|
||||
|
||||
from tests.utils import asyncio_patch, AsyncioMagicMock
|
||||
from gns3server.utils.asyncio import wait_run_in_executor
|
||||
|
Loading…
Reference in New Issue
Block a user