From d73b4f5136bbcc183f9992924adde6d8b657c68a Mon Sep 17 00:00:00 2001 From: Douglas Raillard Date: Thu, 1 Feb 2024 12:13:41 +0000 Subject: [PATCH] Update GitHub URLs to GitLab ones --- README.rst | 13 +++++++++---- doc/changes.rst | 2 +- doc/contributors_guide.rst | 2 +- doc/index.rst | 6 +++--- doc/setup.rst | 8 ++++---- doc/test_example.py | 1 - doc/workflows/notebook.rst | 2 +- lisa/energy_meter.py | 13 ------------- setup.py | 7 +++---- tools/bisector/doc/index.rst | 4 ++-- tools/exekall/README.rst | 4 ++-- tools/exekall/doc/index.rst | 4 ++-- tools/exekall/setup.py | 6 +++--- tools/kmodules/lisa-in-tree/fetch_lisa_module.py | 2 +- 14 files changed, 32 insertions(+), 42 deletions(-) delete mode 120000 doc/test_example.py diff --git a/README.rst b/README.rst index 0638fa123..a9e3f1bf6 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,12 @@ +⚠️ LISA has moved from GitHub to GitLab and is now available at: +https://gitlab.arm.com/tooling/lisa. Please update your clone URLs and note +that the GitHub repository will not be used for any pull requests or issue +management. ⚠️ + ⚠️ ``lisa_tests`` package will be moved to another repository in January 2024. When more details are available, this pull request will be -updated: https://github.com/ARM-software/lisa/pull/2140 ⚠️ +updated: https://gitlab.arm.com/tooling/lisa/-/merge_requests/2140/ ⚠️ Introduction |CI status| |Documentation Status| @@ -76,7 +81,7 @@ Here are some noteworthy sections: How to reach us =============== -Bug reports should be raised against the `GitHub issue tracker `__. +Bug reports should be raised against the `GitLab issue tracker `__. External Links ============== @@ -113,7 +118,7 @@ where you have authored all of the code. If you do this on work time make sure your employer is cool with this. We also have a `Contributor Guide `__ -.. |CI status| image:: https://github.com/ARM-software/lisa/workflows/test/badge.svg?branch=main - :target: https://github.com/ARM-software/lisa/actions +.. |CI status| image:: https://gitlab.arm.com/tooling/lisa/badges/main/pipeline.svg + :target: https://gitlab.arm.com/tooling/lisa/-/commits/main .. |Documentation Status| image:: https://readthedocs.org/projects/lisa-linux-integrated-system-analysis/badge/?version=main :target: https://lisa-linux-integrated-system-analysis.readthedocs.io/en/main/ diff --git a/doc/changes.rst b/doc/changes.rst index 54ed9cc66..8fc678ed6 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -24,7 +24,7 @@ Everything else is private. important API laws. This is unfortunately not future-proof, as new versions can add new methods that would also require being overridden and kept in sync. If for some reason subclassing is required, please get in touch in the - `github issue tracker `_ + `GitLab issue tracker `_ before relying on that for production. .. note:: Instance attributes are considered public following the same diff --git a/doc/contributors_guide.rst b/doc/contributors_guide.rst index cd2d251c6..2909077d9 100644 --- a/doc/contributors_guide.rst +++ b/doc/contributors_guide.rst @@ -10,7 +10,7 @@ How to reach us =============== If you’re hitting an error/bug and need help, it’s best to raise an -issue on `GitHub `__. +issue on `GitLab `__. Coding style ============ diff --git a/doc/index.rst b/doc/index.rst index 2e2ef21ac..32b9a9dd0 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -11,14 +11,14 @@ LISA Documentation LISA - "Linux Integrated System Analysis" is a toolkit for interactive analysis and automated regression testing of Linux kernel behaviour. -- See the README on the project's `Github home page`__ for an overview. +- See the README on the project's `GitLab home page`__ for an overview. - Once you have LISA running, take a look at the tutorial and example notebooks included with the installation. -__ https://github.com/ARM-software/lisa +__ https://gitlab.arm.com/tooling/lisa Contributions to LISA and its documentation are very welcome, and handled -via Github pull requests. +via GitLab merge requests. .. _Readme: diff --git a/doc/setup.rst b/doc/setup.rst index 1ff986a4f..45ded3dd5 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -26,10 +26,10 @@ LISA is available on `PyPI `_: them. Alternatively, the installation from the git repository allows setting up a full environment. -From GitHub +From GitLab ----------- -LISA is hosted at `github `_. +LISA is hosted on `GitLab `_. The following references are available: * ``main`` branch: Main development branch where pull requests are merged as they @@ -76,7 +76,7 @@ need. .. code:: shell - git clone https://github.com/ARM-software/lisa.git + git clone https://gitlab.arm.com/tooling/lisa # Jump into the cloned repo directory cd lisa # This will provide a more accurate changelog when building the doc @@ -142,7 +142,7 @@ Once these two components are available on your machine, issue these commands: .. code:: shell - git clone https://github.com/ARM-software/lisa.git + git clone https://gitlab.arm.com/tooling/lisa cd lisa vagrant up diff --git a/doc/test_example.py b/doc/test_example.py deleted file mode 120000 index ccd801e51..000000000 --- a/doc/test_example.py +++ /dev/null @@ -1 +0,0 @@ -../lisa/test_example.py \ No newline at end of file diff --git a/doc/workflows/notebook.rst b/doc/workflows/notebook.rst index da4f76e89..71f306ce0 100644 --- a/doc/workflows/notebook.rst +++ b/doc/workflows/notebook.rst @@ -33,7 +33,7 @@ Once the server is started you can have a look at the provided tutorial notebooks are accessible by following this `link `__. This initial tutorial can be seen (but not executed) also on `github -`__. +`__. Notebooks as development environment ==================================== diff --git a/lisa/energy_meter.py b/lisa/energy_meter.py index 3807a6a2a..1fbb0e62d 100644 --- a/lisa/energy_meter.py +++ b/lisa/energy_meter.py @@ -389,18 +389,6 @@ class Monsoon(_DevlibContinuousEnergyMeter): self._instrument.reset() -_acme_install_instructions = ''' - - If you need to measure energy using an ACME EnergyProbe, - please do follow installation instructions available here: - https://github.com/ARM-software/lisa/wiki/Energy-Meters-Requirements#iiocapture---baylibre-acme-cape - - Othwerwise, please select a different energy meter in your - configuration file. - -''' - - class ACMEConf(SimpleMultiSrcConf, HideExekallID): """ Configuration class for :class:`ACME`. @@ -461,7 +449,6 @@ class ACME(EnergyMeter): subprocess.call([self._iiocapturebin, '-h'], stdout=PIPE, stderr=STDOUT) except FileNotFoundError as e: logger.error(f'iio-capture binary {self._iiocapturebin} not available') - logger.warning(_acme_install_instructions) raise FileNotFoundError('Missing iio-capture binary') from e def sample(self): diff --git a/setup.py b/setup.py index a6584c179..640dc4c61 100755 --- a/setup.py +++ b/setup.py @@ -81,7 +81,6 @@ extras_require={ "pytest", "build", "twine", - "github3.py", ], "wa": [ @@ -117,11 +116,11 @@ if __name__ == "__main__": version=lisa_version, maintainer='Arm Ltd.', packages=packages, - url='https://github.com/ARM-software/lisa', + url='hhttps://gitlab.arm.com/tooling/lisa', project_urls={ - "Bug Tracker": "https://github.com/ARM-software/lisa/issues", "Documentation": "https://lisa-linux-integrated-system-analysis.readthedocs.io/", - "Source Code": "https://github.com/ARM-software/lisa", + "Bug Tracker": "https://gitlab.arm.com/tooling/lisa/-/issues", + "Source Code": "https://gitlab.arm.com/tooling/lisa", }, description='A stick to probe the kernel with', long_description=long_description, diff --git a/tools/bisector/doc/index.rst b/tools/bisector/doc/index.rst index 7d12d5883..9d5858f6e 100644 --- a/tools/bisector/doc/index.rst +++ b/tools/bisector/doc/index.rst @@ -13,7 +13,7 @@ Overview ======== Bisector is a ``git bisect run`` compatible tool used in LISA. Check out the -project's `Github`__ for some guides to installation and setup. +project's `GitLab`__ for some guides to installation and setup. ``bisector`` allows setting up the steps of a test iteration, repeating them an infinite number of times (by default). These steps can involve flashing @@ -32,7 +32,7 @@ that happen on long running sessions. ``bisector`` will never leave you with an inconsistent report, or worse, no report at all. A new report is saved after each iteration and can be inspected as the execution goes on. -__ https://github.com/ARM-software/lisa +__ https://gitlab.arm.com/tooling/lisa .. [#] https://git-scm.com/docs/git-bisect Contents diff --git a/tools/exekall/README.rst b/tools/exekall/README.rst index 878aebd79..e7b593863 100644 --- a/tools/exekall/README.rst +++ b/tools/exekall/README.rst @@ -1,7 +1,7 @@ -Exekall is the test runner of LISA. Check out the project's `Github`__ for some +Exekall is the test runner of LISA. Check out the project's `GitLab`__ for some guides to installation and setup. ``exekall`` runs a set of expressions that are discovered from Python sources, allowing to build test suites in a highly modular way. -__ https://github.com/ARM-software/lisa +__ https://gitlab.arm.com/tooling/lisa diff --git a/tools/exekall/doc/index.rst b/tools/exekall/doc/index.rst index eb40215ba..bb2ed8087 100644 --- a/tools/exekall/doc/index.rst +++ b/tools/exekall/doc/index.rst @@ -12,13 +12,13 @@ Exekall Documentation Overview ======== -Exekall is the test runner of LISA. Check out the project's `Github`__ for some +Exekall is the test runner of LISA. Check out the project's `GitLab`__ for some guides to installation and setup. ``exekall`` runs a set of expressions that are discovered from Python sources, allowing to build test suites in a highly modular way. -__ https://github.com/ARM-software/lisa +__ https://gitlab.arm.com/tooling/lisa Contents ======== diff --git a/tools/exekall/setup.py b/tools/exekall/setup.py index 374a4cae7..623daf33f 100755 --- a/tools/exekall/setup.py +++ b/tools/exekall/setup.py @@ -26,11 +26,11 @@ setup( version='1.0', maintainer='Arm Ltd.', packages=['exekall'], - url='https://github.com/ARM-software/lisa', + url='https://gitlab.arm.com/tooling/lisa', project_urls={ - "Bug Tracker": "https://github.com/ARM-software/lisa/issues", + "Bug Tracker": "https://gitlab.arm.com/tooling/lisa/-/issues", + "Source Code": "https://gitlab.arm.com/tooling/lisa", "Documentation": "https://lisa-linux-integrated-system-analysis.readthedocs.io/", - "Source Code": "https://github.com/ARM-software/lisa", }, license='Apache License 2.0', description='Python expression execution engine', diff --git a/tools/kmodules/lisa-in-tree/fetch_lisa_module.py b/tools/kmodules/lisa-in-tree/fetch_lisa_module.py index 8c20dca55..229090aca 100755 --- a/tools/kmodules/lisa-in-tree/fetch_lisa_module.py +++ b/tools/kmodules/lisa-in-tree/fetch_lisa_module.py @@ -30,7 +30,7 @@ def main(): parser.add_argument('--module-kernel-path', help='Path relative to the kernel tree root where the module will be stored') parser.add_argument('--git-remote', help='Git remote to pull the module from', - default='https://github.com/ARM-software/lisa.git') + default='https://gitlab.arm.com/tooling/lisa') args = parser.parse_args() module_kernel_path = Path(args.module_kernel_path).resolve() -- GitLab