Skip to content

Commit

Permalink
Merge branch 'main' of github.com:yt-project/yt into ewah-split-patch
Browse files Browse the repository at this point in the history
  • Loading branch information
themousepotato committed Jun 8, 2021
2 parents 0a27672 + e79b469 commit 49ddef3
Show file tree
Hide file tree
Showing 1,037 changed files with 74,196 additions and 62,781 deletions.
3 changes: 0 additions & 3 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@ omit=*.yml
*/__config__.py
*/tests/*
yt/analysis_modules/*
yt/extern/*
yt/mods.py
yt/utilities/fits_image.py
yt/utilities/lodgeit.py
yt/utilities/lru_cache.py
yt/utilities/poster/*
yt/visualization/_mpl_imports.py

ignore_errors = True
40 changes: 40 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# transition to isort
7edfcee093cca277307aabdb180e0ffc69768291
81418e459f16c48d6b7a75d6ef8035dfe9651b39
60f670d75a23a6d094879437a8df455a66acbeaf
556636e64712a4e161b1d09aeba5833540d05994

# transition to black
ebadee629414aed2c7b6526e22a419205329ec38
6f0e37c4b926f1411b14bd35da85c7e7e27d0cd9

# automated trailing whitespace removal
3ee548b04a41dfbc009921c492fba6a0682651ca

# converting to f-strings
ad898e8e3954bc348daaa449d5ed73db778785e9
ef51ad5199692afcf1a8ab491aa115c00c423113
323ac4ddd4e99d6b951666736d4e9b03b6cfa21e
f7445f02022293f1b089cd8907000301516354bf

# f-strings, black & isort on doc
e6276f25fc5a570d886b6bbdaa7e3062da2d35ca

# fix EOF
5e5ce1487f9b04344d297b7901cf5f82c6fee3cb

# fix trailing whitespace
12068b7a38ec17cb3d83baca32c1dc8d07613f9a

# auto-fixes from pre-commit
f3a0720bb713aead0f0d50888f2176d20fe02ef4
7931b96a90c20d835a4dc96b81019382f9461351

# legacy conversion commits authored by "convert-repo"
b7112d4ccbcd309ae2c5c2ee0f9352466a0cecf2
33f3988bbfa97399114e3df9ac491c828ae59a8c
cae222aec845d0b400e2aa2804e75b2adef17ccd
993162d6fb38f55b0bf372da1c3b984ee2d4f085
ef783151bfd7c6777fa25e9e06f95fe47653b3aa
063e2fb630932cbdcbbbdba603c100a37e7e40f6
279b0551ccc9d9d4c114904b94bc705381c61105
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ using:-->
* Operating System:
* Python Version:
* yt version:
* Other Libraries (if applicable):
* Other Libraries (if applicable):

<!--Please tell us how you installed yt and python e.g., from source,
pip, conda. If you installed from conda, please specify which channel you used
if not the default-->

4 changes: 1 addition & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ http://yt-project.org/docs/dev/developing/index.html-->
example "Raises ValueError on Non-Numeric Input to set_xlim". Please avoid
non-descriptive titles such as "Addresses issue #8576".-->

<!--If you are able to do so, please do not create the PR out of master, but out
<!--If you are able to do so, please do not create the PR out of main, but out
of a separate branch. -->

## PR Summary
Expand All @@ -19,8 +19,6 @@ detail. Why is this change required? What problem does it solve?-->
## PR Checklist

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

- [ ] Code passes flake8 checker
- [ ] New features are documented, with docstrings and narrative docs
- [ ] Adds a test for any bugs fixed. Adds tests for new features.

Expand Down
2 changes: 1 addition & 1 deletion .github/mergeable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ mergeable:
message: "WIP pull requests can't be merged."
- do: label
must_include:
regex: 'bug|enhancement|new feature|docs|infrastructure'
regex: 'bug|enhancement|new feature|docs|infrastructure|dead code|refactor'
message: "Please label this pull request with one of: bug, enhancement, new feature, docs or infrastructure."
52 changes: 52 additions & 0 deletions .github/workflows/build-test-pytest.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Build and Test

on: [push, pull_request]

defaults:
run:
shell: bash

env:
HOMEBREW_NO_AUTO_UPDATE: 1

jobs:

build:
strategy:
matrix:
os: [macos-latest, windows-latest, ubuntu-18.04]
python-version: [3.9]
dependencies: [full]
tests-type: [unit]
include:
- os: ubuntu-18.04
python-version: 3.6
dependencies: minimal
tests-type: unit

runs-on: ${{ matrix.os }}
steps:
- name: Install Python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- uses: actions/checkout@v2
with:
submodules: recursive
fetch-depth: 0
- uses: s-weigand/setup-conda@v1
if: matrix.os == 'windows-latest'
with:
update-conda: true
conda-channels: conda-forge
activate-conda: true
python-version: ${{matrix.python-version}}
- name: Install dependencies and yt
shell: bash
env:
dependencies: ${{ matrix.dependencies }}
run: source ./tests/ci_install.sh
- name: Run Tests
env:
testsuite: ${{ matrix.tests-type }}
run: pytest
60 changes: 60 additions & 0 deletions .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Build and Test

on: [push, pull_request]

defaults:
run:
shell: bash

env:
HOMEBREW_NO_AUTO_UPDATE: 1

jobs:

build:
strategy:
matrix:
os: [macos-latest, windows-latest, ubuntu-18.04]
python-version: [3.9]
dependencies: [full]
tests-type: [unit]
include:
- os: ubuntu-18.04
python-version: 3.6
dependencies: minimal
tests-type: unit
- os: ubuntu-18.04
python-version: 3.7
dependencies: full
tests-type: answer

runs-on: ${{ matrix.os }}
steps:
- name: Install Python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- uses: actions/checkout@v2
with:
submodules: recursive
fetch-depth: 0
- uses: s-weigand/setup-conda@v1
if: matrix.os == 'windows-latest'
with:
update-conda: true
conda-channels: conda-forge
activate-conda: true
python-version: ${{matrix.python-version}}
- name: Install dependencies and yt
shell: bash
env:
dependencies: ${{ matrix.dependencies }}
run: source ./tests/ci_install.sh
- name: Run Tests
env:
testsuite: ${{ matrix.tests-type }}
run: python -m nose -c nose_${testsuite}.cfg --traverse-namespace
- name: Report Failed Answers
if: ${{ matrix.tests-type == 'answer' && failure() }}
shell: bash
run: python tests/report_failed_answers.py -f -m --xunit-file answer_nosetests.xml
33 changes: 33 additions & 0 deletions .github/workflows/rules-checks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Auto review bad practice
on: [pull_request]

jobs:
h5py-bad-practices:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@main
- name: check-h5py-import
# check that we don't alias h5py to h5
# reason: discoverability is important since this module's api
# is unstable and we want to be able to check for potential future failures
id: h5-import
run: |
grep -r -n "import _h5py as h5" yt | grep -v "import _h5py as h5py" | cat > h5-imports.log
if [ -s h5-imports.log ] ; then
echo "Please do not import h5py as h5. Here are the faulty lines."
cat h5-imports.log
exit 1
fi
- name: check-h5py-filemode
id: h5-file-mode
# check that a mode argument is always present in calls to h5py.File()
# reason: the default value is different in older versions 'w' VS newer ones 'r'
run: |
grep -E -r -n "h5py\.File\([^,]+\)" yt | cat > h5-mode.log
if [ -s h5-mode.log ] ; then
echo "h5py.File() should never be called without an explicit mode argument."
echo "Here are the faulty lines."
cat h5-mode.log
exit 1
fi
18 changes: 13 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ yt/utilities/lib/bounding_volume_hierarchy.c
yt/utilities/lib/contour_finding.c
yt/utilities/lib/cykdtree/kdtree.cpp
yt/utilities/lib/cykdtree/utils.cpp
yt/utilities/lib/cyoctree.cpp
yt/utilities/lib/cyoctree.c
yt/utilities/lib/depth_first_octree.c
yt/utilities/lib/distance_queue.c
yt/utilities/lib/element_mappings.c
Expand All @@ -54,10 +54,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 All @@ -83,6 +83,14 @@ yt/utilities/lib/partitioned_grid.c
yt/utilities/lib/volume_container.c
yt/utilities/lib/lenses.c
yt/utilities/lib/image_samplers.c
yt/utilities/lib/_octree_raytracing.cpp
yt/utilities/lib/bounding_volume_hierarchy.cpp
yt/utilities/lib/geometry_utils.cpp
yt/utilities/lib/grid_traversal.cpp
yt/utilities/lib/image_samplers.cpp
yt/utilities/lib/marching_cubes.cpp
yt/utilities/lib/misc_utilities.cpp
yt/utilities/lib/partitioned_grid.cpp
*.pyc
*.pyd
.*.swp
Expand Down
2 changes: 1 addition & 1 deletion .hgchurn
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ [email protected] = [email protected]
Fabian Koller = [email protected]
Rafael Ruggiero = [email protected]
[email protected] = [email protected]
[email protected] = [email protected]
[email protected] = [email protected]
90 changes: 0 additions & 90 deletions .hgignore

This file was deleted.

Loading

0 comments on commit 49ddef3

Please sign in to comment.