⚠️ CONFLICT! Lineage pull request for: skeleton

[cisagovbot]

Lineage Pull Request: CONFLICT

Lineage has created this pull request to incorporate new changes found in an upstream repository:

Upstream repository: https://github.com/cisagov/skeleton-python-library.git
Remote branch: HEAD

Check the changes in this pull request to ensure they won't cause issues with your project.

The lineage/skeleton branch has one or more unresolved merge conflicts that you must resolve before merging this pull request!

How to resolve the conflicts

1. Take ownership of this pull request by removing any other assignees.

2. Clone the repository locally, and reapply the merge:

   git clone git@github.com:cisagov/lcgit.git lcgit
   cd lcgit
   git remote add skeleton https://github.com/cisagov/skeleton-python-library.git
   git remote set-url --push skeleton no_push
   git switch develop
   git switch --create lineage/skeleton --track origin/develop
   git pull skeleton HEAD
   git status

3. Review the changes displayed by the status command. Fix any conflicts and possibly incorrect auto-merges.

4. After resolving each of the conflicts, add your changes to the branch, commit, and push your changes:

   git add src/example/example.py 
   git commit
   git push --force --set-upstream origin lineage/skeleton

   Note that you may append to the default merge commit message that git creates for you, but please do not delete the existing content. It provides useful information about the merge that is being performed.

5. Wait for all the automated tests to pass.

6. Confirm each item in the "Pre-approval checklist" below.

7. Remove any of the checklist items that do not apply.

8. Ensure every remaining checkbox has been checked.

9. Mark this draft pull request "Ready for review".

✅ Pre-approval checklist

• ✌️ The conflicts in this pull request have been resolved.
• All relevant type-of-change labels have been added.
• All new and existing tests pass.

---

Note

You are seeing this because one of this repository's maintainers has configured Lineage to open pull requests.

For more information:

🛠 Lineage configurations for this project are stored in .github/lineage.yml

📚 Read more about Lineage

[Copilot]

Pull request overview

This Lineage PR brings in upstream skeleton-python-library updates, primarily modernizing tooling/linting configuration and GitHub Actions workflows for build/test automation.

Changes:

• Updated CI workflows (cache/action versions, job naming, artifact handling) and Dependabot grouping/ignore rules.
• Refreshed pre-commit hook versions and expanded Flake8 plugin selection/configuration in pyproject.toml.
• Minor Python/test cleanups and packaging guidance updates (requirements.txt, setup-env).

Reviewed changes

Copilot reviewed 11 out of 12 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
tests/test_lcgit.py	Test refactor in iterator unpacking; currently breaks the state-restore test logic.
src/lcgit/lcgit.py	Lint/noqa annotations and minor style/docstring formatting adjustments.
setup-env	Adjusts pip bootstrap packages (drops wheel).
requirements.txt	Updates comment to reflect pyproject.toml-based dependency management; removes wheel.
pyproject.toml	Expands Flake8 selection/ignore configuration and updates doc links/comments.
.pre-commit-config.yaml	Bumps hook versions; adds Flake8 plugin deps; updates pip-audit config and Terraform hooks.
.github/workflows/sync-labels.yml	Bumps GitHub label sync action major version.
.github/workflows/label-prs.yml	Uses default pull_request activity types; adds explanatory comment.
.github/workflows/dependency-review.yml	Adds comment clarifying default pull_request activity types.
.github/workflows/codeql-analysis.yml	Adds comment clarifying default pull_request activity types.
.github/workflows/build.yml	Updates caching/actions; renames jobs; adjusts build deps and cache keys (includes issues noted).
.github/dependabot.yml	Adds action update grouping and adds pip ignore list for skeleton-managed deps.

Comments suppressed due to low confidence (1)

tests/test_lcgit.py:62

• test_state_save_and_restore no longer captures the emitted iterator state. The loop now assigns the second tuple element to _state, but state is never updated, so the if state: block never runs and the restore path is not exercised. Update the loop to store the emitted state (e.g., assign state = _state at the point you break) so the test actually validates save/restore behavior.

    break_at = len(lcg1) / 2
    count = 0
    state = None
    for i, _state in lcg1:
        count += 1
        accumulated.append(i)
        if count == break_at:
            break
    assert (
        len(lcg1) <= 1 or sorted(accumulated) != answer
    ), "accumulated list should NOT be identical to answer list yet"
    if state:  # empty sequences won't generate state
        lcg2 = lcg(sequence, state)

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[dav3r]

👍