Update UI and connect to constructor manager API

.github/workflows/tests.yml

@@ -9,52 +9,106 @@ on:
       - main
     paths:
       - 'constructor-manager/**'
-      - 'constructor-manager-cli/**'
+      - 'constructor-manager-api/**'
+      - 'constructor-manager-ui/**'
   workflow_dispatch:
 
 jobs:
   test:
     name: ${{ matrix.platform }} py${{ matrix.python-version }}
     runs-on: ${{ matrix.platform }}
+    defaults:
+      run:
+        shell: bash -el {0}
     strategy:
+      fail-fast: false
       matrix:
         platform: [ubuntu-latest, windows-latest, macos-latest]
         python-version: ['3.8', '3.9', '3.10']
-
+    env:
+        DISPLAY: ':99.0'
     steps:
+      - name: Install OS dependencies
+        if: contains(matrix.platform, 'ubuntu')
+        run: |
+          sudo apt-get update --fix-missing
+          sudo apt install xvfb
+
+      - uses: tlambert03/setup-qt-libs@v1
+
       - uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: conda-incubator/setup-miniconda@v2
         with:
+          activate-environment: "constructor-manager"
           python-version: ${{ matrix.python-version }}
+          auto-activate-base: true
+          run-post: false
 
-      - name: Install dependencies constructor-manager-cli
+      - name: Install dependencies on base environment
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install setuptools tox tox-gh-actions
-          cd constructor-manager-cli
-          pip install -e .
-          pip list
+          conda install -n base conda-lock mamba -c conda-forge --quiet
+          conda list
 
-      - name: Test constructor-manager-cli
+      - name: create constructor-manager-environment
         run: |
-          cd constructor-manager-cli
-          python -m tox
-        env:
-          PLATFORM: ${{ matrix.platform }}
+          conda install -n constructor-manager conda packaging requests pyyaml -c conda-forge --quiet
+          # List installed packages
+          conda list
 
-      - name: Install dependencies constructor-manager
+      - name: Install constructor-manager
         run: |
-          cd constructor-manager-cli
-          pip install -e .
-          pip list
-        env:
-          PLATFORM: ${{ matrix.platform }}
+          # Install constructor manager
+          git clone https://github.com/goanpeca/packaging.git packaging_clone
+          cd packaging_clone
+          git checkout constructor-updater
+          cd constructor-manager
+          pip install -e . --no-deps
 
-      - name: Test constructor-manager
+          # Install test deps
+          conda install -n constructor-manager pytest pytest-cov pytest-qt -c conda-forge --quiet
+
+          # List installed packages
+          conda list
+
+      - name: Install constructor-manager-api
         run: |
-          cd constructor-manager
-          python -m tox
-        env:
-          PLATFORM: ${{ matrix.platform }}
+          # Install dependencies
+          conda install -n constructor-manager qtpy pyqt -c conda-forge --quiet
+
+          # Install constructor manager
+          cd packaging_clone
+          git checkout constructor-cli
+          cd constructor-manager-api
+          pip install -e . --no-deps
+
+          # List installed packages
+          conda list
+
+      - name: Install constructor-manager-ui
+        run: |
+          # Install constructor manager ui
+          cd constructor-manager-ui
+          pip install -e . --no-deps
+
+          # List installed packages
+          conda list
+
+      - name: List installed packages
+        run: |
+          conda list
+
+      - name: Test constructor-manager-ui (linux)
+        if: contains(matrix.platform, 'ubuntu')
+        run: |
+          # Run Tests
+          cd constructor-manager-ui/src
+          xvfb-run pytest constructor_manager_ui --cov=constructor_manager_ui
+
+      - name: Test constructor-manager-ui (other)
+        if: "!contains(matrix.platform, 'ubuntu')"
+        run: |
+          # Run Tests
+          cd constructor-manager-ui/src
+          pytest constructor_manager_ui --cov=constructor_manager_ui

constructor-manager-ui/README.md

@@ -46,3 +46,12 @@ constructor-manager-ui-qrc
 ```
 
 You need to have pyqt5 installed.
+
+### Example commands
+
+```bash
+constructor-manager-ui napari --current-version 0.4.16 --build-string pyside --plugins-url https://api.napari-hub.org/plugins --channel conda-forge
+constructor-manager-ui napari --build-string pyside --plugins-url https://api.napari-hub.org/plugins --channel conda-forge --channel napari
+constructor-manager-ui napari --build-string pyside --plugins-url https://api.napari-hub.org/plugins --channel conda-forge --channel napari --dev
+constructor-manager-ui napari --build-string pyside --plugins-url https://api.napari-hub.org/plugins --channel conda-forge --channel napari -cv 0.4.17
+```

constructor-manager-ui/setup.cfg

@@ -39,7 +39,7 @@ where = src
 
 [options.entry_points]
 console_scripts =
-    constructor-manager-ui = constructor_manager_ui.cli:run
+    constructor-manager-ui = constructor_manager_ui.main:run
     constructor-manager-ui-qrc = constructor_manager_ui.style.utils:generate_resource_file
 
 [options.extras_require]

constructor-manager-ui/src/constructor_manager_ui/__init__.py

@@ -1 +0,0 @@
-"""Constructor manager."""

constructor-manager-ui/src/constructor_manager_ui/cli.py

@@ -2,15 +2,39 @@
 
 import argparse
 
-from constructor_manager_ui.main import main
 
-
-def run():
+def create_parser():
     parser = argparse.ArgumentParser()
     parser.add_argument("package", type=str)
-    args = parser.parse_args()
-    main(args.package)
-
 
-if __name__ == "__main__":
-    run()
+    parser.add_argument(
+        "--current-version",
+        "-cv",
+        type=str,
+        default=None,
+    )
+    parser.add_argument(
+        "--build-string",
+        help="increase output verbosity",
+        type=str,
+        default=None,
+    )
+    parser.add_argument(
+        "--plugins-url",
+        "-pu",
+        type=str,
+        default=None,
+    )
+    parser.add_argument(
+        "--channel",
+        "-c",
+        action="append",
+        default=None,
+    )
+    parser.add_argument(
+        "--log",
+        default="WARNING",
+        choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
+    )
+    parser.add_argument("--dev", "-d", action="store_true")
+    return parser