Skip to content
This repository was archived by the owner on Aug 24, 2023. It is now read-only.

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

Merged
merged 112 commits into from
Jun 19, 2020
Merged

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

Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
ad11340
Initial commit with changes from skeleton-python-library.
mcdonnnj Dec 16, 2019
f6fff57
Change GitHub Actions Python versions to 3.8
mcdonnnj Dec 16, 2019
55bd2ca
Fix code formatting that snuck through because pre-commit wasn't inst…
mcdonnnj Dec 16, 2019
c406882
Set a requirement for the coverage package to be less than version 5.…
mcdonnnj Dec 16, 2019
77799ab
Fix coveralls configuration file to look at the correct directory for…
mcdonnnj Dec 16, 2019
15f259e
Merge remote-tracking branch 'skeleton' into develop
mcdonnnj Jan 22, 2020
2fa4cbe
Make workflow run when a PR is opened, synchronized, or reopened
jsf9k Jan 24, 2020
dbd589d
Improve list formatting
jsf9k Jan 24, 2020
a8e35d0
Merge pull request #29 from cisagov/improvement/better-handle-prs-fro…
jsf9k Jan 27, 2020
aaef908
Pull in changes to build workflow from skeleton-generic to support co…
mcdonnnj Jan 27, 2020
3356ecf
Merge pull request #33 from cisagov/improvement/pull_build_workflow_c…
mcdonnnj Jan 27, 2020
c60a34a
Merge branch 'develop' of github.com:cisagov/skeleton-python-library …
mcdonnnj Jan 27, 2020
fb71a2f
Adjust build.sh comments.
mcdonnnj Jan 27, 2020
7db8787
Add schema library.
felddy Jan 29, 2020
229da93
Add schema checks for arguments.
felddy Jan 29, 2020
7cbaaa9
Add tests for new arguments
felddy Jan 29, 2020
8520a70
Removed uses of xfail.
felddy Jan 30, 2020
454553e
Bumping github actions python version to 3.8.
felddy Jan 30, 2020
decd0f7
Merge pull request #34 from cisagov/improvement/schema
felddy Jan 30, 2020
4563ca3
Merge branch 'develop' of github.com:cisagov/skeleton-python-library …
mcdonnnj Feb 3, 2020
5327516
Backported changes to CONTRIBUTING.md from the development guide.
mcdonnnj Feb 10, 2020
3f6d654
Merge pull request #31 from cisagov/improvements/add_wsl_instructions
mcdonnnj Feb 10, 2020
f7a4166
Update Python version used to 3.8
mcdonnnj Feb 11, 2020
8116a89
Merge pull request #32 from cisagov/improvements/update_python_versio…
mcdonnnj Feb 11, 2020
b857939
Run pre-commit autoupdate.
mcdonnnj Feb 12, 2020
d99fd00
Flip cache order to mirror how it is done downstream.
mcdonnnj Feb 12, 2020
16872bf
Merge pull request #33 from cisagov/improvement/update_pre-commit_hooks
mcdonnnj Feb 12, 2020
965c3d9
Merge branch 'develop' of github.com:cisagov/skeleton-generic into im…
mcdonnnj Feb 12, 2020
fd03337
Fix spacing before comment in .bandit.yml (shown with pre-commit run …
mcdonnnj Feb 12, 2020
49f7002
Unpin coverage as coveralls supports coverage 5.0+ as of 1.10.0
mcdonnnj Feb 12, 2020
96675a1
Add --verbose flag to the coveralls call in the test workflow.
mcdonnnj Feb 12, 2020
df8a7eb
Pin coveralls version to see if the service_number addition in 1.11.0…
mcdonnnj Feb 12, 2020
8785abe
Remove --verbose from coveralls call in test workflow.
mcdonnnj Feb 12, 2020
6a7210c
Pin to testing branch per https://github.com/coveralls-clients/covera…
mcdonnnj Feb 14, 2020
d59f5f9
Change coveralls pin to avoid the version with the regression. 1.11.1…
mcdonnnj Feb 16, 2020
e96577b
All references to '-r' for pip calls have been replaced with the more…
mcdonnnj Feb 18, 2020
a17986b
Merge pull request #34 from cisagov/improvements/use_verbose_pip_swit…
mcdonnnj Feb 19, 2020
23425da
Merge branch 'develop' of github.com:cisagov/skeleton-generic into im…
mcdonnnj Feb 19, 2020
0478f94
Adjust language in description of pre-commit step in the GitHub Actio…
mcdonnnj Feb 19, 2020
a06c5ec
Merge pull request #36 from cisagov/improvements/pull_in_upstream_upd…
mcdonnnj Feb 19, 2020
e2972d0
Merge branch 'develop' of github.com:cisagov/skeleton-python-library …
mcdonnnj Feb 19, 2020
5019d01
Update artifact generation in line with work done in the findings-dat…
mcdonnnj Feb 19, 2020
e7cefd2
Update filename to unzip during build action.
mcdonnnj Feb 19, 2020
b8886c5
Merge pull request #1 from cisagov/improvements/pull_in_upstream_changes
mcdonnnj Feb 19, 2020
af261c3
Autoupdate pre-commit hooks. Add mypy.
felddy Feb 20, 2020
b68db4c
Sort .gitignore add mypy cache.
felddy Feb 20, 2020
3172a99
Add PEP 484 type hints.
felddy Feb 20, 2020
067ee08
Autoupdate pre-commit hooks. Add mypy.
felddy Feb 20, 2020
4ae80fd
Merge pull request #37 from cisagov/improvement/static_type_checking
felddy Feb 21, 2020
6369cc6
Merge pull request #35 from cisagov/improvement/static_type_checking
felddy Feb 21, 2020
bf36608
Add .mypy_cache to .gitignore
jsf9k Mar 2, 2020
c7f339f
Merge pull request #36 from cisagov/improvement/add-mypy-cache-to-git…
jsf9k Mar 2, 2020
454864b
Incorporate the Python version into keys for pip and pre-commit caches.
mcdonnnj Mar 3, 2020
b58f7a1
Merge pull request #37 from cisagov/add_python_version_to_cache_keys
mcdonnnj Mar 3, 2020
6fd982c
Merge branch 'develop' of github.com:cisagov/skeleton-generic into bu…
mcdonnnj Mar 3, 2020
478f168
Change the cache paths from hardcoded values in their appropriate blo…
mcdonnnj Mar 4, 2020
6505b32
Merge pull request #38 from cisagov/bugfix/pull_in_pre-commit_fix
mcdonnnj Mar 4, 2020
241484a
Merge pull request #38 from cisagov/change_cache_paths_to_env_variables
mcdonnnj Mar 4, 2020
d791334
Add a rule for markdownlint to allow multiple headers with the same n…
mcdonnnj Mar 4, 2020
f5fd431
Merge pull request #39 from cisagov/add_mdl_rule_for_MD024
mcdonnnj Mar 4, 2020
b04c093
Merge branch 'develop' of github.com:cisagov/skeleton-python-library …
mcdonnnj Mar 6, 2020
c6093a2
Adjust handler logging setup variable names to appease the mypy hook.
mcdonnnj Mar 6, 2020
43f0c4d
Merge pull request #2 from cisagov/improvements/pull_in_upstream_changes
mcdonnnj Mar 6, 2020
61790a9
Fixed broken hook id for pre-commit-terraform:
mcdonnnj Mar 31, 2020
757a861
Merge pull request #40 from cisagov/improvements/update_pre-commit
mcdonnnj Mar 31, 2020
39abc2c
Merge branch 'develop' of github.com:cisagov/skeleton-generic into im…
mcdonnnj Mar 31, 2020
61d3644
Merge pull request #39 from cisagov/improvements/upstream_updates
mcdonnnj Mar 31, 2020
0bc1aab
Ran `pre-commit autoupdate` to get the latest version of the
mcdonnnj Apr 6, 2020
b01a0ee
Explicitly install pre-commit hooks as its own step so it's clearer w…
mcdonnnj Apr 6, 2020
1f3d440
Rename action to accurately reflect that we are only linting, not bui…
mcdonnnj Apr 6, 2020
647b351
Sort .gitignore entries.
mcdonnnj Apr 6, 2020
89b098a
Merge pull request #41 from cisagov/bugfix/update_pre-commit_for_pre-…
mcdonnnj Apr 7, 2020
14e3362
Merge branch 'develop' of github.com:cisagov/skeleton-generic into im…
mcdonnnj Apr 7, 2020
a988a2d
Remove duplicate '.mypy_cache' entry in .gitignore
mcdonnnj Apr 7, 2020
f65532f
Merge pull request #40 from cisagov/improvements/pull_upstream_updates
mcdonnnj Apr 7, 2020
c8b4bcf
Update CODEOWNERS
hillaryj Apr 14, 2020
175ae71
Merge pull request #42 from cisagov/hillaryj-owner
hillaryj Apr 15, 2020
4c0a84e
Merge branch 'develop' of github.com:cisagov/skeleton-python-library …
mcdonnnj Apr 23, 2020
ab8810b
Merge remote-tracking branch 'skeleton-generic/develop' into improvem…
jsf9k Apr 27, 2020
7c776f4
Merge pull request #41 from cisagov/improvement/upstream-changes
jsf9k Apr 27, 2020
8c99c52
Allow events from apb to rebuild this repository weekly.
felddy May 1, 2020
3301dfa
Merge pull request #43 from cisagov/improvement/apb-events
felddy May 1, 2020
57a8a2b
Merge branch 'develop' of github.com:cisagov/skeleton-python-library …
mcdonnnj May 1, 2020
cf24607
Merge pull request #3 from cisagov/improvement/upstream-changes
mcdonnnj May 1, 2020
7d7a677
Updated pre-commit configuration with 'pre-commit autoupdate'.
mcdonnnj May 8, 2020
b724c79
Add Lineage configuration.
felddy May 12, 2020
0651d3c
Add Lineage configuration.
felddy May 12, 2020
35d8d81
Merge pull request #42 from cisagov/improvement/lineage
felddy May 12, 2020
d74f293
Merge pull request #4 from cisagov/improvement/lineage
felddy May 12, 2020
c60dd8c
Merge https://github.com/cisagov/skeleton-python-library into lineage…
May 12, 2020
db84df8
Merge pull request #6 from cisagov/lineage/skeleton
felddy May 13, 2020
ce6658a
Update isort pre-commit hook source repository.
mcdonnnj May 13, 2020
daaebc1
Ran pre-commit autoupdate.
mcdonnnj May 13, 2020
2399f24
Remove legacy comment from the isort hook declaration.
mcdonnnj May 13, 2020
fe4d5eb
Disable the terraform_validate hook.
mcdonnnj May 13, 2020
4d4db07
Merge branch 'develop' into improvements/pre-commit_autoupdate_2020-05
mcdonnnj May 13, 2020
f831ef8
Add final statement to descriptionf or why terraform_validate is disa…
mcdonnnj May 14, 2020
64edcc2
Merge branch 'improvements/pre-commit_autoupdate_2020-05' of github.c…
mcdonnnj May 14, 2020
70f0cbd
Merge pull request #44 from cisagov/improvements/pre-commit_autoupdat…
mcdonnnj May 14, 2020
5dded15
Merge github.com:cisagov/skeleton-generic into improvement/upstream
felddy May 21, 2020
2e48716
Merge pull request #43 from cisagov/improvement/upstream
felddy May 21, 2020
5daf9c4
Merge https://github.com/cisagov/skeleton-python-library into lineage…
May 21, 2020
6fed80d
Merge pull request #8 from cisagov/lineage/skeleton
dav3r May 22, 2020
87ea530
Add setuptools and wheel as pip dependencies
jsf9k Jun 9, 2020
7f8d430
Pull in requirements.txt from requirements-test.txt
jsf9k Jun 9, 2020
6668e3b
Merge pull request #45 from cisagov/improvement/add-wheel
jsf9k Jun 9, 2020
e211491
Resolve Lineage conflicts.
mcdonnnj Jun 15, 2020
370f2a2
Remove requirements that already exist in setup.py to align with a Si…
mcdonnnj Jun 15, 2020
50b3841
Merge pull request #44 from cisagov/lineage/skeleton
mcdonnnj Jun 16, 2020
0496f7f
Merge https://github.com/cisagov/skeleton-python-library into lineage…
Jun 16, 2020
5f5a570
Merge pull request #9 from cisagov/lineage/skeleton
dav3r Jun 16, 2020
482bab0
Resolve Lineage conflicts.
mcdonnnj Jun 19, 2020
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
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -o errexit
set -o pipefail

###
# Define the name of the Lambda zip file being produced
# Define the name of the Lambda zip file being produced.
###
ZIP_FILE=findings-data-import.zip

Expand Down