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.

Sign up for GitHub

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 #37

Merged
merged 11 commits into from
Oct 23, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e14ecde
Add link to how to set up a new repo with skeletons
hillaryj Oct 9, 2020
57d927d
Add line breaks for linting
hillaryj Oct 9, 2020
b5ef97d
Remove seed-isort-config pre-commit hook
mcdonnnj Oct 19, 2020
de409db
Use local filename in README link
mcdonnnj Oct 19, 2020
59eef4c
Run pre-commit autoupdate
mcdonnnj Oct 19, 2020
a9ef644
Merge pull request #53 from cisagov/add-how-to-skeleton
mcdonnnj Oct 22, 2020
1928db6
Merge branch 'develop' into pre-commit_updates
mcdonnnj Oct 22, 2020
4d88e06
Merge pull request #54 from cisagov/pre-commit_updates
mcdonnnj Oct 22, 2020
919460c
Change repo for the prettier pre-commit hook
mcdonnnj Oct 22, 2020
e44762c
Merge pull request #55 from cisagov/migrate_prettier_hook
mcdonnnj Oct 22, 2020
bcd7a3a
Merge remote-tracking branch 'skeleton-generic/develop' into lineage/…
jsf9k Oct 22, 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
5 changes: 0 additions & 5 deletions .isort.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,5 @@ import_heading_stdlib=Standard Python Libraries
import_heading_thirdparty=Third-Party Libraries
import_heading_firstparty=cisagov Libraries

# Should be auto-populated by seed-isort-config hook
known_third_party=pytest
# These must be manually set to correctly separate them from third party libraries
known_first_party=

# Run isort under the black profile to align with our other Python linting
profile=black
22 changes: 9 additions & 13 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ repos:
- id: requirements-txt-fixer
- id: trailing-whitespace
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.23.2
rev: v0.24.0
hooks:
- id: markdownlint
args:
- --config=.mdl_config.json
- repo: https://github.com/adrienverge/yamllint
rev: v1.24.2
rev: v1.25.0
hooks:
- id: yamllint
- repo: https://github.com/detailyang/pre-commit-shell
rev: 1.0.5
hooks:
- id: shell-lint
- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.3
rev: 3.8.4
hooks:
- id: flake8
additional_dependencies:
Expand Down Expand Up @@ -71,20 +71,16 @@ repos:
rev: 20.8b1
hooks:
- id: black
- repo: https://github.com/asottile/seed-isort-config
rev: v2.2.0
hooks:
- id: seed-isort-config
- repo: https://github.com/timothycrosley/isort
rev: 5.5.0
rev: 5.6.4
hooks:
- id: isort
- repo: https://github.com/ansible/ansible-lint.git
rev: v4.3.4
rev: v4.3.5
hooks:
- id: ansible-lint
- repo: https://github.com/antonbabenko/pre-commit-terraform.git
rev: v1.37.0
rev: v1.43.0
hooks:
- id: terraform_fmt
# There are ongoing issues with how this command works. This issue
Expand All @@ -107,11 +103,11 @@ repos:
rev: v2.0.0
hooks:
- id: docker-compose-check
- repo: https://github.com/prettier/prettier
rev: 2.1.1
- repo: https://github.com/prettier/pre-commit
rev: v2.1.2
hooks:
- id: prettier
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.782
rev: v0.790
hooks:
- id: mypy
9 changes: 8 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,16 @@ This container exposes the following ports:
|-------------|----------------|
| /var/log | logging output |

## New Repositories from a Skeleton ##

Please see our [Project Setup guide](https://github.com/cisagov/development-guide/tree/develop/project_setup)
for step-by-step instructions on how to start a new repository from
a skeleton. This will save you time and effort when configuring a
new repository!

## Contributing ##

We welcome contributions! Please see [here](CONTRIBUTING.md) for
We welcome contributions! Please see [`CONTRIBUTING.md`](CONTRIBUTING.md) for
details.

## License ##
Expand Down