diff --git a/build_tools/build.js b/build_tools/build.js index 6bb98df0..fb8a0de0 100755 --- a/build_tools/build.js +++ b/build_tools/build.js @@ -53,13 +53,19 @@ copydir('src/assets', 'mopidy_iris/static/assets', function(error){ fs.writeFileSync(html_file, html_file_content, 'utf8'); console.log('Setting version in HTML'); - console.log('Setting version in Python'); + console.log('Setting version in __init__.py'); var init_file = "mopidy_iris/__init__.py"; var init_file_content = fs.readFileSync(init_file, "utf8"); init_file_content = init_file_content.replace(/(?:__version__\ \=\ \')(?:.*)'/, "__version__ = '"+version+"'"); fs.writeFileSync(init_file, init_file_content, 'utf8'); - console.log('Setting version in NPM'); + console.log('Setting version in setup.cfg'); + var init_file = "mopidy_iris/__init__.py"; + var init_file_content = fs.readFileSync(init_file, "utf8"); + init_file_content = init_file_content.replace(/(?:version\ \=\ \')(?:.*)'/, "version = '"+version+"'"); + fs.writeFileSync(init_file, init_file_content, 'utf8'); + + console.log('Setting version in package.json'); var package_file = "package.json"; var package_file_content = fs.readFileSync(package_file, "utf8"); package_file_content = package_file_content.replace(/(?:\"version\"\:\ \")(?:.*)"/, '"version": "'+version+'"'); diff --git a/mopidy_iris/static/index.html b/mopidy_iris/static/index.html index 3349b696..c54bcf41 100644 --- a/mopidy_iris/static/index.html +++ b/mopidy_iris/static/index.html @@ -100,7 +100,7 @@ // Release details // These are automatically injected to built HTML - var build = "1580404628"; + var build = "1580405383"; var version = "3.44.0"; // Construct the script tag diff --git a/mopidy_iris/static/manifest.json b/mopidy_iris/static/manifest.json index 98007770..09e55fe1 100755 --- a/mopidy_iris/static/manifest.json +++ b/mopidy_iris/static/manifest.json @@ -1,5 +1,5 @@ { - "manifest_version": 3.40, + "manifest_version": 3.44, "short_name": "Iris", "name": "Iris", "icons": [ diff --git a/setup.cfg b/setup.cfg index c7a4dfbc..b0716125 100755 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = Mopidy-Iris -version = 3.0.0 +version = 3.44.0 url = https://github.com/jaedb/mopidy-iris author = James Barnsley author_email = james@barnsley.nz diff --git a/src/manifest.json b/src/manifest.json index 98007770..09e55fe1 100755 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,5 +1,5 @@ { - "manifest_version": 3.40, + "manifest_version": 3.44, "short_name": "Iris", "name": "Iris", "icons": [ diff --git a/tests/test_system.py b/tests/test_system.py old mode 100644 new mode 100755 index 5fd08206..95ffbc53 --- a/tests/test_system.py +++ b/tests/test_system.py @@ -5,13 +5,13 @@ from mopidy_iris.system import IrisSystemThread, IrisSystemPermissionError def test_system_sh_path(): - iris_system = IrisSystemThread('foo', None) + iris_system = IrisSystemThread('foo', None, None) assert iris_system.script_path.is_file() assert iris_system.script_path.name == "system.sh" def test_can_run(): - iris_system = IrisSystemThread('foo', None) + iris_system = IrisSystemThread('foo', None, None) iris_system._USE_SUDO = False assert iris_system.can_run() is True