From 586b9ca4d51067560e3e1ce0af1d0b4b0361ef4a Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Mon, 26 Feb 2024 16:58:21 -0600 Subject: [PATCH] Split constraints file by purpose For clarity, keep pins which are intended to allow CI jobs to target the HEADs of "internal" dependencies from external "pins". --- action.yaml | 3 ++- constraints-heads.txt | 45 ++++++++++++++++++++++++++++++++++++++++ constraints-pins.txt | 1 + constraints.txt | 48 ++----------------------------------------- 4 files changed, 50 insertions(+), 47 deletions(-) create mode 100644 constraints-heads.txt create mode 100644 constraints-pins.txt diff --git a/action.yaml b/action.yaml index 2eb4ced..d57f13c 100644 --- a/action.yaml +++ b/action.yaml @@ -24,7 +24,8 @@ runs: echo ::group::Install dependencies # Remove this package from constraints PKG_NAME=$(pip list --local --editable --format json | jq '.[0].name' -r) - grep -v "^${PKG_NAME}@" ${GITHUB_ACTION_PATH}/constraints.txt > constraints.txt + cp -a ${GITHUB_ACTION_PATH}/constraints{,-heads,-pins}.txt ./ + grep -iv "^${PKG_NAME}@" constraints-heads.txt # Install dependencies, including any 'test' extras, as well as pytest-cov python -m pip install -U -e .[test] pytest-cov -c constraints.txt echo ::endgroup:: diff --git a/constraints-heads.txt b/constraints-heads.txt new file mode 100644 index 0000000..aa58dd0 --- /dev/null +++ b/constraints-heads.txt @@ -0,0 +1,45 @@ +colcon-alias@ git+https://github.com/colcon/colcon-alias.git +colcon-argcomplete@ git+https://github.com/colcon/colcon-argcomplete.git +colcon-bash@ git+https://github.com/colcon/colcon-bash.git +colcon-bazel@ git+https://github.com/colcon/colcon-bazel.git +colcon-bundle@ git+https://github.com/colcon/colcon-bundle.git +colcon-cargo@ git+https://github.com/colcon/colcon-cargo.git +colcon-cd@ git+https://github.com/colcon/colcon-cd.git +colcon-clean@ git+https://github.com/colcon/colcon-clean.git +colcon-cmake@ git+https://github.com/colcon/colcon-cmake.git +colcon-common-extensions@ git+https://github.com/colcon/colcon-common-extensions.git +colcon-core@ git+https://github.com/colcon/colcon-core.git +colcon-coveragepy-result@ git+https://github.com/colcon/colcon-coveragepy-result.git +colcon-defaults@ git+https://github.com/colcon/colcon-defaults.git +colcon-devtools@ git+https://github.com/colcon/colcon-devtools.git +colcon-ed@ git+https://github.com/colcon/colcon-ed.git +colcon-gradle@ git+https://github.com/colcon/colcon-gradle.git +colcon-graphviz-anim@ git+https://github.com/colcon/colcon-graphviz-anim.git +colcon-hardware-acceleration@ git+https://github.com/colcon/colcon-hardware-acceleration.git +colcon-installed-package-information@ git+https://github.com/colcon/colcon-installed-package-information.git +colcon-lcov-result@ git+https://github.com/colcon/colcon-lcov-result.git +colcon-library-path@ git+https://github.com/colcon/colcon-library-path.git +colcon-meson@ git+https://github.com/colcon/colcon-meson.git +colcon-metadata@ git+https://github.com/colcon/colcon-metadata.git +colcon-mixin@ git+https://github.com/colcon/colcon-mixin.git +colcon-notification@ git+https://github.com/colcon/colcon-notification.git +colcon-output@ git+https://github.com/colcon/colcon-output.git +colcon-override-check@ git+https://github.com/colcon/colcon-override-check.git +colcon-package-information@ git+https://github.com/colcon/colcon-package-information.git +colcon-package-selection@ git+https://github.com/colcon/colcon-package-selection.git +colcon-parallel-executor@ git+https://github.com/colcon/colcon-parallel-executor.git +colcon-pkg-config@ git+https://github.com/colcon/colcon-pkg-config.git +colcon-powershell@ git+https://github.com/colcon/colcon-powershell.git +colcon-python-setup-py@ git+https://github.com/colcon/colcon-python-setup-py.git +colcon-recursive-crawl@ git+https://github.com/colcon/colcon-recursive-crawl.git +colcon-rerun@ git+https://github.com/colcon/colcon-rerun.git +colcon-ros-bazel@ git+https://github.com/colcon/colcon-ros-bazel.git +colcon-ros-bundle@ git+https://github.com/colcon/colcon-ros-bundle.git +colcon-ros-cargo@ git+https://github.com/colcon/colcon-ros-cargo.git +colcon-ros-domain-id-coordinator@ git+https://github.com/colcon/colcon-ros-domain-id-coordinator.git +colcon-ros@ git+https://github.com/colcon/colcon-ros.git +colcon-ros-gradle@ git+https://github.com/colcon/colcon-ros-gradle.git +colcon-sanitizer-reports@ git+https://github.com/colcon/colcon-sanitizer-reports.git +colcon-spawn-shell@ git+https://github.com/colcon/colcon-spawn-shell.git +colcon-test-result@ git+https://github.com/colcon/colcon-test-result.git +colcon-zsh@ git+https://github.com/colcon/colcon-zsh.git diff --git a/constraints-pins.txt b/constraints-pins.txt new file mode 100644 index 0000000..396e13f --- /dev/null +++ b/constraints-pins.txt @@ -0,0 +1 @@ +flake8<6 diff --git a/constraints.txt b/constraints.txt index 5715f53..c780bbc 100644 --- a/constraints.txt +++ b/constraints.txt @@ -1,46 +1,2 @@ -colcon-alias@ git+https://github.com/colcon/colcon-alias.git -colcon-argcomplete@ git+https://github.com/colcon/colcon-argcomplete.git -colcon-bash@ git+https://github.com/colcon/colcon-bash.git -colcon-bazel@ git+https://github.com/colcon/colcon-bazel.git -colcon-bundle@ git+https://github.com/colcon/colcon-bundle.git -colcon-cargo@ git+https://github.com/colcon/colcon-cargo.git -colcon-cd@ git+https://github.com/colcon/colcon-cd.git -colcon-clean@ git+https://github.com/colcon/colcon-clean.git -colcon-cmake@ git+https://github.com/colcon/colcon-cmake.git -colcon-common-extensions@ git+https://github.com/colcon/colcon-common-extensions.git -colcon-core@ git+https://github.com/colcon/colcon-core.git -colcon-coveragepy-result@ git+https://github.com/colcon/colcon-coveragepy-result.git -colcon-defaults@ git+https://github.com/colcon/colcon-defaults.git -colcon-devtools@ git+https://github.com/colcon/colcon-devtools.git -colcon-ed@ git+https://github.com/colcon/colcon-ed.git -colcon-gradle@ git+https://github.com/colcon/colcon-gradle.git -colcon-graphviz-anim@ git+https://github.com/colcon/colcon-graphviz-anim.git -colcon-hardware-acceleration@ git+https://github.com/colcon/colcon-hardware-acceleration.git -colcon-installed-package-information@ git+https://github.com/colcon/colcon-installed-package-information.git -colcon-lcov-result@ git+https://github.com/colcon/colcon-lcov-result.git -colcon-library-path@ git+https://github.com/colcon/colcon-library-path.git -colcon-meson@ git+https://github.com/colcon/colcon-meson.git -colcon-metadata@ git+https://github.com/colcon/colcon-metadata.git -colcon-mixin@ git+https://github.com/colcon/colcon-mixin.git -colcon-notification@ git+https://github.com/colcon/colcon-notification.git -colcon-output@ git+https://github.com/colcon/colcon-output.git -colcon-override-check@ git+https://github.com/colcon/colcon-override-check.git -colcon-package-information@ git+https://github.com/colcon/colcon-package-information.git -colcon-package-selection@ git+https://github.com/colcon/colcon-package-selection.git -colcon-parallel-executor@ git+https://github.com/colcon/colcon-parallel-executor.git -colcon-pkg-config@ git+https://github.com/colcon/colcon-pkg-config.git -colcon-powershell@ git+https://github.com/colcon/colcon-powershell.git -colcon-python-setup-py@ git+https://github.com/colcon/colcon-python-setup-py.git -colcon-recursive-crawl@ git+https://github.com/colcon/colcon-recursive-crawl.git -colcon-rerun@ git+https://github.com/colcon/colcon-rerun.git -colcon-ros-bazel@ git+https://github.com/colcon/colcon-ros-bazel.git -colcon-ros-bundle@ git+https://github.com/colcon/colcon-ros-bundle.git -colcon-ros-cargo@ git+https://github.com/colcon/colcon-ros-cargo.git -colcon-ros-domain-id-coordinator@ git+https://github.com/colcon/colcon-ros-domain-id-coordinator.git -colcon-ros@ git+https://github.com/colcon/colcon-ros.git -colcon-ros-gradle@ git+https://github.com/colcon/colcon-ros-gradle.git -colcon-sanitizer-reports@ git+https://github.com/colcon/colcon-sanitizer-reports.git -colcon-spawn-shell@ git+https://github.com/colcon/colcon-spawn-shell.git -colcon-test-result@ git+https://github.com/colcon/colcon-test-result.git -colcon-zsh@ git+https://github.com/colcon/colcon-zsh.git -flake8<6 +-c constraints-heads.txt +-c constraints-pins.txt