Skip to content

Commit

Permalink
Bump version to alpha4.
Browse files Browse the repository at this point in the history
  • Loading branch information
grossmj committed May 14, 2014
1 parent 18550ed commit 56c6875
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include INSTALL
include LICENSE
include MANIFEST.in
include tox.ini
recursive-include tests *
recursive-exclude tests *
recursive-include docs *
recursive-include gns3 *
recursive-exclude * __pycache__
Expand Down
4 changes: 1 addition & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ Dependencies:
sudo python3 setup.py install
gns3
`Detailed instructions for Debian Jesse <http://forum.gns3.net/topic8988.html>`_.

Windows
-------

Expand All @@ -36,7 +34,7 @@ DMG package is not available yet.

You can manually install using the following steps (experimental):

First install homebrew `http://brew.sh/`_.
`First install homebrew <http://brew.sh/>`_.

Then install GNS3 dependencies.

Expand Down
2 changes: 1 addition & 1 deletion gns3/modules/builtin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def allocateServer(self, node_class):
local_server = servers.localServer()
remote_servers = servers.remoteServers()

if not all(using_local_server):
if not all(using_local_server) and len(remote_servers):
# a module is not using a local server

if not True in using_local_server and len(remote_servers) == 1:
Expand Down
2 changes: 1 addition & 1 deletion gns3/modules/dynamips/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def setProjectFilesDir(self, path):
:param path: path to the local project files directory
"""

self._delete_dynamips_files()
#self._delete_dynamips_files() #FIXME: cause issues
self._working_dir = path
log.info("local working directory for Dynamips module: {}".format(self._working_dir))

Expand Down
2 changes: 2 additions & 0 deletions gns3/modules/vpcs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ def nodes():
:returns: list of classes
"""

return []
return [VPCSDevice]

@staticmethod
Expand All @@ -309,6 +310,7 @@ def preferencePages():
:returns: QWidget object list
"""

return []
from .pages.vpcs_preferences_page import VPCSPreferencesPage
return [VPCSPreferencesPage]

Expand Down
14 changes: 7 additions & 7 deletions gns3/preferences_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ def _loadPreferencePages(self):
self._items.append(item)

# load cloud settings page
cloud_page = CloudPreferencesPage()
cloud_page.loadPreferences()
name = cloud_page.windowTitle()
item = QtGui.QListWidgetItem(name, self.uiListWidget)
item.setData(QtCore.Qt.UserRole, cloud_page)
self.uiStackedWidget.addWidget(cloud_page)
self._items.append(item)
#cloud_page = CloudPreferencesPage()
#cloud_page.loadPreferences()
#name = cloud_page.windowTitle()
#item = QtGui.QListWidgetItem(name, self.uiListWidget)
#item.setData(QtCore.Qt.UserRole, cloud_page)
#self.uiStackedWidget.addWidget(cloud_page)
#self._items.append(item)

# load module preference pages
for module in MODULES:
Expand Down
2 changes: 1 addition & 1 deletion gns3/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
number has been incremented)
"""

__version__ = "1.0a4.dev2"
__version__ = "1.0a4"
__version_info__ = (1, 0, 0, -99)

0 comments on commit 56c6875

Please sign in to comment.