diff --git a/README.rst b/README.rst index 80722e2e..dc739de4 100644 --- a/README.rst +++ b/README.rst @@ -1,15 +1,15 @@ KIWI - Next Generation ====================== -.. |Build Status| image:: https://travis-ci.com/SUSE/kiwi.svg?branch=master - :target: https://travis-ci.com/SUSE/kiwi +.. |Build Status| image:: https://travis-ci.com/OSInside/kiwi.svg?branch=master + :target: https://travis-ci.com/OSInside/kiwi .. |GitLab CI Pipeline| image:: https://gitlab.com/schaefi/kiwi-ci/badges/master/pipeline.svg :target: https://gitlab.com/schaefi/kiwi-ci/pipelines .. |Health| image:: https://api.codacy.com/project/badge/Grade/8ebd8ce362294fabb0870f50358e564f - :target: https://www.codacy.com/app/Appliances/kiwi?utm_source=github.com&utm_medium=referral&utm_content=SUSE/kiwi&utm_campaign=Badge_Grade -.. |Doc| replace:: `Documentation `__ -.. |Installation| replace:: `Installation `__ -.. |Contributing| replace:: `Contributing `__ + :target: https://www.codacy.com/app/Appliances/kiwi?utm_source=github.com&utm_medium=referral&utm_content=OSInside/kiwi&utm_campaign=Badge_Grade +.. |Doc| replace:: `Documentation `__ +.. |Installation| replace:: `Installation `__ +.. |Contributing| replace:: `Contributing `__ .. |Donate| image:: https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif :target: https://www.paypal.me/SchaeferMarcus diff --git a/doc/source/conf.py b/doc/source/conf.py index f684c4ba..4aacfbcc 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -165,9 +165,9 @@ pygments_style = 'sphinx' todo_include_todos = True extlinks = { - 'issue': ('https://github.com/SUSE/kiwi/issues/%s', '#'), - 'pr': ('https://github.com/SUSE/kiwi/pull/%s', 'PR #'), - 'ghkiwi': ('https://github.com/SUSE/kiwi/blob/master/%s', '') + 'issue': ('https://github.com/OSInside/kiwi/issues/%s', '#'), + 'pr': ('https://github.com/OSInside/kiwi/pull/%s', 'PR #'), + 'ghkiwi': ('https://github.com/OSInside/kiwi/blob/master/%s', '') } diff --git a/doc/source/development.rst b/doc/source/development.rst index 24831947..d58c88d7 100644 --- a/doc/source/development.rst +++ b/doc/source/development.rst @@ -20,12 +20,12 @@ driven development rules. If you want to implement a bigger feature, consider opening an issue on GitHub first to discuss the changes. Or join the discussion in the -``#kiwi`` channel on `Riot.im `_. +``#kiwi`` channel on `Riot.im `_. Fork the upstream KIWI repository --------------------------------- -1. On GitHub, navigate to: https://github.com/SUSE/kiwi +1. On GitHub, navigate to: https://github.com/OSInside/kiwi 2. In the top-right corner of the page, click :command:`Fork`. @@ -36,7 +36,7 @@ Create a local clone of the forked KIWI repository $ git clone https://github.com/YOUR-USERNAME/kiwi - $ git remote add upstream https://github.com/SUSE/kiwi.git + $ git remote add upstream https://github.com/OSInside/kiwi.git Install Required Operating System Packages ------------------------------------------ @@ -219,7 +219,7 @@ Make and commit your changes. $ git commit -S -a Run the tests and code style checks. All of these are also performed by the -`Travis CI `_ and `GitLab CI +`Travis CI `_ and `GitLab CI `_ integration test systems when a pull request is created. diff --git a/doc/source/index.rst b/doc/source/index.rst index 0581f506..edd29be2 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -8,8 +8,8 @@ build Linux system appliances. .. sidebar:: Links - * `GitHub Sources `__ - * `GitHub Releases `__ + * `GitHub Sources `__ + * `GitHub Releases `__ * `RPM Packages `__ * `Build Tests(x86) `__ * `Build Tests(arm) `__ @@ -80,7 +80,7 @@ Contact `subscribe `__, even if you do not have a Google account. -* `Matrix `__ +* `Matrix `__ An open network for secure, decentralized communication. Please find the `kiwi` room via `Riot `__ on the web or by using diff --git a/doc/source/working_with_kiwi.rst b/doc/source/working_with_kiwi.rst index 2a0db04e..98814fa6 100644 --- a/doc/source/working_with_kiwi.rst +++ b/doc/source/working_with_kiwi.rst @@ -144,7 +144,7 @@ The prepare step consists of the following substeps: installation of packages into the new root tree. The aforementioned two packages might not be enough for every distribution. Consult the `kiwi-descriptions repository - `_ containing examples for + `_ containing examples for various Linux distributions. The installation of software packages through the selected package diff --git a/doc/source/working_with_kiwi/legacy_kiwi.rst b/doc/source/working_with_kiwi/legacy_kiwi.rst index 6e052eea..63a5f689 100644 --- a/doc/source/working_with_kiwi/legacy_kiwi.rst +++ b/doc/source/working_with_kiwi/legacy_kiwi.rst @@ -10,7 +10,7 @@ Legacy KIWI vs. Next Generation maintenance state of the legacy kiwi version and under which circumstances the use of the legacy kiwi version is required. -There is still the former `KIWI `__ +There is still the former `KIWI `__ version and we decided to rewrite it. The reasons to rewrite software from scratch could be very different @@ -52,7 +52,7 @@ the used KIWI version. This provides an opportunity for users to test the next generation KIWI with their appliance descriptions without risk. If it builds and works as expected, I recommend to switch to the next generation KIWI. If not, -please open an issue on https://github.com/SUSE/kiwi. +please open an issue on https://github.com/OSInside/kiwi. The legacy KIWI version will be further developed in maintenance mode. There won't be any new features added in that code base though. diff --git a/kiwi/defaults.py b/kiwi/defaults.py index 47919a26..49ec6df5 100644 --- a/kiwi/defaults.py +++ b/kiwi/defaults.py @@ -495,7 +495,7 @@ class Defaults(object): :rtype: str """ - return 'KIWI - http://suse.github.com/kiwi' + return 'KIWI - https://github.com/OSInside/kiwi' @staticmethod def get_publisher(): diff --git a/kiwi/kiwi_compat.py b/kiwi/kiwi_compat.py index 718b15cc..6adaf120 100644 --- a/kiwi/kiwi_compat.py +++ b/kiwi/kiwi_compat.py @@ -73,7 +73,7 @@ class Cli(object): 'In case of a correct legacy kiwi command but not', 'supported by kiwicompat, please contact us via the', 'github issue system at:\n', - 'https://github.com/SUSE/kiwi/issues' + 'https://github.com/OSInside/kiwi/issues' ] ) raise NotImplementedError( diff --git a/setup.py b/setup.py index 55f9897d..3c75a274 100755 --- a/setup.py +++ b/setup.py @@ -179,7 +179,7 @@ config = { 'name': 'kiwi', 'description': 'KIWI - Appliance Builder (next generation)', 'author': 'Marcus Schaefer', - 'url': 'http://suse.github.io/kiwi', + 'url': 'https://osinside.github.io/kiwi', 'download_url': 'https://download.opensuse.org/repositories/Virtualization:/Appliances:/Builder', 'author_email': 'ms@suse.com', 'version': __version__, diff --git a/test/unit/builder_live_test.py b/test/unit/builder_live_test.py index e0517d69..32ef033f 100644 --- a/test/unit/builder_live_test.py +++ b/test/unit/builder_live_test.py @@ -258,7 +258,7 @@ class TestLiveImageBuilder(object): custom_args={ 'meta_data': { 'mbr_id': '0xffffffff', - 'preparer': 'KIWI - http://suse.github.com/kiwi', + 'preparer': 'KIWI - https://github.com/OSInside/kiwi', 'publisher': 'Custom publisher', 'volume_id': 'volid', 'efi_mode': 'uefi', diff --git a/test/unit/defaults_test.py b/test/unit/defaults_test.py index 59fddc3a..a4f806b5 100644 --- a/test/unit/defaults_test.py +++ b/test/unit/defaults_test.py @@ -36,7 +36,7 @@ class TestDefaults(object): ) def test_get_preparer(self): - assert Defaults.get_preparer() == 'KIWI - http://suse.github.com/kiwi' + assert Defaults.get_preparer() == 'KIWI - https://github.com/OSInside/kiwi' def test_get_publisher(self): assert Defaults.get_publisher() == 'SUSE LINUX GmbH'