diff --git a/bump_version_to.py b/bump_version_to.py index 98906c8c..3820883e 100644 --- a/bump_version_to.py +++ b/bump_version_to.py @@ -9,7 +9,7 @@ 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)" @@ -17,7 +17,7 @@ def update_version(filename, version): 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]])) diff --git a/mvc/__version.py b/mvc/__version.py index 4e56209f..f0338774 100644 --- a/mvc/__version.py +++ b/mvc/__version.py @@ -1,32 +1,32 @@ -# coding=UTF-8 -# ex:ts=4:sw=4:et=on -# ------------------------------------------------------------------------- -# Copyright (C) 2014 by Mathijs Dumon -# Copyright (c) 2007 by Guillaume Libersat -# Copyright (C) 2005 by Roberto Cavada -# -# mvc is a framework derived from the original pygtkmvc framework -# hosted at: -# -# 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 +# Copyright (c) 2007 by Guillaume Libersat +# Copyright (C) 2005 by Roberto Cavada +# +# mvc is a framework derived from the original pygtkmvc framework +# hosted at: +# +# 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" + + + + + diff --git a/mvc/adapters/gtk_support/treemodels/xy_list_store.py b/mvc/adapters/gtk_support/treemodels/xy_list_store.py index fa60ea40..90aefe14 100644 --- a/mvc/adapters/gtk_support/treemodels/xy_list_store.py +++ b/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): diff --git a/pyxrd/__version.py b/pyxrd/__version.py index 294d20b3..995349d1 100644 --- a/pyxrd/__version.py +++ b/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" + + + + + diff --git a/pyxrd/data/settings.py b/pyxrd/data/settings.py index e46f4651..3bd6ce63 100644 --- a/pyxrd/data/settings.py +++ b/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 diff --git a/pyxrd/generic/async/__init__.py b/pyxrd/generic/asynchronous/__init__.py similarity index 100% rename from pyxrd/generic/async/__init__.py rename to pyxrd/generic/asynchronous/__init__.py diff --git a/pyxrd/generic/async/cancellable.py b/pyxrd/generic/asynchronous/cancellable.py similarity index 100% rename from pyxrd/generic/async/cancellable.py rename to pyxrd/generic/asynchronous/cancellable.py diff --git a/pyxrd/generic/async/dummy_async_provider.py b/pyxrd/generic/asynchronous/dummy_async_provider.py similarity index 100% rename from pyxrd/generic/async/dummy_async_provider.py rename to pyxrd/generic/asynchronous/dummy_async_provider.py diff --git a/pyxrd/generic/async/dummy_async_result.py b/pyxrd/generic/asynchronous/dummy_async_result.py similarity index 100% rename from pyxrd/generic/async/dummy_async_result.py rename to pyxrd/generic/asynchronous/dummy_async_result.py diff --git a/pyxrd/generic/async/dummy_async_server.py b/pyxrd/generic/asynchronous/dummy_async_server.py similarity index 100% rename from pyxrd/generic/async/dummy_async_server.py rename to pyxrd/generic/asynchronous/dummy_async_server.py diff --git a/pyxrd/generic/async/exceptions.py b/pyxrd/generic/asynchronous/exceptions.py similarity index 100% rename from pyxrd/generic/async/exceptions.py rename to pyxrd/generic/asynchronous/exceptions.py diff --git a/pyxrd/generic/async/has_async_calls.py b/pyxrd/generic/asynchronous/has_async_calls.py similarity index 100% rename from pyxrd/generic/async/has_async_calls.py rename to pyxrd/generic/asynchronous/has_async_calls.py diff --git a/pyxrd/generic/async/providers.py b/pyxrd/generic/asynchronous/providers.py similarity index 100% rename from pyxrd/generic/async/providers.py rename to pyxrd/generic/asynchronous/providers.py diff --git a/pyxrd/generic/outdated/__init__.py b/pyxrd/generic/outdated/__init__.py index 465dcb33..14523f01 100644 --- a/pyxrd/generic/outdated/__init__.py +++ b/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())] diff --git a/pyxrd/refinement/async_evaluatable.py b/pyxrd/refinement/async_evaluatable.py index e5a3efbe..611f0878 100644 --- a/pyxrd/refinement/async_evaluatable.py +++ b/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): diff --git a/pyxrd/refinement/controllers/refinement_controller.py b/pyxrd/refinement/controllers/refinement_controller.py index 3bcb5e6d..72f80591 100644 --- a/pyxrd/refinement/controllers/refinement_controller.py +++ b/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 diff --git a/pyxrd/refinement/methods/deap_pso_cma.py b/pyxrd/refinement/methods/deap_pso_cma.py index 62a88f42..5d27e5cd 100644 --- a/pyxrd/refinement/methods/deap_pso_cma.py +++ b/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 diff --git a/pyxrd/server/provider.py b/pyxrd/server/provider.py index 7144fb02..956ea585 100644 --- a/pyxrd/server/provider.py +++ b/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