Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
234 commits
Select commit Hold shift + click to select a range
249dc84
first azure-pipelines test
jcapriot Jul 10, 2020
b8265f3
test
jcapriot Jul 10, 2020
9157bf9
remove comment
jcapriot Jul 10, 2020
edb1623
no message
jcapriot Jul 10, 2020
418f706
pytest
jcapriot Jul 10, 2020
908ffd2
Try with a bunch of OSs
jcapriot Jul 13, 2020
ee4b483
try conditional
jcapriot Jul 13, 2020
f221802
neq -> ne
jcapriot Jul 13, 2020
55eea79
split into os specifics
jcapriot Jul 14, 2020
9eb62d5
proper path
jcapriot Jul 14, 2020
00c8610
remove stages?
jcapriot Jul 14, 2020
0c9a84e
put back stages... add space in template.
jcapriot Jul 14, 2020
1e64ad8
some changes
jcapriot Jul 14, 2020
dd62cce
change install?
jcapriot Jul 14, 2020
0608704
some more
jcapriot Jul 14, 2020
857f50a
switch to specific list
jcapriot Jul 14, 2020
be5f121
switch to latest, add init bash, set KMP_WARNINGS once
jcapriot Jul 14, 2020
50c5bf5
testing fix
jcapriot Jul 14, 2020
69bb31a
try activate again
jcapriot Jul 14, 2020
3b83aaf
eval before each activate?
jcapriot Jul 14, 2020
5d548e2
set KMP_WARNINGS as a variable... should expose it as an environment …
jcapriot Jul 14, 2020
660366d
remove variables, ignore github/simpeg/discretize links
jcapriot Jul 14, 2020
d4312dd
grab CI helpers for linux
jcapriot Jul 14, 2020
bda7cd3
focus on windows testing
jcapriot Jul 14, 2020
cc6b1a1
try this...
jcapriot Jul 14, 2020
4786107
add Miniconda instead of CONDA
jcapriot Jul 14, 2020
1f17b08
one line here
jcapriot Jul 14, 2020
92ff97f
double quotes
jcapriot Jul 14, 2020
af10b74
install pip
jcapriot Jul 14, 2020
3f8d7ba
two lines per script....
jcapriot Jul 14, 2020
25a0e2c
test the doc build on windows
jcapriot Jul 14, 2020
6ed1b7d
install opengl?
jcapriot Jul 14, 2020
c4ca7ea
provide better path
jcapriot Jul 14, 2020
1aa9990
doc test on windows
jcapriot Jul 14, 2020
334f020
call
jcapriot Jul 14, 2020
eef6980
test on all
jcapriot Jul 14, 2020
2919aa4
condition
jcapriot Jul 14, 2020
c70d9bf
remove /'
jcapriot Jul 14, 2020
76c0ea6
remove extra )
jcapriot Jul 14, 2020
5b877b5
test building windows wheels
jcapriot Jul 14, 2020
d222d0f
pool it
jcapriot Jul 14, 2020
649ae06
build documentation, make sdist
jcapriot Jul 14, 2020
d3fcd40
test twine upload "to testpypi"
jcapriot Jul 15, 2020
61e0f6b
echo the twine username to check if that environment variable is set
jcapriot Jul 15, 2020
46a2026
Check again
jcapriot Jul 15, 2020
a96d46b
try again
jcapriot Jul 15, 2020
914d1c6
load username and password into twine environment variables
jcapriot Jul 15, 2020
2413f10
initial moving and renaming of modules
jcapriot Sep 10, 2020
5449329
move all cython into one _extensions folder
jcapriot Sep 10, 2020
901b43c
"requires"
jcapriot Sep 10, 2020
5f8c662
import cleanups
jcapriot Sep 11, 2020
71590f5
more import cleanups
jcapriot Sep 11, 2020
afdd190
curvilinear active test updates
jcapriot Sep 11, 2020
882d659
omg_mod rename
jcapriot Sep 11, 2020
b593cdf
updates for documentation links and plotting examples
jcapriot Sep 11, 2020
b48e361
add deprecation helpers
jcapriot Sep 15, 2020
5f07f8d
property renames for BaseMesh and BaseRectangularMesh
jcapriot Sep 15, 2020
8ed9ab2
add shorthand properties, make shape_* tuples
jcapriot Sep 16, 2020
1949d56
old_name...
jcapriot Sep 16, 2020
92e7f39
move the mesh operators to an `operators` module
jcapriot Sep 16, 2020
64e7ff7
"r" deprecation
jcapriot Sep 16, 2020
1c93073
base tensor deprecations
jcapriot Sep 17, 2020
7f00176
ndgrid simplifications
jcapriot Sep 17, 2020
5dc0a9e
deprecate mesh_io
jcapriot Sep 17, 2020
2144f5b
remove line of ndgrid function
jcapriot Sep 17, 2020
f8b7fc8
syntax fix
jcapriot Sep 17, 2020
87d0844
switch to using an alias dictionary at the class level
jcapriot Sep 17, 2020
59a9b28
Throw more meaningful (no assert) errors
jcapriot Sep 17, 2020
aacc997
deprecations and shorthands for differential_operators
jcapriot Sep 17, 2020
ea68a57
remove unused import
jcapriot Sep 17, 2020
e241dd9
inner Product deprecations
jcapriot Sep 17, 2020
5dcdeb5
base tensor aliases
jcapriot Sep 17, 2020
1536d3f
curvilinear deprecations
jcapriot Sep 17, 2020
699d79b
internal deprecation updates
jcapriot Sep 18, 2020
a8a5961
first pass at CylindricalMesh renames
jcapriot Sep 18, 2020
29caf44
more cylindrical mesh updates
jcapriot Sep 18, 2020
e40f313
more deprecations
jcapriot Sep 18, 2020
ea74812
TensorMesh Deprecations
jcapriot Sep 18, 2020
9b35b45
remove tuple copies and item additions
jcapriot Sep 18, 2020
1e7a1bb
no property named vector_nodes_...
jcapriot Sep 18, 2020
1067f97
some bug fixes
jcapriot Sep 18, 2020
f317024
test for equality of tuples
jcapriot Sep 18, 2020
5025b32
bug fixes
jcapriot Sep 18, 2020
2ed5555
dstack -> column_stack
jcapriot Sep 18, 2020
86deaf1
change the deprecation functions to describe the two methods as strin…
jcapriot Sep 19, 2020
69e38b5
bug fixes
jcapriot Sep 20, 2020
e2d5f34
add cartesianGrid deprecation
jcapriot Sep 20, 2020
c0c2404
use gettatr and settatr for deprecations.
jcapriot Sep 20, 2020
492446f
testing syntax updates
jcapriot Sep 20, 2020
ffb5e99
make _n an unsettable tuple
jcapriot Sep 21, 2020
496250f
ndgrid fix for 1D input
jcapriot Sep 21, 2020
b71d4aa
Modifications to make matplotlib a mixin!
jcapriot Sep 23, 2020
ae6132a
Syntax error for cell_grad operators on cylinder mesh
jcapriot Sep 23, 2020
479603d
add directory option for read_UBC
jcapriot Sep 23, 2020
05e9d33
plot function deprecations
jcapriot Sep 23, 2020
f35923d
utils deprecations
jcapriot Sep 23, 2020
86a908a
some more changes
jcapriot Sep 23, 2020
f33780a
import deprecations into discretize.utils
jcapriot Sep 23, 2020
1fb14c3
re-organize imports of deprecated functions
jcapriot Sep 23, 2020
ca1dbec
first batch internal deprecations
jcapriot Sep 23, 2020
59a108f
check all "a"s
jcapriot Sep 23, 2020
c6f89a4
vectorN -> grid_nodes_
jcapriot Sep 23, 2020
a661e18
nNx -> shape_nodes[0], etc.
jcapriot Sep 23, 2020
d3c99b5
more vectorN, vectorCC internal switches
jcapriot Sep 23, 2020
7e4f942
base tensor internal switches
jcapriot Sep 23, 2020
1473b2e
some more BaseTensorMesh internal deprecation avoiding.
jcapriot Sep 23, 2020
580c501
ubc io renaming
jcapriot Sep 23, 2020
013c7cd
mpl_mod internal deprecations
jcapriot Sep 23, 2020
f965526
Differential Operators deprecations
jcapriot Sep 23, 2020
5a3133a
inner product renames
jcapriot Sep 23, 2020
8113a91
now works as long as dims is iterable
jcapriot Sep 23, 2020
b1637b5
internal utils deprecation renaming
jcapriot Sep 23, 2020
2e2e428
also test for numpy ndarray
jcapriot Sep 23, 2020
4c03938
vol to cell_volumes
jcapriot Sep 23, 2020
9c6958b
area to face_areas
jcapriot Sep 23, 2020
a9d83f0
more internal renaming
jcapriot Sep 23, 2020
3f73adb
set ax_test when already a list...
jcapriot Sep 23, 2020
1236176
set ax_test when already a list
jcapriot Sep 23, 2020
2c5be8a
fix more for face areas and axes check...
jcapriot Sep 23, 2020
a123cec
deprecations for testing
jcapriot Sep 23, 2020
4de1528
some renaming, and adding deprecated "View" module (for the Slicer cl…
jcapriot Sep 23, 2020
1810236
update CylMesh to CylindricalMesh internally
jcapriot Sep 23, 2020
068e776
leave in this deprecation
jcapriot Sep 23, 2020
f3510bf
cylindrical_mesh
jcapriot Sep 23, 2020
70bbdb6
undo testing deprecations
jcapriot Sep 23, 2020
b23397b
make outputs of mesh plotting commands uniform
jcapriot Sep 23, 2020
ef7caf9
documentation updates
jcapriot Sep 23, 2020
2e7d1cc
more documentation updates
jcapriot Sep 23, 2020
e07b548
separate out Mesh specific parameters to an "Other Parameters" section
jcapriot Sep 23, 2020
d4b0e48
testing to tests.
jcapriot Sep 23, 2020
ec7f1eb
first batch of function keyword deprecations for functions on meshes
jcapriot Sep 26, 2020
300a290
add long form of cart2cyl name
jcapriot Sep 26, 2020
a6a7e49
More keyword argument deprecations for functions in utils.
jcapriot Sep 26, 2020
240d808
Tuple
jcapriot Sep 26, 2020
b6aea89
Fix for xType deprecation within the reshape function.
jcapriot Sep 28, 2020
f6052a0
explicit relative imports to absolute imports
jcapriot Sep 28, 2020
eb5b1a6
apparently this needs to be an explicit relative import
jcapriot Sep 28, 2020
b469d5f
actually it was just spelled wrong previously
jcapriot Sep 28, 2020
626ae6a
more incorrect spelling by me
jcapriot Sep 28, 2020
ec4893d
remove unused linkchecks
jcapriot Sep 28, 2020
dfbed1b
run black on discretize
jcapriot Sep 28, 2020
a8f619d
2019-2020
jcapriot Sep 28, 2020
2263f68
minor documentation change
jcapriot Sep 29, 2020
397559c
fix for matplotlib 3.3 vmin,vmax + norm deprecation.
jcapriot Sep 29, 2020
e8c6682
move annotation_color check to the proper location
jcapriot Sep 29, 2020
eb82cbc
bool object is not callable
jcapriot Sep 29, 2020
8fbd153
fix for differences of matplotlib <3.3 and matplotlib 3.3
jcapriot Sep 29, 2020
742fe99
remove __future__ imports
jcapriot Sep 29, 2020
6eebaa4
remove import of six (was used for 2 to 3 compatibility)
jcapriot Sep 29, 2020
2e36bcd
bug fixes
jcapriot Sep 29, 2020
b5c739d
set vmin, vmax if clim is not None
jcapriot Sep 30, 2020
195f3f4
make 3d tensormesh plot_image return consistent.
jcapriot Oct 1, 2020
ab39141
change name of mesh_tensor to unpack_widths
jcapriot Oct 1, 2020
bc146e3
update deprecations for View
jcapriot Oct 9, 2020
76c0c93
deprecate the "Tests" module in a better way
jcapriot Oct 9, 2020
e788d4d
Add deprecations for old utils files.
jcapriot Oct 9, 2020
7429e48
replace asserts with raises
jcapriot Oct 9, 2020
e6dc5f1
remove vectorN references in tree_mesh.py
jcapriot Oct 9, 2020
568a6ce
reformat with black
jcapriot Oct 9, 2020
1c4afdb
"tests" not "testing"
jcapriot Oct 9, 2020
0fa9a74
make h_gridded return (ndim, 1) if 1D
jcapriot Oct 9, 2020
dc8a2bb
mark vnF, vnE for deprecation.
jcapriot Oct 9, 2020
497c32e
run black
jcapriot Oct 15, 2020
c5c1048
update names in the API
jcapriot Oct 15, 2020
1680eba
rename to closest_points_index
jcapriot Oct 15, 2020
9efbf10
add release notes for 0.6.0
jcapriot Oct 15, 2020
727b77e
remove unnecessary c compiler configuration from numpy 1.18
jcapriot Oct 27, 2020
461c13a
Merge branch 'restructure' into azure_pipelines
jcapriot Oct 27, 2020
c172079
add azure-pipelines testing
jcapriot Oct 27, 2020
a30f450
add .setup_headless_display.sh,
jcapriot Oct 27, 2020
f7cbb68
remove conda env list
jcapriot Oct 27, 2020
0ec75be
remove list
jcapriot Oct 27, 2020
00bf300
combine tests into one step (so they all run) if any of them fail
jcapriot Oct 27, 2020
8953c12
make setup_headless_display executable
jcapriot Oct 27, 2020
cf41f00
add DISPLAY and PYVISTA_OFF_SCREEN as variables
jcapriot Oct 28, 2020
77a551e
remove appveyor and travis testing
jcapriot Oct 28, 2020
578c8a1
skip existing, and pip install wheel on windows
jcapriot Oct 28, 2020
a9b58cf
add back in conditions, and set triggers
jcapriot Oct 28, 2020
616d692
uncomment tests
jcapriot Oct 28, 2020
d2f78ef
uncomment the doctr deploy
jcapriot Oct 28, 2020
ca60bfb
Change displayed name to make them look nicer on discretize PR checks
jcapriot Oct 28, 2020
4f6b5c7
change codecov upload
jcapriot Oct 28, 2020
8d0b4f9
generate XML coverage
jcapriot Oct 28, 2020
b34359c
test (almost) delpoying docs using example from pyvista
jcapriot Oct 28, 2020
5d48e46
add back in all the testing and deploy operations
jcapriot Oct 28, 2020
6791b0a
add a few more items directly to the conda-forge installation (mostly…
jcapriot Oct 28, 2020
736886e
install pytest-azurepipelines and generate xml and html output
jcapriot Oct 28, 2020
e9d5564
more testing updates
jcapriot Oct 29, 2020
e240293
add a small term to zz to deal with numerical precision issues in mes…
jcapriot Oct 29, 2020
235b711
install in local editor mode
jcapriot Oct 29, 2020
21e5b3f
check if it's one of two numbers, likely due to small numerical diffe…
jcapriot Oct 29, 2020
8825924
Same thing for this part
jcapriot Oct 29, 2020
bb51a93
install pytest-azurepipelines for both osx and windows
jcapriot Oct 30, 2020
6f067b0
add note about testing on Azure with link to the new organization
jcapriot Oct 30, 2020
2c9c888
switch grid_cell_centers to cell_centers
jcapriot Nov 11, 2020
1e71df4
add ndim and shape properties to the Zero and Identity class, and a g…
jcapriot Nov 11, 2020
b785174
grid_nodes -> nodes
jcapriot Nov 11, 2020
3fc0a75
grid_edges -> edges
jcapriot Nov 11, 2020
9ff4b95
grid_faces -> faces
jcapriot Nov 11, 2020
94c3f66
grid_hanging -> hanging_
jcapriot Nov 11, 2020
b86b7a0
only keep original copyright date
jcapriot Nov 11, 2020
ebc7222
fV -> face_vector variable rename
jcapriot Nov 11, 2020
0da475b
eV -> edge_vector
jcapriot Nov 11, 2020
3dd43ae
add tol variable
jcapriot Nov 11, 2020
1d1d7da
loc_type -> location_type
jcapriot Nov 11, 2020
1fff3e3
deprecation warning fix for zerosOutside
jcapriot Nov 11, 2020
332b679
proj_type -> projection_type
jcapriot Nov 11, 2020
db80c94
inv_prop -> inverse_property
jcapriot Nov 11, 2020
541ddcb
inv_mat -> inverse_matrix
jcapriot Nov 11, 2020
076d13f
prop -> model
jcapriot Nov 11, 2020
e92601d
prop -> model
jcapriot Nov 11, 2020
a43f496
change to verb
jcapriot Nov 11, 2020
0bb8869
change to verb
jcapriot Nov 11, 2020
e291aba
filename -> file_name (where appropriate)
jcapriot Nov 11, 2020
78b406c
add space when filename in comments
jcapriot Nov 11, 2020
6742bf0
x0 -> origin, with an alliased getter and setter on BaseMesh
jcapriot Nov 11, 2020
f488932
note in docs about x0
jcapriot Nov 11, 2020
5375308
internal variable renaming
jcapriot Nov 11, 2020
7572f3e
update location_type to accept new names
jcapriot Nov 11, 2020
02e1813
avoid name clash of `nodes` on the curvilinear mesh by changing it to…
jcapriot Nov 11, 2020
ed5c37f
leave x0 here for consistent variable names in this function (for now)
jcapriot Nov 11, 2020
3e076cb
change check for node_list in the validator
jcapriot Nov 12, 2020
da865bd
_edge_tangents rename
jcapriot Nov 12, 2020
a346336
curvi fix
jcapriot Nov 12, 2020
5162ff6
unintential IO bug
jcapriot Nov 12, 2020
117314a
allow reshape to take new location_types
jcapriot Nov 12, 2020
c6a748e
more bugfixes
jcapriot Nov 12, 2020
5dd6916
_x0
jcapriot Nov 12, 2020
f17bf11
switch back to geometery.origin
jcapriot Nov 12, 2020
20106be
add note about n_edges_per_direction, n_faces_per_direction
jcapriot Nov 12, 2020
1c967c8
add deserializers to catch 'x0's and 'nodes' from possible old serial…
jcapriot Nov 13, 2020
cd87424
set origin for curvilinear mesh (was previously unset and defaulted t…
jcapriot Nov 13, 2020
e0bb708
add requirement to osx matplotlib version
jcapriot Nov 17, 2020
9e5da03
syntax fix
jcapriot Nov 17, 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
46 changes: 46 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
jobs:
- job:
displayName: Ubuntu
pool:
vmImage: ubuntu-latest
variables:
DISPLAY: ':99.0'
PYVISTA_OFF_SCREEN: 'True'
strategy:
matrix:
linux-Python36:
python.version: '3.6'
linux-Python37:
python.version: '3.7'
linux-Python38:
python.version: '3.8'
steps:

- script: echo '##vso[task.prependpath]$CONDA/bin'
displayName: Add conda to PATH

- script: |
conda create --yes --quiet --name test python=$(python.version)
displayName: Create Anaconda environment

- script: |
eval "$(conda shell.bash hook)"
conda activate test
conda install --yes --quiet -c conda-forge numpy scipy matplotlib cython vtk properties vectormath pyvista pymatsolver
conda install --yes --quiet -c conda-forge pytest pytest-cov
pip install -r requirements_dev.txt
pip install pytest-azurepipelines
pip install -e .
displayName: Install requirements and build

- script: |
eval "$(conda shell.bash hook)"
conda activate test
.ci/setup_headless_display.sh
pytest tests -v -s --cov-config=.coveragerc --cov=discretize --cov-report=xml --cov-report=html
displayName: 'Testing with coverage'

- script: |
bash <(curl -s https://codecov.io/bash)
displayName: 'Upload coverage to codecov.io'
condition: eq(variables['python.version'], '3.7')
40 changes: 40 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
jobs:
- job:
displayName: Mac
pool:
vmImage: macOS-latest
strategy:
matrix:
osx-Python36:
python.version: '3.6'
osx-Python37:
python.version: '3.7'
osx-Python38:
python.version: '3.8'
steps:

- script: echo '##vso[task.prependpath]$CONDA/bin'
displayName: Add conda to PATH

- script: sudo chown -R $USER $CONDA
displayName: Take ownership of conda installation

- script: |
conda create --yes --quiet --name test python=$(python.version)
displayName: Create Anaconda environment

- script: |
eval "$(conda shell.bash hook)"
conda activate test
conda install --yes --quiet -c conda-forge numpy scipy matplotlib">=3.0.0" cython vtk properties vectormath pyvista pymatsolver
conda install --yes --quiet -c conda-forge pytest
pip install -r requirements_dev.txt
pip install pytest-azurepipelines
pip install -e .
displayName: Install requirements and build

- script: |
eval "$(conda shell.bash hook)"
conda activate test
pytest tests -v -s
displayName: 'Running Tests'
37 changes: 37 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
jobs:
- job:
displayName: Windows
pool:
vmImage: vs2017-win2016
strategy:
matrix:
win-Python36:
python.version: '3.6'
win-Python37:
python.version: '3.7'
win-Python38:
python.version: '3.8'
steps:

- powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
displayName: Add conda to PATH

- script: |
conda create --yes --quiet -c conda-forge --name test python=$(python.version) numpy scipy matplotlib cython vtk properties vectormath pyvista pymatsolver pip
displayName: Create Anaconda environment

- script: |
call activate test
pip install -r requirements_dev.txt
pip install pytest-azurepipelines
displayName: Install other requirements

- script: |
call activate test
pip install -e .
displayName: Build

- script: |
call activate test
pytest tests/base tests/cyl tests/tree -v -s
displayName: 'Running tests'
File renamed without changes.
14 changes: 14 additions & 0 deletions .ci/setup_headless_display.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/sh
set -x

# sudo apt-get update && sudo apt-get install python-qt4 libgl1-mesa-glx
sudo apt-get install python-qt4 libgl1-mesa-glx
sudo apt-get install -y xvfb
which Xvfb
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
# Debugging commands:
# ls -l /etc/init.d/
# sh -e /etc/init.d/xvfb start
# give xvfb some time to start
sleep 3
set +x
6 changes: 0 additions & 6 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
[run]
source = discretize
omit =
*/python?.?/*
*/lib-python/?.?/*.py
*/lib_pypy/_*.py
*/site-packages/ordereddict.py
*/site-packages/nose/*
*/unittest2/*
*/setup.py
98 changes: 0 additions & 98 deletions .travis.yml

This file was deleted.

62 changes: 0 additions & 62 deletions appveyor.yml

This file was deleted.

Loading