⚠️ 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-generic.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/skeleton-aws-lambda-python.git skeleton-aws-lambda-python
   cd skeleton-aws-lambda-python
   git remote add skeleton https://github.com/cisagov/skeleton-generic.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 .github/workflows/build.yml 
   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

[github-advanced-security]

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

[dav3r]

👍

[Copilot]

Pull Request Overview

This lineage pull request incorporates upstream changes from the skeleton-generic repository to align the project with the latest standards and best practices. The changes focus on modernizing development tooling, improving workflow configurations, and enhancing version management capabilities.

Key Changes:

• Replaced the legacy bump_version.sh script with a more robust bump-version script that provides enhanced version management features
• Updated GitHub Actions workflows to use standardized job preambles and improved security practices
• Modernized development dependencies and configuration files with updated versions and improved linting rules

Reviewed Changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
bump_version.sh	Removed legacy version bumping script
bump-version	Added new comprehensive version management script with enhanced functionality
setup-env	Enhanced Python version validation with semantic versioning support
requirements-dev.txt	Updated semver dependency with version constraint and documentation
src/version.txt	Simplified version format from Python assignment to plain version string
tests/test_version.py	Removed shebang line from test file
.github/workflows/build.yml	Updated to use standardized job preamble and improved caching
.github/workflows/codeql-analysis.yml	Modernized security scanning workflow configuration
.github/workflows/sync-labels.yml	Updated label synchronization workflow
.github/workflows/dependency-review.yml	Added new dependency review workflow for security
.pre-commit-config.yaml	Updated hook versions and added new security checks
.yamllint	Enhanced YAML linting rules for better Ansible compatibility
.mdl_config.yaml	Updated markdown linting configuration
docker-compose.yml	Standardized YAML formatting
.github/lineage.yml	Updated YAML formatting
.github/labels.yml	Standardized label color formatting
.github/dependabot.yml	Updated dependency management configuration
.github/CODEOWNERS	Updated code ownership assignments

[Copilot]

The string concatenation using += operator is not portable across all shell implementations. Consider using explicit concatenation or a different approach for better compatibility.

[Copilot]

The string concatenation using += operator is not portable across all shell implementations. Consider using explicit concatenation or a different approach for better compatibility.

Suggested change

	local prerelease+="(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)"
	# Additional dot-separated identifiers
	local prerelease+="(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*"
	# End of the prerelease, making it optional
	local prerelease+=")?"
	prerelease="${prerelease}(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)"
	# Additional dot-separated identifiers
	prerelease="${prerelease}(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*"
	# End of the prerelease, making it optional
	prerelease="${prerelease})?"

[Copilot]

The string concatenation using += operator is not portable across all shell implementations. Consider using explicit concatenation or a different approach for better compatibility.

Suggested change

	local prerelease+="(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)"
	# Additional dot-separated identifiers
	local prerelease+="(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*"
	# End of the prerelease, making it optional
	local prerelease+=")?"
	prerelease="${prerelease}(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)"
	# Additional dot-separated identifiers
	prerelease="${prerelease}(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*"
	# End of the prerelease, making it optional
	prerelease="${prerelease})?"