diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6eb1249d69e4bb059469ba40f0d24cfd4d7e18bb..3bbba9a1b743f7aa94a64f2a0a46176bf898aeca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,7 +16,7 @@ Write a patch Help yourself with the [documentation](http://docs.woob.tech/). -Find an opened issue on [this website](https://git.woob.tech/weboob/weboob/issues), +Find an opened issue on [this website](https://gitlab.com/woob/woob/issues), or write your own bugfix or feature. Then, once it is necessary, commit with: $ git commit -a @@ -36,14 +36,14 @@ You can run these scripts to be sure your patch doesn't break anything: $ tools/run_tests.sh yourmodulename # or without yourmodulename to test everything Perhaps you should also write or fix tests. These tests are automatically run by -[Gitlab CI](https://git.woob.tech/weboob/weboob/pipelines) at each commit and merge requests. +[Gitlab CI](https://gitlab.com/woob/woob/pipelines) at each commit and merge requests. Create a merge request or send a patch -------------------------------------- -The easiest way to send your patch is to create a fork on [the Weboob -Gitlab](https://git.woob.tech) and create a merge request from there. +The easiest way to send your patch is to create a fork on [the Woob +Gitlab](https://gitlab.com/woob/woob) and create a merge request from there. This way, the code review process is easier and continuous integration is run automatically (see previous section). @@ -53,7 +53,7 @@ If you prefer good old email patches, just use Then, send them with this command: - $ git send-email --to=weboob@woob.tech *.patch + $ git send-email --to=woob@woob.tech *.patch You can also send the files by yourself if you haven't any configured MTA on your system. @@ -61,14 +61,14 @@ You can also send the files by yourself if you haven't any configured MTA on you Notes on merging a merge request -------------------------------- -Few people (members of the [Weboob group on this -repo](https://git.woob.tech/groups/weboob/group_members)) have the right to +Few people (members of the [Woob group on this +repo](https://gitlab.com/groups/woob/-/group_members)) have the right to merge a MR. Anyone is welcome to review and comment pending merge requests. A merge request should in principle have at least two reviewers before getting merged. -Weboob repo should keep an history as linear as possible. Then, merging a merge +Woob repo should keep an history as linear as possible. Then, merging a merge request should be done locally, with prior rebasing upon the `master` branch and take care of using the `-ff-only` merge option. Merge requests should **NOT** be merged through the Gitlab UI, which would result in an extra "merge" diff --git a/README.md b/README.md index 8841e4f8551c55e0ea07f416088343a29be96718..9ee4a03ae46035ad7e0959042ba8810cc6d20fa8 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Woob is written in Python and is distributed under the LGPLv3+ license. For more information, please go to [the official website](https://woob.tech/). Some extra info is available in the [Gitlab -wiki](https://git.woob.tech/weboob/devel/wikis/home). +wiki](https://gitlab.com/weboob/devel/wikis/home). If you are a developper and looking for how to write a module or contribute to Woob, you can have a look at the [developper documentation](https://dev.woob.tech/). diff --git a/docs/source/guides/contribute.rst b/docs/source/guides/contribute.rst index 1870a33c648a5731be7f6aff160a1f3547830444..b9e53598996146cacf567b7f4b260ec079b1e041 100644 --- a/docs/source/guides/contribute.rst +++ b/docs/source/guides/contribute.rst @@ -36,7 +36,7 @@ Perhaps you should also write or fix tests. These tests are automatically run by Create a merge request or send a patch -------------------------------------- -The easiest way to send your patch is to create a fork on `the woob gitlab `_ and create a merge +The easiest way to send your patch is to create a fork on `the woob gitlab `_ and create a merge request from there. This way, the code review process is easier and continuous integration is run automatically (see previous section). diff --git a/docs/source/guides/tests.rst b/docs/source/guides/tests.rst index f290f9ace8e145f43a29c5f7f6079f13420ffb30..7e763d05147272e48b0223c7cc6aa23a6b26f8e6 100644 --- a/docs/source/guides/tests.rst +++ b/docs/source/guides/tests.rst @@ -21,7 +21,7 @@ Then, it run every method which name starts with ``test_``. .. note:: Some environment variables are available, to use specific backend file or send the test results. Refer to `the - comments in the script `_ for more infos on this. + comments in the script `_ for more infos on this. If a module name is passed as argument, only this module will be tested. For example, to only run ``lutim`` tests:: diff --git a/weboob/core/ouiboube.py b/weboob/core/ouiboube.py index 092c2d967aa852b29446664c15191ec54dbb94a5..ac0ec3ecd6af90c6e2455092069e1b72e5531f82 100644 --- a/weboob/core/ouiboube.py +++ b/weboob/core/ouiboube.py @@ -70,7 +70,7 @@ def __init__(self, modules_path=None, storage=None, scheduler=None): if modules_path is None: import pkg_resources # Package weboob_modules is provided by - # https://git.woob.tech/weboob/modules + # https://gitlab.com/woob/modules # and should be pip-installed separately. # Note that Weboob users should rather install Weboob modules # through https://updates.woob.tech/.