raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Replace launchpad references

Browse Source
This commit is contained in:
Bastian Germann 2019-09-21 00:47:38 +02:00
parent 1fe14b66f1
commit 1a756def20
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/appveyor-webhook.py
View File

@ -96,7 +96,7 @@ def get_yml(branch, build_type):
version_string, version = get_version() version_string, version = get_version()
yml_text = yml_text.replace('TAG', version) yml_text = yml_text.replace('TAG', version)
if build_type in ['openlp', 'trunk']: 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') yml_text = yml_text.replace('BUILD_DOCS', '$TRUE')
else: else:
yml_text = yml_text.replace('BRANCHPATH', branch.split(':')[1]) yml_text = yml_text.replace('BRANCHPATH', branch.split(':')[1])

6
scripts/appveyor.yml
View File

@ -4,7 +4,7 @@ image:
- Visual Studio 2017 - Visual Studio 2017
clone_script: 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 e sourcecode.tar.gz
- 7z x sourcecode.tar - 7z x sourcecode.tar
- mv BRANCHPATH openlp-branch - mv BRANCHPATH openlp-branch
@ -46,7 +46,7 @@ after_test:
# Install VLC # Install VLC
- choco install %CHOCO_VLC% - choco install %CHOCO_VLC%
# Get the packaging code # 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 e packaging.tar.gz
- 7z x packaging.tar - 7z x packaging.tar
- mv ~openlp-core/openlp/packaging packaging - mv ~openlp-core/openlp/packaging packaging
@ -54,7 +54,7 @@ after_test:
- ps: >- - ps: >-
If (BUILD_DOCS) { If (BUILD_DOCS) {
&"$env:PYTHON\python.exe" -m pip install sphinx &"$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 e documentation.tar.gz
7z x documentation.tar 7z x documentation.tar
mv ~openlp-core/openlp/documentation documentation mv ~openlp-core/openlp/documentation documentation

4
tests/functional/openlp_plugins/bibles/test_lib.py
View File

@ -127,7 +127,7 @@ class TestLib(TestCase, TestMixin):
""" """
Test that the 'range' regex parses bible verse references correctly. 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! 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. # 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': ''})): 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. # 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': ''})): 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 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 = [ test_data = [
('23', ['23']), ('23', ['23']),
('23{to}24', ['23-24']), ('23{to}24', ['23-24']),