Change from git submodules to PDM for dependency management.

orbcode · Sep 6, 2024 · 1d50265 · 1d50265
1 parent eef9553
commit 1d50265
Show file tree

Hide file tree

Showing 19 changed files with 521 additions and 75 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,8 +14,9 @@ jobs:
       - run: git fetch --prune --unshallow --no-recurse-submodules
       - uses: YosysHQ/setup-oss-cad-suite@v2
       - uses: gregdavill/[email protected]
-      - run: python3 -m pip install wheel construct meson ninja setuptools setuptools_scm Jinja2
-      - run: ./orbtrace_builder.py --platform orbtrace_mini --build
+      - run: python3 -m pip install pdm meson ninja
+      - run: pdm install
+      - run: pdm run orbtrace_builder --platform orbtrace_mini --build
       - uses: actions/upload-artifact@v3
         with:
           name: orbtrace_mini
@@ -32,8 +33,9 @@ jobs:
       - run: git fetch --prune --unshallow --no-recurse-submodules
       - uses: YosysHQ/setup-oss-cad-suite@v2
       - uses: gregdavill/[email protected]
-      - run: python3 -m pip install wheel construct meson ninja setuptools setuptools_scm Jinja2
-      - run: ./orbtrace_builder.py --platform orbtrace_mini --profile dfu --build 
+      - run: python3 -m pip install pdm meson ninja
+      - run: pdm install
+      - run: pdm run orbtrace_builder --platform orbtrace_mini --profile dfu --build 
       - uses: actions/upload-artifact@v3
         with:
           name: orbtrace_mini_dfu
@@ -50,8 +52,9 @@ jobs:
       - run: git fetch --prune --unshallow --no-recurse-submodules
       - uses: YosysHQ/setup-oss-cad-suite@v2
       - uses: gregdavill/[email protected]
-      - run: python3 -m pip install wheel construct meson ninja setuptools setuptools_scm Jinja2
-      - run: ./orbtrace_builder.py --platform orbtrace_mini --profile test --build 
+      - run: python3 -m pip install pdm meson ninja
+      - run: pdm install
+      - run: pdm run orbtrace_builder --platform orbtrace_mini --profile test --build 
       - uses: actions/upload-artifact@v3
         with:
           name: orbtrace_mini_test

diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,6 @@ tags
 r
 .#*
 fp-info-cache
+/.venv/
+/.pdm-build/
+/.pdm-python
diff --git a/.gitmodules b/.gitmodules
diff --git a/README.md b/README.md
@@ -16,7 +16,13 @@ Full documentation for Orbtrace is available via Read The Docs at https://orbtra
 Building
 --------
 
-`./orbtrace_builder.py --platform orbtrace_mini --build`
+First install dependencies:
+
+`pdm install`
+
+Then build the gateware by running:
+
+`pdm run orbtrace_builder --platform orbtrace_mini --build`
 
 (You might also want `--profile dfu` and `--profile test` if you're working on those elements. They build in separate directories.)
 
@@ -26,14 +32,6 @@ To burn application firmware using boot button hold down the boot button while p
 
 and power cycle.
 
-in addition...To ensure everything is up to date;
-
-```
-rm -rf build
-git pull --recurse-submodules
-git submodule update --init --recursive
-```
-
 To burn bootloader and application using openFPGALoader;
 
 `openFPGALoader -c ft232 -f -o 0x0 build/orbtrace_mini_dfu/gateware/orbtrace_mini.bit`

diff --git a/deps/__init__.py b/deps/__init__.py
diff --git a/deps/amaranth b/deps/amaranth
diff --git a/deps/litehyperbus b/deps/litehyperbus
diff --git a/deps/litespi b/deps/litespi
diff --git a/deps/litex b/deps/litex
diff --git a/deps/litex-boards b/deps/litex-boards
diff --git a/deps/luna b/deps/luna
diff --git a/deps/migen b/deps/migen
diff --git a/deps/python-usb-protocol b/deps/python-usb-protocol
diff --git a/deps/pythondata-cpu-vexriscv b/deps/pythondata-cpu-vexriscv
diff --git a/deps/pythondata-software-compiler_rt b/deps/pythondata-software-compiler_rt
diff --git a/deps/pythondata-software-picolibc b/deps/pythondata-software-picolibc
diff --git a/orbtrace_builder.py b/orbtrace_builder.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python3
 
-import deps
-
 import os
 import argparse