Merge branch 'master' into 2.2

.github/workflows/testing.yml

@@ -0,0 +1,35 @@
+name: testing
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        if [ -f dev-requirements.txt ]; then pip install -r dev-requirements.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: Test with pytest
+      run: |
+        pytest -vv

.pyup.yml

@@ -1,2 +0,0 @@
-branch:
-    2.2

.travis.yml

@@ -1,32 +0,0 @@
-sudo: required
-
-services:
-  - docker
-
-install:
-  - sed -e 's/${PYTHON_VERSION}/'${PYTHON_VERSION}/g DockerfileTests.tpl  > /tmp/DockerfileTests
-  - docker-compose build
-
-script:
-  - docker-compose run tests
-
-before_deploy:
-- sudo pip install twine
-- sudo pip install urllib3[secure]
-
-deploy:
-  provider: pypi
-  edge:
-    branch: v1.8.45
-  user: noplay
-  password:
-    secure: Fa66zp8ML4oSGwzkUMZi07MIYfO3tbS5gHFUaLN2mk2MBknhCjDYexmFJqT//sC/+xqv6sSJE6rz1EPoy/THbxj8R96ZgIyiUZIbDCbzgdy92d7J/eusrDoNdpApBLke8NqQqtFETb3addMZZNofQ3IDANFD2m2jY+KECU8z8NI=
-  on:
-    tags: true
-    repo: GNS3/gns3-server
-
-env:
-  matrix:
-    - PYTHON_VERSION=3.6
-    - PYTHON_VERSION=3.7
-    - PYTHON_VERSION=3.8

.whitesource

@@ -0,0 +1,13 @@
+{
+  "scanSettings": {
+    "configMode": "AUTO",
+    "configExternalURL": "",
+    "projectToken" : ""
+  },
+  "checkRunSettings": {
+    "vulnerableCheckRunConclusionLevel": "failure"
+  },
+  "issueSettings": {
+    "minSeverityLevel": "LOW"
+  }
+}

DockerfileTests.tpl

@@ -1,15 +0,0 @@
-FROM python:${PYTHON_VERSION}
-
-RUN pip install -U setuptools pip
-
-ADD requirements.txt /server/requirements.txt
-ADD dev-requirements.txt /server/dev-requirements.txt
-
-RUN pip install -r/server/dev-requirements.txt
-
-RUN useradd -ms /bin/bash gns3
-
-USER gns3
-
-ADD . /server
-WORKDIR /server

MANIFEST.in

@@ -2,7 +2,6 @@ include README.rst
 include AUTHORS
 include LICENSE
 include MANIFEST.in
-include tox.ini
 include requirements.txt
 recursive-include tests *
 recursive-exclude docs *

README.rst

@@ -1,8 +1,8 @@
 GNS3-server
 ===========
 
-.. image:: https://travis-ci.org/GNS3/gns3-server.svg?branch=master
+.. image:: https://github.com/GNS3/gns3-server/workflows/testing/badge.svg
-    :target: https://travis-ci.org/GNS3/gns3-server
+    :target: https://github.com/GNS3/gns3-server/actions?query=workflow%3Atesting
 
 .. image:: https://img.shields.io/pypi/v/gns3-server.svg
     :target: https://pypi.python.org/pypi/gns3-server

dev-requirements.txt

@@ -1,7 +1,6 @@
 -rrequirements.txt
 
-sphinx==1.8.3
 pytest==5.4.3
-pep8==1.7.1
+flake8==3.8.3
-pytest-timeout==1.3.3
+pytest-timeout==1.4.1
 pytest-aiohttp==0.3.0

docker-compose.yml

@@ -1,4 +0,0 @@
-tests:
-  build: .
-  dockerfile: /tmp/DockerfileTests
-  command: py.test -v -s tests

gns3server/utils/asyncio/input_stream.py

@@ -14,11 +14,11 @@ from six.moves import range
 from prompt_toolkit.keys import Keys
 from prompt_toolkit.key_binding.input_processor import KeyPress
 
-__all__ = (
+# __all__ = (
-    'InputStream',
+#     'InputStream',
-    'raw_mode',
+#     'raw_mode',
-    'cooked_mode',
+#     'cooked_mode',
-)
+# )
 
 _DEBUG_RENDERER_INPUT = False
 _DEBUG_RENDERER_INPUT_FILENAME = 'prompt-toolkit-render-input.log'

requirements.txt

@@ -1,10 +1,10 @@
 jsonschema==3.2.0
 aiohttp==3.6.2
 aiohttp-cors==0.7.0
-aiofiles==0.4.0
+aiofiles==0.5.0
 Jinja2>=2.7.3
 sentry-sdk>=0.14.4
-psutil==5.6.6
+psutil==5.7.0
 async-timeout==3.0.1
 distro>=1.3.0
-py-cpuinfo==5.0.0
+py-cpuinfo==6.0.0

scripts/pep8.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-echo '
- _______   ________  _______    ______  
-|       \ |        \|       \  /      \ 
-| $$$$$$$\| $$$$$$$$| $$$$$$$\|  $$$$$$\
-| $$__/ $$| $$__    | $$__/ $$| $$__/ $$
-| $$    $$| $$  \   | $$    $$ >$$    $$
-| $$$$$$$ | $$$$$   | $$$$$$$ |  $$$$$$ 
-| $$      | $$_____ | $$      | $$__/ $$
-| $$      | $$     \| $$       \$$    $$
- \$$       \$$$$$$$$ \$$        \$$$$$$ 
-                                                                                                             
-'
-
-
-find . -name '*.py' -exec autopep8 --in-place -v --aggressive --aggressive \{\} \;
-
-echo "It's all clean now!"

setup.py

@@ -38,6 +38,7 @@ class PyTest(TestCommand):
         errcode = pytest.main(self.test_args)
         sys.exit(errcode)
 
+
 dependencies = open("requirements.txt", "r").read().splitlines()
 
 setup(

tox.ini

@@ -1,17 +0,0 @@
-[tox]
-envlist = py34
-
-[testenv]
-commands = python setup.py test
-deps = -rdev-requirements.txt
-
-[pep8]
-ignore = E501,E402,E265
-
-[flake8]
-ignore = E265,E501
-exclude = tests/*
-
-[pytest]
-norecursedirs = .tox
-timeout = 15

win-requirements.txt

@@ -1,4 +1,4 @@
 -rrequirements.txt
 
-pywin32>=223 # pyup: ignore
+pywin32>=223
-wmi==1.4.9
+wmi==1.5.1