Skip to content

Commit

Permalink
build: Move Git submodules to external directory
Browse files Browse the repository at this point in the history
* Move the https://gitlab.com/fastjet/fastjet.git and
  https://github.com/cms-externals/fastjet-contrib.git Git submodules
  into an 'external' directory to make the directory management cleaner.
  • Loading branch information
matthewfeickert committed Sep 13, 2024
1 parent 55262e5 commit 8e3dcb7
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "fastjet"]
path = fastjet-core
path = external/fastjet-core
url = https://gitlab.com/fastjet/fastjet.git
[submodule "pybind11"]
path = pybind11
url = https://github.com/pybind/pybind11.git
[submodule "fastjet-contrib"]
path = fastjet-contrib
path = external/fastjet-contrib
url = https://github.com/cms-externals/fastjet-contrib.git
3 changes: 1 addition & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
graft src
graft tests
graft fastjet-core
graft fastjet-contrib
graft external
graft pybind11
global-exclude .git .gitmodules
include LICENSE README.md pyproject.toml setup.py setup.cfg patch_clustersequence.txt
Expand Down
Submodule fastjet-core updated from 000000 to 67796a
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
CGAL_ZIP = "https://github.com/CGAL/cgal/releases/download/v5.6/CGAL-5.6-library.zip"

DIR = pathlib.Path(__file__).parent.resolve()
FASTJET = DIR / "fastjet-core"
FASTJET_CONTRIB = DIR / "fastjet-contrib"
PYTHON = DIR / "src/fastjet"
FASTJET = DIR / "external" / "fastjet-core"
FASTJET_CONTRIB = DIR / "external" / "fastjet-contrib"
PYTHON = DIR / "src" / "fastjet"
OUTPUT = PYTHON / "_fastjet_core"


Expand Down

0 comments on commit 8e3dcb7

Please sign in to comment.