Merge main into develop

.github/workflows/run-formatter.yaml

@@ -7,17 +7,18 @@ jobs:
     runs-on: ubuntu-latest
     name: Format code
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.9
-        cache: 'pip'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements-dev.lock
-      timeout-minutes: 5
+
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Install rye
+      uses: eifinger/setup-rye@v4
+
+    - name: Sync dependencies
+      run: rye sync
+
     - name: Run black
-      run: black --check .
+      run: |
+        source .venv/bin/activate
+        black --check .
       timeout-minutes: 5

.github/workflows/run-linter.yaml

@@ -7,17 +7,17 @@ jobs:
     runs-on: ubuntu-latest
     name: Lint code
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.9
-        cache: 'pip'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements-dev.lock
-      timeout-minutes: 5
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Install rye
+      uses: eifinger/setup-rye@v4
+
+    - name: Sync dependencies
+      run: rye sync
+
     - name: Run pylint
-      run: pylint --exit-zero src/mepo
+      run: |
+        source .venv/bin/activate
+        pylint --exit-zero src/mepo
       timeout-minutes: 5

.github/workflows/run-tests.yaml

@@ -8,26 +8,23 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ['3.9', '3.10', '3.11', '3.12', 'pypy-3.9', 'pypy-3.10']
+        python-version: ["3.9", "3.10", "3.11", "3.12", "pypy@3.9", "pypy@3.10"]
 
     name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
 
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-        cache: 'pip'
+    - name: Checkout code
+      uses: actions/checkout@v4
 
-    - name: Install dependencies
+    - name: Install rye
+      uses: eifinger/setup-rye@v4
+
+    - name: Sync dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.lock
-      timeout-minutes: 5
+        rye pin ${{ matrix.python-version }}
+        rye sync
 
     - name: Run tests
       run: |
-        export PYTHONPATH=$(pwd)/src:$PYTHONPATH
-        python tests/test_mepo_commands.py -v
+        rye test -v
       timeout-minutes: 5

.gitignore

@@ -1,6 +1,7 @@
 *~
 *.pyc
 *.egg-info
+*.lock
 dist
 venv
 

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added ability to print version info via `mepo --version`
+
 ### Changed
 
 ## [2.0.0] - 2024-08-12

README.md

@@ -1,6 +1,7 @@
 # mepo [![Actions Status](https://github.com/pchakraborty/mepo/workflows/Unit%20testing%20of%20mepo/badge.svg)](https://github.com/pchakraborty/mepo/actions) [![DOI](https://zenodo.org/badge/215067850.svg)](https://zenodo.org/badge/latestdoi/215067850) [![Rye](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/rye/main/artwork/badge.json)](https://rye-up.com)
 
-`mepo` is a tool, written in Python3 (3.9.0+), to manage (m)ultiple git r(epo)sitories, by attempting to create an illusion of a 'single repository' for multi-repository projects. Please see the [Wiki](../../wiki) for examples of `mepo` workflows.
+`mepo` is a tool, written in Python3, to manage (m)ultiple git r(epo)sitories, by attempting to create an illusion of a 'single repository' for multi-repository projects. Please see the [Wiki](../../wiki) for examples of `mepo` workflows.
+
 
 ## Installation
 
@@ -9,7 +10,7 @@
 To install `mepo` using `pip`, run the following command:
 
 ```
-`pip install mepo`
+pip install mepo
 ```
 
 ### Homebrew
@@ -27,6 +28,14 @@ brew tap gmao-si-team/packages
 brew install mepo
 ```
 
+### Spack
+
+Mepo is also available via spack as a package. To install mepo using spack, run the following command:
+
+```
+spack install mepo
+```
+
 ## Transitioning from `mepo` v1.x to v2.x
 
 If you try to use mepo v2.x within a mepo v1.x repository, you will get an warning message:

etc/mepo-completion.bash

@@ -2,18 +2,17 @@
 
 # complete -W "init clone status checkout branch diff where whereis history" mepo
 
+# SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$(dirname $(realpath $0))
+
 _get_mepo_commands() {
     local mepo_cmd_list=""
-    if [[ "$OSTYPE" == "darwin"* ]]
-    then
-       local mepodir=$(dirname $(readlink $(which mepo)))
-    else
-       local mepodir=$(dirname $(readlink -f $(which mepo)))
-    fi
-    for mydir in $(ls -d ${mepodir}/mepo.d/command/*/); do
-        if [[ $mydir != *"__pycache__"* ]]; then
-            mepo_cmd_list+=" $(basename $mydir)"
-        fi
+    local mepo_dir=$(python3 $SCRIPT_DIR/mepo-path.py)
+    for pyfile in $(ls ${mepo_dir}/command/*.py*); do
+	command=${pyfile##*/} # remove path
+	command=${command%.*} # remove extension
+	command=$(echo $command | cut -d _ -f 1)
+        mepo_cmd_list+=" $command"
     done
     echo ${mepo_cmd_list}
 }

etc/mepo-path.py

@@ -0,0 +1,3 @@
+import os, mepo
+
+print(os.path.dirname(mepo.__file__))

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mepo"
-version = "2.0.0"
+version = "2.1.0"
 description = "A tool for managing (m)ultiple r(epo)s"
 authors = [{name="GMAO SI Team", email="[email protected]"}]
 dependencies = [
@@ -23,6 +23,7 @@ dev-dependencies = [
     "flake8>=7.0.0",
     "pre-commit>=3.7.1",
     "mdutils>=1.6.0",
+    "pytest>=8.2.1",
 ]
 
 [build-system]

src/mepo/cmdline/parser.py

@@ -8,6 +8,12 @@
 from ..utilities import mepoconfig
 
 
+def get_version():
+    from importlib import metadata
+
+    return metadata.version("mepo")
+
+
 class MepoArgParser:
 
     __slots__ = ["parser", "subparsers"]
@@ -16,6 +22,7 @@ def __init__(self):
         self.parser = argparse.ArgumentParser(
             description="Tool to manage (m)ultiple r(epo)s"
         )
+        self.parser.add_argument("--version", action="version", version=get_version())
         self.subparsers = self.parser.add_subparsers()
         self.subparsers.title = "mepo commands"
         self.subparsers.required = True

src/mepo/command/update-state.py

@@ -1,6 +1,9 @@
 """Permanently convert mepo1 state to mepo2 state"""
 
+from urllib.parse import urljoin
+
 from ..state import MepoState
+from ..git import get_current_remote_url
 
 
 def run(_):
@@ -9,6 +12,9 @@ def run(_):
         # mepo2 style does not exist
         allcomps = MepoState.read_state()
         MepoState.mepo1_patch_undo()
+        for comp in allcomps:
+            if comp.remote.startswith("../"):
+                comp.remote = urljoin(get_current_remote_url() + "/", comp.remote)
         # Write new state
         MepoState.write_state(allcomps)
         print("\nConverted mepo1 state to mepo2\n")