diff --git a/cuckoo/compat/config.py b/cuckoo/compat/config.py index e4bdc20549..cc18e93f5f 100644 --- a/cuckoo/compat/config.py +++ b/cuckoo/compat/config.py @@ -696,7 +696,7 @@ def _204_205(c): c["auxiliary"]["mitm"]["script"] = "stuff/mitm.py" return c -def _205_210(c): +def _205_206(c): c["cuckoo"]["remotecontrol"] = { "enabled": False, "guacd_host": "localhost", @@ -722,7 +722,7 @@ def _205_210(c): "2.0.2": ("2.0.3", None), "2.0.3": ("2.0.4", _203_204), "2.0.4": ("2.0.5", _204_205), - "2.0.5": ("2.1.0", _205_210), + "2.0.5": ("2.0.6", _205_206), # We're also capable of migrating away from 2.0-dev which basically means # that we might have to a partial migration from either 2.0-rc2 or 2.0-rc1. diff --git a/cuckoo/misc.py b/cuckoo/misc.py index 99c0063aba..a137abc1b7 100644 --- a/cuckoo/misc.py +++ b/cuckoo/misc.py @@ -33,7 +33,7 @@ # Normalized Cuckoo version (i.e., "2.0.5.3" in setup is "2.0.5" here). This # because we use StrictVersion() later on which doesn't accept "2.0.5.3". -version = "2.0.5" +version = "2.0.6" def set_cwd(path, raw=None): global _root, _raw diff --git a/cuckoo/private/db_migration/versions/from_2_0_5_3_to_2_1_add_machine_rcparams.py b/cuckoo/private/db_migration/versions/from_205_to_206_add_machine_rcparams.py similarity index 89% rename from cuckoo/private/db_migration/versions/from_2_0_5_3_to_2_1_add_machine_rcparams.py rename to cuckoo/private/db_migration/versions/from_205_to_206_add_machine_rcparams.py index ce3635b6da..b7865b8843 100644 --- a/cuckoo/private/db_migration/versions/from_2_0_5_3_to_2_1_add_machine_rcparams.py +++ b/cuckoo/private/db_migration/versions/from_205_to_206_add_machine_rcparams.py @@ -2,7 +2,7 @@ # This file is part of Cuckoo Sandbox - http://www.cuckoosandbox.org # See the file 'docs/LICENSE' for copying permission. -"""add rcparams field to machine (from Cuckoo 2.0.5.3 to 2.1) +"""add rcparams field to machine (from Cuckoo 2.0.5 to 2.0.6) Revision ID: cb1024e614b7 Revises: 181be2111077 diff --git a/docs/book/conf.py b/docs/book/conf.py index bdecc9f46f..7945cefb7a 100644 --- a/docs/book/conf.py +++ b/docs/book/conf.py @@ -47,9 +47,9 @@ # built documents. # # The short X.Y version. -version = '2.0.5' +version = '2.0.6' # The full version, including alpha/beta/rc tags. -release = '2.0.5' +release = '2.0.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 6fb518b9d1..c77adfb30f 100755 --- a/setup.py +++ b/setup.py @@ -149,7 +149,7 @@ def do_setup(**kwargs): do_setup( name="Cuckoo", - version="2.0.5.3", + version="2.0.6", author="Stichting Cuckoo Foundation", author_email="cuckoo@cuckoofoundation.org", packages=[ diff --git a/tests/test_config.py b/tests/test_config.py index 4038c00cff..c55eae6583 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1128,7 +1128,7 @@ def test_migration_204_205(): assert cfg["auxiliary"]["mitm"]["script"] == "stuff/mitm.py" -def test_migration_205_210(): +def test_migration_205_206(): set_cwd(tempfile.mkdtemp()) Folders.create(cwd(), "conf") @@ -1142,7 +1142,7 @@ def test_migration_205_210(): mode = headless """) cfg = Config.from_confdir(cwd("conf"), loose=True) - cfg = migrate(cfg, "2.0.5", "2.1.0") + cfg = migrate(cfg, "2.0.5", "2.0.6") assert cfg["cuckoo"]["remotecontrol"]["enabled"] == False assert cfg["cuckoo"]["remotecontrol"]["guacd_host"] == "localhost"