Version bump - includes fixes for Python 3.7

bump_version_to.py

@@ -9,15 +9,15 @@ def update_version(filename, version):
     for line in fileinput.input(filename, inplace=True):
         rexp = "__version__\s*=.*"
         line = re.sub(rexp, "__version__ = \"%s\"" % version, line),
-        print line[0],
+        print(line[0], end='')
 
 assert len(sys.argv) > 1, "You need to specify the version (e.g. 6.6.6)"
 assert "v" not in sys.argv[1], "You need to specify the version (e.g. 6.6.6)"
 
 update_version(os.path.abspath("pyxrd/__version.py"), sys.argv[1])
 update_version(os.path.abspath("mvc/__version.py"), sys.argv[1])
 
-print subprocess.check_output(['git', 'add', 'pyxrd/__version.py'])
-print subprocess.check_output(['git', 'add', 'mvc/__version.py'])
-print subprocess.check_output(['git', 'commit', '-m', 'Version bump', '--allow-empty'])
-print subprocess.check_output(['git', 'tag', '-a', '%s' % sys.argv[1], '-m', '%s' % sys.argv[1]])
+print( subprocess.check_output(['git', 'add', 'pyxrd/__version.py']))
+print( subprocess.check_output(['git', 'add', 'mvc/__version.py']))
+print( subprocess.check_output(['git', 'commit', '-m', 'Version bump', '--allow-empty']))
+print( subprocess.check_output(['git', 'tag', '-a', '%s' % sys.argv[1], '-m', '%s' % sys.argv[1]]))

mvc/__version.py

@@ -1,32 +1,32 @@
-# coding=UTF-8
-# ex:ts=4:sw=4:et=on
-#  -------------------------------------------------------------------------
-#  Copyright (C) 2014 by Mathijs Dumon <mathijs dot dumon at gmail dot com>
-#  Copyright (c) 2007 by Guillaume Libersat <glibersat AT linux62.org>
-#  Copyright (C) 2005 by Roberto Cavada <roboogle@gmail.com>
-#
-#  mvc is a framework derived from the original pygtkmvc framework
-#  hosted at: <http://sourceforge.net/projects/pygtkmvc/>
-#
-#  mvc is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2 of the License, or (at your option) any later version.
-#
-#  mvc is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#  Boston, MA 02110, USA.
-#  -------------------------------------------------------------------------
-
-__version__ = "0.8.1"
-
-
-
-
-
+# coding=UTF-8
+# ex:ts=4:sw=4:et=on
+#  -------------------------------------------------------------------------
+#  Copyright (C) 2014 by Mathijs Dumon <mathijs dot dumon at gmail dot com>
+#  Copyright (c) 2007 by Guillaume Libersat <glibersat AT linux62.org>
+#  Copyright (C) 2005 by Roberto Cavada <roboogle@gmail.com>
+#
+#  mvc is a framework derived from the original pygtkmvc framework
+#  hosted at: <http://sourceforge.net/projects/pygtkmvc/>
+#
+#  mvc is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2 of the License, or (at your option) any later version.
+#
+#  mvc is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#  Boston, MA 02110, USA.
+#  -------------------------------------------------------------------------
+
+__version__ = "0.8.2"
+
+
+
+
+

mvc/adapters/gtk_support/treemodels/xy_list_store.py

@@ -40,7 +40,7 @@ def get_column_properties(cls):
             ('x', float),
             ('y', float)
         ]
-Point = namedtuple('Point', ['x', 'y'], verbose=False)
+Point = namedtuple('Point', ['x', 'y'])
 Point.Meta = PointMeta
 
 class XYListStore(BaseObjectListStore, Observer):

pyxrd/__version.py

@@ -1,13 +1,13 @@
-# coding=UTF-8
-# ex:ts=4:sw=4:et=on
-
-# Copyright (c) 2013, Mathijs Dumon
-# All rights reserved.
-# Complete license can be found in the LICENSE file.
-
-__version__ = "0.8.1"
-
-
-
-
-
+# coding=UTF-8
+# ex:ts=4:sw=4:et=on
+
+# Copyright (c) 2013, Mathijs Dumon
+# All rights reserved.
+# Complete license can be found in the LICENSE file.
+
+__version__ = "0.8.2"
+
+
+
+
+

pyxrd/data/settings.py

@@ -220,7 +220,7 @@
 ### Async calculation providers ###
 ASYNC_SERER_PROVIDERS = [
    "pyxrd.server.provider.Pyro4AsyncServerProvider",
-   "pyxrd.generic.async.dummy_async_provider.DummyAsyncServerProvider",
+   "pyxrd.generic.asynchronous.dummy_async_provider.DummyAsyncServerProvider",
 ]
 ASYNC_SERVER_PRELOAD = True
 

pyxrd/generic/outdated/__init__.py

@@ -51,12 +51,13 @@ def get_latest():
         latest = get_latest()
         parsed_latest = parse_version(latest)
 
-        if parsed_version > parsed_latest:
-            raise ValueError('Version %s is greater than the latest version on PyPI: %s' %
-                             (version, latest))
+		# Don't be stupid - I'm building more recent version locally that have not been released yet
+        #if parsed_version > parsed_latest:
+        #    raise ValueError('Version %s is greater than the latest version on PyPI: %s' %
+        #                     (version, latest))
 
     is_latest = parsed_version == parsed_latest
-    assert is_latest or parsed_version < parsed_latest
+    #assert is_latest or parsed_version < parsed_latest again don't be stupid
 
     with utils.cache_file(package, 'w') as f:
         data = [latest, utils.format_date(datetime.now())]

pyxrd/refinement/async_evaluatable.py

@@ -13,8 +13,8 @@
 import functools
 
 
-from pyxrd.generic.async.cancellable import Cancellable
-from pyxrd.generic.async.has_async_calls import HasAsyncCalls
+from pyxrd.generic.asynchronous.cancellable import Cancellable
+from pyxrd.generic.asynchronous.has_async_calls import HasAsyncCalls
 
 class AsyncEvaluatable(HasAsyncCalls, Cancellable):
 

pyxrd/refinement/controllers/refinement_controller.py

@@ -18,7 +18,7 @@
 from mvc.support.gui_loop import run_when_idle, add_timeout_call,\
     remove_timeout_call
 
-from pyxrd.generic.async.providers import get_status
+from pyxrd.generic.asynchronous.providers import get_status
 from pyxrd.generic.views.treeview_tools import new_text_column, new_pb_column, new_toggle_column
 from pyxrd.generic.mathtext_support import create_pb_from_mathtext
 from pyxrd.generic.controllers import DialogController

pyxrd/refinement/methods/deap_pso_cma.py

@@ -16,7 +16,7 @@
 from deap.tools import HallOfFame
 from deap import creator, base, tools #@UnresolvedImport
 
-from pyxrd.generic.async.cancellable import Cancellable
+from pyxrd.generic.asynchronous.cancellable import Cancellable
 from pyxrd.refinement.refine_async_helper import RefineAsyncHelper
 
 from ..refine_method import RefineMethod

pyxrd/server/provider.py

@@ -26,7 +26,7 @@
 except ImportError:
     from threading import RLock
 
-from pyxrd.generic.async.exceptions import *
+from pyxrd.generic.asynchronous.exceptions import *
 from pyxrd.data.appdirs import user_log_dir
 
 from . import settings