Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⚠️ CONFLICT! Lineage pull request for: skeleton #34

Merged
merged 91 commits into from
Feb 28, 2025
Merged
Changes from 1 commit
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
33582a1
Add checks for semantic python versions
Feb 14, 2024
9438194
Refactor code for the semantic check
Feb 14, 2024
cea8edc
Add checks for semantic python versions
Feb 14, 2024
d5c7c4a
Refactor code for the semantic check
Feb 14, 2024
f7b9d05
Merge branch 'improvement/correct-semantic-python-version-checks' of …
Mar 18, 2024
327ab73
Remove example of correct semantic version
Mar 18, 2024
4dedf50
Refactor the error message for the user
Mar 20, 2024
e84deea
Improve the semantic error message
Mar 20, 2024
5fdc7be
Fix grammar
michaelsaki Mar 20, 2024
42ef8c2
Refactor regex, add link, and improve comments
Mar 21, 2024
a77e5e1
Update link to use semver.org over regex101.com
Mar 21, 2024
5fe14c7
Remove unnecessary period
michaelsaki Mar 21, 2024
b7896a0
Add a meta hook to the pre-commit configuration
mcdonnnj Apr 20, 2024
260566f
Remove `exclude` directive that does not apply to any files
mcdonnnj Apr 20, 2024
a68994d
Add a lower-bound pin for flake8-docstrings
jsf9k Jul 1, 2024
43b91c7
Use the hashicorp/setup-packer GitHub Action
mcdonnnj Aug 12, 2024
8ada75d
Remove @jasonodoom as a codeowner
jsf9k Aug 23, 2024
2930208
Pin to a specific version
jsf9k Aug 26, 2024
d703a20
Add the --non-interactive flag when installing type stubs via mypy
jsf9k Sep 24, 2024
46e0553
Bump actions/cache from 3 to 4
dependabot[bot] Sep 24, 2024
3167421
Bump crazy-max/ghaction-github-status from 3 to 4
dependabot[bot] Sep 24, 2024
2d2feab
Improve pytest configuration
dav3r Sep 24, 2024
6a58c2c
Update pre-commit hook versions
mcdonnnj Aug 12, 2024
553efcb
Manually update the prettier hook
mcdonnnj Aug 12, 2024
184e749
Merge pull request #170 from cisagov/dependabot/github_actions/crazy-…
mcdonnnj Sep 25, 2024
d99c117
Merge pull request #171 from cisagov/dependabot/github_actions/action…
mcdonnnj Sep 25, 2024
2491ca0
Merge pull request #187 from cisagov/improvement/use_setup_packer_action
mcdonnnj Sep 25, 2024
f6c9537
Merge pull request #176 from cisagov/improvement/correct-semantic-pyt…
mcdonnnj Sep 25, 2024
10e5f6f
Merge pull request #188 from cisagov/remove-odoom-as-a-codeowner
mcdonnnj Sep 25, 2024
045a998
Add a pre-commit hook to run pip-audit
mcdonnnj Jan 18, 2024
28dc4ce
Merge pull request #178 from cisagov/improvement/add_pre-commit_meta_…
mcdonnnj Sep 25, 2024
5801cec
Merge pull request #179 from cisagov/improvement/add_pip-audit_pre-co…
mcdonnnj Sep 25, 2024
e61255c
Merge pull request #184 from cisagov/improvement/pin-flake8-docstrings
mcdonnnj Sep 25, 2024
44cd1be
Merge pull request #185 from cisagov/maintenance/update_pre-commit_hooks
mcdonnnj Sep 25, 2024
c502f1a
Use the rbubley/mirrors-prettier hook for prettier
mcdonnnj Aug 12, 2024
f0e55b3
Merge pull request #186 from cisagov/improvement/switch_prettier_hook
mcdonnnj Sep 25, 2024
4d765d0
Add types-docopt to mypy pre-commit hook additional dependencies
jsf9k Sep 25, 2024
6c2a022
Add dev "extras" section with type stubs
jsf9k Sep 25, 2024
b03458d
Add a type: ignore hint to the end of the schema import line
jsf9k Sep 25, 2024
942c0dc
Add a new trigger for the sync-labels GitHub Actions workflow
mcdonnnj Aug 13, 2024
a267662
Remove unnecessary quotes in the sync-labels workflow
mcdonnnj Aug 13, 2024
dc7f09e
Add four new hooks from pre-commit/pre-commit-hooks
mcdonnnj Sep 14, 2024
48d3b4f
Move mypy command toward the end of the script
jsf9k Oct 11, 2024
a78f49a
Remove two unnecessary pins
jsf9k Oct 11, 2024
34c6b7c
Support Python 13
jsf9k Oct 11, 2024
d50245a
Remove support for Python 3.7
jsf9k Oct 12, 2024
d84af0a
Update python_requires to >=3.8
jsf9k Oct 15, 2024
9ee2ce9
Remove support for Python 3.8
jsf9k Oct 15, 2024
343d2cc
Add the GitHubSecurityLab/actions-permissions/monitor Action
mcdonnnj Oct 28, 2024
8a77a8b
Restrict permissions of GITHUB_TOKEN
mcdonnnj Oct 28, 2024
3b1d4ef
Update pre-commit hook versions
mcdonnnj Oct 16, 2024
1d285f2
Sort hook ids in each pre-commit hook entry
mcdonnnj Oct 29, 2024
5da1059
Merge pull request #189 from cisagov/improvement/manually_run_sync-la…
mcdonnnj Oct 30, 2024
ff221ba
Merge pull request #190 from cisagov/improvement/add_actions-permissi…
mcdonnnj Oct 30, 2024
971602a
Merge pull request #191 from cisagov/improvement/github_tokenn_polp
mcdonnnj Oct 30, 2024
bdf8a25
Merge pull request #192 from cisagov/maintenance/update_pre-commit_hooks
mcdonnnj Oct 30, 2024
6959971
Merge pull request #193 from cisagov/improvement/add_more_pre-commit_…
mcdonnnj Oct 30, 2024
f517db7
Merge pull request #194 from cisagov/improvement/ensure_pre-commit_ho…
mcdonnnj Oct 30, 2024
f1b7b61
Merge remote-tracking branch 'skeleton-generic/develop' into lineage/…
jsf9k Oct 31, 2024
fa665c8
Upgrade bandit to 1.7.10
jsf9k Oct 31, 2024
ed10220
Add types-docopt dependency to mypy pre-commit hook
jsf9k Oct 31, 2024
8b6267d
Uncomment Dependabot ignore directive from upstream
jsf9k Oct 31, 2024
53a67a2
Add explicit permissions and GitHubSecurityLab/actions-permissions/mo…
jsf9k Oct 31, 2024
0777dc9
Upgrade to actions/cache v4
jsf9k Oct 31, 2024
efb9279
Remove needless shebang
jsf9k Oct 31, 2024
59756cc
Remove repeated comment
jsf9k Oct 31, 2024
8824475
Update the commented out dependabot ignore directives
mcdonnnj Nov 1, 2024
e6afb68
Merge pull request #195 from cisagov/bug/add_missing_dependabot_ignore
mcdonnnj Nov 1, 2024
7a07800
Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton
Nov 1, 2024
34b8efe
Resolve conflict from follow-on Lineage update
jsf9k Nov 6, 2024
3ef4f2f
Uncomment new Dependabot directives from upstream
jsf9k Nov 6, 2024
12a91ad
Bump up the lower bound on ansible-core
jsf9k Nov 8, 2024
b9f798d
Update the version of the ansible-lint pre-commit hook
jsf9k Nov 13, 2024
cca133a
Adjust pin for ansible-core
jsf9k Nov 14, 2024
bd85261
Add comments about looming EOL issues for ansible and ansible-core
jsf9k Nov 20, 2024
f7ccd9a
Merge pull request #196 from cisagov/improvement/add-a-lower-bound-pi…
jsf9k Nov 20, 2024
a794735
Merge pull request #197 from cisagov/improvement/upgrade-ansible-lint…
jsf9k Nov 20, 2024
87f15d4
Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton
Nov 20, 2024
adbf9e4
Merge pull request #144 from cisagov/improvement/remove-python-3.7
jsf9k Jan 31, 2025
8d93493
Merge pull request #138 from cisagov/improvement/add-flag-to-mypy
jsf9k Jan 31, 2025
0989965
Merge pull request #139 from cisagov/improvement/pytest-config
jsf9k Jan 31, 2025
00fd1d8
Merge pull request #140 from cisagov/lineage/skeleton
jsf9k Jan 31, 2025
a5650c2
Merge pull request #141 from cisagov/improvement/add-dev-dependencies
jsf9k Jan 31, 2025
42cab98
Merge pull request #142 from cisagov/improvement/remove-some-unnecess…
jsf9k Jan 31, 2025
0da26c3
Merge pull request #143 from cisagov/improvement/support-python-13
jsf9k Jan 31, 2025
72532d1
Upgrade GH Action in CodeQL workflow
jsf9k Feb 7, 2025
dfb0f1f
Merge pull request #146 from cisagov/improvement/update-version-of-gh…
jsf9k Feb 7, 2025
aee8b0a
Merge remote-tracking branch 'skeleton-python-library/develop' into l…
jsf9k Feb 11, 2025
d07b37a
Remove needless shebang
jsf9k Feb 12, 2025
3e1bc82
Add types library for requests
jsf9k Feb 12, 2025
5fa2807
Bump version from 1.0.0 to 2.0.0
jsf9k Feb 12, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move mypy command toward the end of the script
This allows all the other good things to happen even if the mypy
command fails.
jsf9k committed Oct 11, 2024
commit 48d3b4f913657570e43dbaffbc80bbd604bfc5ad
6 changes: 3 additions & 3 deletions setup-env
Original file line number Diff line number Diff line change
@@ -250,9 +250,6 @@ for req_file in "requirements-dev.txt" "requirements-test.txt" "requirements.txt
fi
done

# Install all necessary mypy type stubs
mypy --install-types --non-interactive src/

# Install git pre-commit hooks now or later.
pre-commit install ${INSTALL_HOOKS:+"--install-hooks"}

@@ -285,5 +282,8 @@ else:
END_OF_LINE
)"

# Install all necessary mypy type stubs
mypy --install-types --non-interactive src/

# Qapla'
echo "Success!"