diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 156269fd9..27850fe26 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Build and run Docker image run: | docker build -t gns3-gui-test . diff --git a/gns3/schemas/appliance.json b/gns3/schemas/appliance.json index 2a9005fc1..78b7c004a 100644 --- a/gns3/schemas/appliance.json +++ b/gns3/schemas/appliance.json @@ -71,6 +71,11 @@ "format": "uri", "title": "Website of the vendor" }, + "vendor_logo_url": { + "type": "string", + "format": "uri", + "title": "Link to the vendor logo (used by the GNS3 marketplace)" + }, "documentation_url": { "type": "string", "format": "uri", diff --git a/gns3/schemas/appliance_v8.json b/gns3/schemas/appliance_v8.json index 4fb0db7b6..e120c8313 100644 --- a/gns3/schemas/appliance_v8.json +++ b/gns3/schemas/appliance_v8.json @@ -592,6 +592,11 @@ "format": "uri", "title": "Website of the vendor" }, + "vendor_logo_url": { + "type": "string", + "format": "uri", + "title": "Link to the vendor logo (used by the GNS3 marketplace)" + }, "documentation_url": { "type": "string", "format": "uri", diff --git a/gns3/version.py b/gns3/version.py index b8c19a66e..56fc56cd3 100644 --- a/gns3/version.py +++ b/gns3/version.py @@ -23,9 +23,9 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "2.2.43" +__version__ = "2.2.44.dev1" -__version_info__ = (2, 2, 43, 0) +__version_info__ = (2, 2, 44, 99) if "dev" in __version__: try: diff --git a/mac-requirements.txt b/mac-requirements.txt index c0f718542..fa6d90645 100644 --- a/mac-requirements.txt +++ b/mac-requirements.txt @@ -1,3 +1,5 @@ -rrequirements.txt +PyQt5-Qt5==5.15.2 +PyQt5-sip==12.12.2 PyQt5==5.15.9 diff --git a/requirements.txt b/requirements.txt index 345b56fa7..5f5f1e58a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ jsonschema>=4.17.3,<4.18; python_version >= '3.7' # v4.17.3 is the last version to support Python 3.7 jsonschema==3.2.0; python_version < '3.7' # v3.2.0 is the last version to support Python 3.6 -sentry-sdk==1.31.0,<1.32 -psutil==5.9.5 +sentry-sdk==1.32.0,<1.33 +psutil==5.9.6 distro>=1.8.0 truststore>=0.8.0; python_version >= '3.10' -importlib-resources>=1.3; python_version <= '3.9' +importlib-resources>=1.3; python_version < '3.9' setuptools>=60.8.1; python_version >= '3.7' setuptools==59.6.0; python_version < '3.7' # v59.6.0 is the last version to support Python 3.6 diff --git a/setup.py b/setup.py index 82fe3b7a4..da8b2e99b 100644 --- a/setup.py +++ b/setup.py @@ -101,6 +101,7 @@ def run_tests(self): "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Programming Language :: Python :: Implementation :: CPython", ], ) diff --git a/win-requirements.txt b/win-requirements.txt index 4af4a9fc5..1caf5da9c 100644 --- a/win-requirements.txt +++ b/win-requirements.txt @@ -1,4 +1,4 @@ -rrequirements.txt -PyQt5==5.15.9 # pyup: ignore +PyQt5==5.15.10 # pyup: ignore pywin32==306 # pyup: ignore