From 351ed64de9ca40266f2e923a3bc39fbd6c6980dc Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 17 May 2019 09:56:16 +0700 Subject: [PATCH 1/3] Force aiohttp version to 2.3.10 and aiohttp-cors version to 0.5.3 This is to fix build issue for Ubuntu 19.04 package on Launchpad. Ref #1583 https://github.com/GNS3/gns3-gui/issues/2774 --- requirements.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2578f031..c82bb798 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ jsonschema==2.6.0 -aiohttp>=2.3.3,<2.4.0 # pyup: ignore -aiohttp-cors>=0.5.3,<0.6.0 # pyup: ignore +aiohttp==2.3.10 +aiohttp-cors==0.5.3 yarl>=0.11 Jinja2>=2.7.3 raven>=5.23.0 @@ -9,3 +9,4 @@ zipstream>=1.1.4 typing>=3.5.3.0 # Otherwise yarl fails with python 3.4 prompt-toolkit==1.0.15 async-timeout<3.0.0 # pyup: ignore; 3.0 drops support for python 3.4 + From 6b54cc27dafedaecaf925f1e131d84c1e37f13fb Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 17 May 2019 15:10:28 +0700 Subject: [PATCH 2/3] Release v2.1.17 --- CHANGELOG | 4 ++++ gns3server/crash_report.py | 2 +- gns3server/version.py | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 33606517..1cbc6b9b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ # Change Log +## 2.1.17 17/05/2019 + +* Force aiohttp version to 2.3.10 and aiohttp-cors version to 0.5.3 This is to fix build issue for Ubuntu 19.04 package on Launchpad. Ref #1583 https://github.com/GNS3/gns3-gui/issues/2774 + ## 2.1.16 15/04/2019 * Fix broken embedded console for Ethernet switch. Fixes #1574 diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py index d6b79b46..2620a383 100644 --- a/gns3server/crash_report.py +++ b/gns3server/crash_report.py @@ -57,7 +57,7 @@ class CrashReport: Report crash to a third party service """ - DSN = "https://6536a51af3154084859112bacb4f2277:72822a229faa463ba6c9338126a6f280@sentry.io/38482" + DSN = "https://e4fc8dc4f6f5477da9fac2c8c7b56ebf:c6b9325018ec4d37aabba5340d617664@sentry.io/38482" if hasattr(sys, "frozen"): cacert = get_resource("cacert.pem") if cacert is not None and os.path.isfile(cacert): diff --git a/gns3server/version.py b/gns3server/version.py index f8a2e8d8..19df8656 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,8 +23,8 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "2.1.17dev1" -__version_info__ = (2, 1, 17, 99) +__version__ = "2.1.17" +__version_info__ = (2, 1, 17, 0) # If it's a git checkout try to add the commit if "dev" in __version__: From 773bad811ad2620d4c9582d29a62ffc7709f0d3a Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 17 May 2019 16:14:19 +0700 Subject: [PATCH 3/3] Fix invalid reStructuredText for long description in setup.py --- README.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 0f58de70..a36bd211 100644 --- a/README.rst +++ b/README.rst @@ -23,7 +23,7 @@ master is the next stable release, you can test it in your day to day activities Bug fixes or small improvements pull requests go here. 2.x (2.1 for example) -******** +********************* Next major release *Never* use this branch for production. Pull requests for major new features go here. @@ -100,7 +100,7 @@ All the init script require the creation of a GNS3 user. You can change it to an sudo adduser gns3 upstart -~~~~~~~ +------- For ubuntu < 15.04 @@ -113,7 +113,8 @@ You need to copy init/gns3.conf.upstart to /etc/init/gns3.conf systemd -~~~~~~~~ +------- + You need to copy init/gns3.service.systemd to /lib/systemd/system/gns3.service .. code:: bash @@ -219,5 +220,5 @@ If you want test coverage: Security issues ---------------- -Please contact us using contact informations available here: +Please contact us using contact form available here: http://docs.gns3.com/1ON9JBXSeR7Nt2-Qum2o3ZX0GU86BZwlmNSUgvmqNWGY/index.html