Skip to content

Commit

Permalink
Merge branch 'master' into index_chunksize
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewturk authored Jul 19, 2020
2 parents 077c461 + a6ad121 commit 499ce82
Show file tree
Hide file tree
Showing 829 changed files with 55,873 additions and 34,145 deletions.
4 changes: 3 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ detail. Why is this change required? What problem does it solve?-->

<!-- Note that some of these check boxes may not apply to all pull requests -->

- [ ] Code passes flake8 checker
- [ ] pass `flake8 yt/`
- [ ] pass `isort -rc . --check-only`
- [ ] pass `black --check yt/`
- [ ] New features are documented, with docstrings and narrative docs
- [ ] Adds a test for any bugs fixed. Adds tests for new features.

Expand Down
24 changes: 24 additions & 0 deletions .github/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome

# Comment to be posted to on first time issues
newIssueWelcomeComment: >
Hi, and welcome to yt! Thanks for opening your first issue. We have an issue
template that helps us to gather relevant information to help diagnosing and
fixing the issue.
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome

# Comment to be posted to on PRs from first time contributors in your repository
newPRWelcomeComment: >
Hi! Welcome, and thanks for opening this pull request. We have some guidelines for
new pull requests, and soon you'll hear back about the results of our tests and
continuous integration checks. Thank you for your contribution!
# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge

# Comment to be posted to on pull requests merged by a first time user
firstPRMergeComment: >
Hooray! Congratulations on your first merged pull request! We hope we keep
seeing you around! :fireworks:
# It is recommend to include as many gifs and emojis as possible
13 changes: 13 additions & 0 deletions .github/mergeable.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# config file for mergeable: https://github.com/mergeability/mergeable
version: 2
mergeable:
- when: pull_request.*
validate:
- do: title
must_exclude:
regex: ^\[?WIP\b
message: "WIP pull requests can't be merged."
- do: label
must_include:
regex: 'bug|enhancement|new feature|docs|infrastructure'
message: "Please label this pull request with one of: bug, enhancement, new feature, docs or infrastructure."
12 changes: 8 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ yt/utilities/lib/interpolators.c
yt/utilities/lib/kdtree.c
yt/utilities/lib/lenses.c
yt/utilities/lib/line_integral_convolution.c
yt/utilities/lib/mesh_construction.cpp
yt/utilities/lib/mesh_intersection.cpp
yt/utilities/lib/mesh_samplers.cpp
yt/utilities/lib/mesh_traversal.cpp
yt/utilities/lib/embree_mesh/mesh_construction.cpp
yt/utilities/lib/embree_mesh/mesh_intersection.cpp
yt/utilities/lib/embree_mesh/mesh_samplers.cpp
yt/utilities/lib/embree_mesh/mesh_traversal.cpp
yt/utilities/lib/mesh_triangulation.c
yt/utilities/lib/mesh_utilities.c
yt/utilities/lib/pixelization_routines.cpp
Expand Down Expand Up @@ -92,6 +92,10 @@ yt/utilities/lib/image_samplers.c
tests/results/*
doc/build/*
doc/source/reference/api/generated/*
doc/source/reference/api/yt*
doc/cheatsheet.aux
doc/cheatsheet.log
doc/cheatsheet.pdf
doc/_temp/*
doc/source/quickstart/.ipynb_checkpoints/
dist
Expand Down
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ jobs:
python: 3.6
script: flake8 yt/

- stage: Lint
python: 3.6
script: isort --check-only -rc yt/
script: black --check yt/

- stage: tests
name: "Python: 3.6 Minimal Dependency Unit Tests"
python: 3.6
Expand Down
Loading

0 comments on commit 499ce82

Please sign in to comment.