Skip to content

Commit a34cd74

Browse files
committed
Merge branch '2.2'
2 parents 2ddd13c + 3969819 commit a34cd74

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

gns3/crash_report.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ def __init__(self):
8181
default_integrations=False,
8282
integrations=[sentry_logging])
8383

84-
sentry_sdk.init(dsn=CrashReport.DSN,
85-
release=__version__,
86-
ca_certs=cacert)
87-
8884
tags = {
8985
"os:name": platform.system(),
9086
"os:release": platform.release(),

gns3/registry/appliance.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import json
2020
import copy
2121
import os
22-
import collections
22+
import collections.abc
2323
import jsonschema
2424

2525

@@ -30,7 +30,7 @@ class ApplianceError(Exception):
3030
pass
3131

3232

33-
class Appliance(collections.Mapping):
33+
class Appliance(collections.abc.Mapping):
3434

3535
def __init__(self, registry, path):
3636
"""

gns3/version.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
# or negative for a release candidate or beta (after the base version
2424
# number has been incremented)
2525

26-
__version__ = "2.2.10"
27-
__version_info__ = (2, 2, 10, 0)
26+
__version__ = "2.2.11dev1"
27+
__version_info__ = (2, 2, 11, 99)
2828

2929
# If it's a git checkout try to add the commit
3030
if "dev" in __version__:

tests/test_local_config.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from unittest.mock import patch, MagicMock
2323

2424
from gns3.local_config import LocalConfig
25+
from gns3.version import __version_info__
2526

2627

2728
@pytest.fixture
@@ -119,16 +120,17 @@ def test_migrateOldConfigOSX(tmpdir):
119120

120121
local_config = LocalConfig()
121122

122-
assert os.path.exists(str(tmpdir / '.config' / 'GNS3'))
123-
assert os.path.exists(str(tmpdir / '.config' / 'GNS3' / 'hello'))
123+
version = "{}.{}".format(__version_info__[0], __version_info__[1])
124+
assert os.path.exists(str(tmpdir / '.config' / 'GNS3' / version))
125+
assert os.path.exists(str(tmpdir / '.config' / 'GNS3' / version / 'hello'))
124126
assert os.path.exists(str(tmpdir / '.config' / 'gns3.net'))
125127

126128
# It should migrate only one time
127129
open(str(tmpdir / '.config' / 'gns3.net' / 'world'), 'w+').close()
128130

129131
local_config._migrateOldConfigPath()
130-
assert os.path.exists(str(tmpdir / '.config' / 'GNS3' / 'hello'))
131-
assert not os.path.exists(str(tmpdir / '.config' / 'GNS3' / 'world'))
132+
assert os.path.exists(str(tmpdir / '.config' / 'GNS3' / version / 'hello'))
133+
assert not os.path.exists(str(tmpdir / '.config' / 'GNS3' / version / 'world'))
132134

133135

134136
def test_migrate13Config(tmpdir):

0 commit comments

Comments
 (0)