From 1a756def20ff7400eb0c7a6c2f286adbd7e33e67 Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Sat, 21 Sep 2019 00:47:38 +0200 Subject: [PATCH] Replace launchpad references --- scripts/appveyor-webhook.py | 2 +- scripts/appveyor.yml | 6 +++--- tests/functional/openlp_plugins/bibles/test_lib.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/appveyor-webhook.py b/scripts/appveyor-webhook.py index ca4caada6..e184a21b4 100755 --- a/scripts/appveyor-webhook.py +++ b/scripts/appveyor-webhook.py @@ -96,7 +96,7 @@ def get_yml(branch, build_type): version_string, version = get_version() yml_text = yml_text.replace('TAG', version) if build_type in ['openlp', 'trunk']: - yml_text = yml_text.replace('BRANCHPATH', '~openlp-core/openlp/trunk') + yml_text = yml_text.replace('BRANCHPATH', 'master') yml_text = yml_text.replace('BUILD_DOCS', '$TRUE') else: yml_text = yml_text.replace('BRANCHPATH', branch.split(':')[1]) diff --git a/scripts/appveyor.yml b/scripts/appveyor.yml index 90644c733..c12ae7b82 100644 --- a/scripts/appveyor.yml +++ b/scripts/appveyor.yml @@ -4,7 +4,7 @@ image: - Visual Studio 2017 clone_script: - - curl -L https://bazaar.launchpad.net/BRANCHPATH/tarball -o sourcecode.tar.gz + - curl -L https://gitlab.com/openlp/openlp/-/archive/BRANCHPATH/openlp-BRANCHPATH.tar.gz -o sourcecode.tar.gz - 7z e sourcecode.tar.gz - 7z x sourcecode.tar - mv BRANCHPATH openlp-branch @@ -46,7 +46,7 @@ after_test: # Install VLC - choco install %CHOCO_VLC% # Get the packaging code - - appveyor DownloadFile http://bazaar.launchpad.net/~openlp-core/openlp/packaging/tarball -FileName packaging.tar.gz + - appveyor DownloadFile https://gitlab.com/openlp/packaging/-/archive/master/packaging-master.tar.gz -FileName packaging.tar.gz - 7z e packaging.tar.gz - 7z x packaging.tar - mv ~openlp-core/openlp/packaging packaging @@ -54,7 +54,7 @@ after_test: - ps: >- If (BUILD_DOCS) { &"$env:PYTHON\python.exe" -m pip install sphinx - Invoke-WebRequest -Uri "http://bazaar.launchpad.net/~openlp-core/openlp/documentation/tarball" -OutFile documentation.tar.gz + Invoke-WebRequest -Uri "https://gitlab.com/openlp/documentation/-/archive/master/documentation-master.tar.gz" -OutFile documentation.tar.gz 7z e documentation.tar.gz 7z x documentation.tar mv ~openlp-core/openlp/documentation documentation diff --git a/tests/functional/openlp_plugins/bibles/test_lib.py b/tests/functional/openlp_plugins/bibles/test_lib.py index 1a9fa839f..33ea4e4b3 100644 --- a/tests/functional/openlp_plugins/bibles/test_lib.py +++ b/tests/functional/openlp_plugins/bibles/test_lib.py @@ -127,7 +127,7 @@ class TestLib(TestCase, TestMixin): """ Test that the 'range' regex parses bible verse references correctly. Note: This test takes in to account that the regex does not work quite as expected! - see https://bugs.launchpad.net/openlp/+bug/1638620 + see https://gitlab.com/openlp/openlp/issues/240 """ # GIVEN: Some test data which contains different references to parse, with the expected results. with patch('openlp.plugins.bibles.lib.Settings', return_value=MagicMock(**{'value.return_value': ''})): @@ -168,7 +168,7 @@ class TestLib(TestCase, TestMixin): # GIVEN: Some test data which contains different references to parse, with the expected results. with patch('openlp.plugins.bibles.lib.Settings', return_value=MagicMock(**{'value.return_value': ''})): # The following test data tests with 111 variants when using the default 'separators' - # The regex for handling ranges is a bit screwy, see https://bugs.launchpad.net/openlp/+bug/1638620 + # The regex for handling ranges is a bit screwy, see https://gitlab.com/openlp/openlp/issues/240 test_data = [ ('23', ['23']), ('23{to}24', ['23-24']),