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.

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

Update CIs #607

Merged
merged 127 commits into from
Apr 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
cf1d838
Add CircleCI badge
guyer Oct 23, 2018
6fe9ddf
Split circle workflow into install and test
guyer Dec 20, 2018
ef97bc1
Add install to workflow
guyer Dec 20, 2018
795056f
Change name of job from "install" to "binky"
guyer Dec 20, 2018
bb76aff
Change job name to "build"
guyer Dec 20, 2018
8df2879
Putting back a bunch of redundant crap
guyer Dec 20, 2018
e12c1f2
Missed renaming of job to "build"
guyer Dec 20, 2018
833f81e
Strip everything away
guyer Dec 20, 2018
1c982c7
Revert "Strip everything away"
guyer Dec 20, 2018
67b0e90
Revert "Putting back a bunch of redundant crap"
guyer Dec 20, 2018
eeb7782
Add missing colons
guyer Dec 20, 2018
681a048
Add conda workspace
guyer Dec 20, 2018
d8c7c72
Remove workspace
guyer Dec 20, 2018
b6d1586
Rename cache
guyer Dec 20, 2018
aea82b3
Test if downstream job can restore cache
guyer Dec 20, 2018
687fcfd
Cache fake conda environment
guyer Dec 20, 2018
2cc67cf
Add missing syntax and steps
guyer Dec 20, 2018
fe52f3e
Fix environment name
guyer Dec 20, 2018
ab6f8d8
Deactivate before removing environment
guyer Dec 20, 2018
152c47e
Restore cache in each test job
guyer Dec 20, 2018
28c0a60
Put environment creation in a command
guyer Dec 21, 2018
1e17d27
Update cache
guyer Dec 21, 2018
ab7f0c8
Update configuration version
guyer Dec 21, 2018
e92b8a2
Force a change
guyer Dec 21, 2018
1b783e5
Remove unnecessary environment creation
guyer Dec 21, 2018
187fb59
Add pip cache to circle cache
guyer Dec 21, 2018
2c2e0d3
Flush extracted packages from cache
guyer Dec 21, 2018
def98ce
Checkout in each job
guyer Dec 21, 2018
17c9362
Fix YAML formatting
guyer Dec 21, 2018
0d0b61c
Remove hyphens and not hyphens and aughh!!!
guyer Dec 21, 2018
d256977
Change conda environment to local prefix
guyer Dec 21, 2018
a021f5c
Fix workflow requirement
guyer Dec 21, 2018
c367eac
Make path explicit
guyer Dec 21, 2018
9600fec
Add path to source activate
guyer Dec 21, 2018
4c67f87
Give scipy tests more time
guyer Dec 21, 2018
a442907
Remove redundant conda environment
guyer Dec 21, 2018
7e0c58b
Introduce defaults to reuse environment setup
guyer Dec 21, 2018
2164ab3
Introduce commands to save and restore cache
guyer Dec 21, 2018
38c15c4
Rename working directory
guyer Dec 21, 2018
755f980
Add test command
guyer Dec 21, 2018
de1f58c
Introduce trilinos tests
guyer Dec 21, 2018
b472755
Restore timeout extension
guyer Dec 21, 2018
6d7d007
Increase timeout
guyer Dec 21, 2018
4a327f1
Switch to fipy conda package (and prereqs)
guyer Dec 21, 2018
a121255
ping the build
guyer Feb 6, 2019
377ecdc
Reduce problem size temporarily to get CircleCI to run
guyer Mar 6, 2019
b0e2ab9
Merge branch 'updateci' of github.com:guyer/fipy into updateci
guyer Mar 6, 2019
9b4849a
Downsize comparison Grid2D
guyer Mar 6, 2019
53d97c0
ping the build
guyer Mar 7, 2019
e00eb97
ping the build
guyer Mar 8, 2019
278c821
Add libGL to CircleCI environment
guyer Mar 8, 2019
48261da
Add diagnostic to find libgl
guyer Mar 8, 2019
ce2833c
Add more diagnostics to find libGL
guyer Mar 8, 2019
5f05ceb
Move libGL install to test_fipy from conda_env
guyer Mar 8, 2019
1ef5f9b
Install conda packages individually
guyer Mar 12, 2019
41dc454
Add diagnostics for incompatible packages
guyer Mar 12, 2019
0bf6158
Ignore exception detail
guyer Mar 13, 2019
ea7124a
Move doctest flag to appropriate location
guyer Mar 13, 2019
e68e8b5
Ping the build
guyer Mar 14, 2019
d02adaa
Fix gmsh version <4.0
guyer Mar 14, 2019
7a7436d
Fix syntax for version specifier
guyer Mar 14, 2019
e29eb10
Ping the build
guyer Mar 15, 2019
68a8490
Revert conda environment to the last one that mostly worked on Windows
guyer Mar 20, 2019
e015731
Hide AppVeyor configuration
guyer Mar 20, 2019
bffeb9b
Remove x86 pysparse configuration
guyer Mar 20, 2019
2e8c2eb
Add gmsh to Py3k runs on Windows
guyer Mar 20, 2019
fa51566
Remove pysparse from python2.7-x86 builds on Windows
guyer Mar 20, 2019
d0a236e
Try to make conditionals work in stupid batch syntax
guyer Mar 20, 2019
c49c568
Remove gmsh from x86 builds
guyer Mar 20, 2019
cfc8191
Ping the build
guyer Mar 20, 2019
04eb3a9
Ping the build
guyer Mar 20, 2019
d9112e7
Fix YAML syntax
guyer Mar 20, 2019
220cd9f
Change conda installs to more acurately reflect dependencies
guyer Mar 20, 2019
70c2d4e
Force older version of gmsh
guyer Mar 20, 2019
0b11a65
Remove Gmsh install on Python 2.7
guyer Mar 20, 2019
b010d09
Ping the build
guyer Mar 20, 2019
bf98582
Ping the build
guyer Mar 20, 2019
1327db8
Add diagnostic to find libGLU
guyer Mar 21, 2019
f0c501a
Change apt package for libGLU
guyer Mar 21, 2019
718cd97
Fix typo
guyer Mar 21, 2019
ed55ff1
Add Py3k to workflow
guyer Mar 21, 2019
06dfc5d
Fix typos
guyer Mar 21, 2019
f26e20c
Add 2to3 conversion to Py3k runs
guyer Mar 21, 2019
8286404
Remove libGLU for diagnostics
guyer Mar 21, 2019
0e7e179
Move 2to3 until after checkout
guyer Mar 21, 2019
67891ff
Remove clobbering checkout
guyer Mar 21, 2019
12d5b2e
Restore libGL installation, differentiated for python 2 or 3
guyer Mar 21, 2019
cad4229
Update apt package lists
guyer Mar 21, 2019
c16b409
Add libXrender
guyer Mar 21, 2019
55892d1
Add libGLU, too
guyer Mar 21, 2019
938eb11
Switch travis builds to osx
guyer Mar 21, 2019
e6f45a0
Add diagnostic
guyer Mar 21, 2019
6c1da74
Fix bash comparisons
guyer Mar 21, 2019
212d9d0
Fix(?) string expansion
guyer Mar 21, 2019
81424c6
Specify Miniconda2-latest
guyer Mar 21, 2019
aa79eac
Restrict Open MP threads to one
guyer Mar 22, 2019
ad5fc39
Switch to conda-forge/fipy
guyer Apr 3, 2019
50141ad
Fall back to explicit packages for x86
guyer Apr 3, 2019
657a651
Remove `fipy` package so checkout will be tested
guyer Apr 3, 2019
14f4c32
Switch back to `source activate`
guyer Apr 3, 2019
b92b860
Update installation instructions
guyer Apr 4, 2019
9b7e884
Update badges
guyer Apr 4, 2019
c87d230
Fix badge
guyer Apr 4, 2019
a2d466f
Consolidate CI discussion
guyer Apr 4, 2019
5df4375
Export conda environment at (successful) end of tests
guyer Apr 4, 2019
dd0f7e1
Merge branch 'develop' into updateci
guyer Apr 4, 2019
815b346
Fix typo
guyer Apr 4, 2019
d2f81ac
Activate environment
guyer Apr 4, 2019
3bf4be9
Export by `--prefix`
guyer Apr 4, 2019
edb777c
Add explicit python version to install
guyer Apr 4, 2019
1d8c297
Add explicit recipe for development environment
guyer Apr 4, 2019
3c1d3cc
Re-add inline tests
guyer Apr 4, 2019
cc843ec
Fix `environment` syntax
guyer Apr 4, 2019
c29a19c
Fix typo
guyer Apr 4, 2019
77daa9a
Make travis wait during first inline build
guyer Apr 4, 2019
eaa153a
Separate things that aren't test
guyer Apr 4, 2019
28e92f3
Make travis wait for first inline build
guyer Apr 4, 2019
0fc714e
Extend travis_wait to 40 min
guyer Apr 5, 2019
0374689
Use pip to update weave
guyer Apr 5, 2019
277d8cb
Fix typo
guyer Apr 5, 2019
d5dae9f
Revert "Use pip to update weave"
guyer Apr 5, 2019
0df8a01
Disable inline tests
guyer Apr 5, 2019
85088bb
Disable `test-27-inline` *workflow*, not *job*
guyer Apr 5, 2019
323f5f5
Add standard deviation method to `Variable` and `MeshVariable`
guyer Apr 6, 2019
24ccf18
Add (mostly ignored) arguments from `numpy.std()`
guyer Apr 7, 2019
2d27ee9
Change tests to global standard deviation
guyer Apr 7, 2019
081dab0
Disable x86 runs
guyer Apr 7, 2019
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
41 changes: 23 additions & 18 deletions appveyor.yml → .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,31 @@
environment:

matrix:
- TARGET_ARCH: x86
CONDA_PY: 27
CONDA_INSTALL_LOCN: C:\\Miniconda
FIPY_SOLVERS: pysparse

- TARGET_ARCH: x64
CONDA_PY: 27
CONDA_INSTALL_LOCN: C:\\Miniconda-x64
FIPY_SOLVERS: pysparse

- TARGET_ARCH: x86
CONDA_PY: 27
CONDA_INSTALL_LOCN: C:\\Miniconda
FIPY_SOLVERS: scipy
# - TARGET_ARCH: x64
# CONDA_PY: 27
# CONDA_INSTALL_LOCN: C:\\Miniconda-x64
# FIPY_SOLVERS: pysparse
# FIPY_INLINE: 1

# - TARGET_ARCH: x86
# CONDA_PY: 27
# CONDA_INSTALL_LOCN: C:\\Miniconda
# FIPY_SOLVERS: scipy

- TARGET_ARCH: x64
CONDA_PY: 27
CONDA_INSTALL_LOCN: C:\\Miniconda-x64
FIPY_SOLVERS: scipy

- TARGET_ARCH: x86
CONDA_PY: 36
CONDA_INSTALL_LOCN: C:\\Miniconda36
FIPY_SOLVERS: scipy
# - TARGET_ARCH: x86
# CONDA_PY: 36
# CONDA_INSTALL_LOCN: C:\\Miniconda36
# FIPY_SOLVERS: scipy

- TARGET_ARCH: x64
CONDA_PY: 36
Expand Down Expand Up @@ -60,23 +61,27 @@ install:
- cmd: conda.exe config --set changeps1 no
- cmd: conda.exe config --remove channels defaults
- cmd: conda.exe config --add channels defaults
- cmd: conda.exe config --add channels guyer
- cmd: conda.exe config --add channels conda-forge

# Configure the VM.
- cmd: conda.exe install --quiet --name root fipy
- cmd: if "%TARGET_ARCH%" == "x64" conda.exe install --quiet --name root python fipy
- cmd: if "%TARGET_ARCH%" == "x64" conda.exe uninstall --quiet fipy

- cmd: if "%TARGET_ARCH%" == "x86" conda.exe install --quiet --name root python numpy scipy matplotlib
- cmd: if "%TARGET_ARCH%" == "x86" if "%CONDA_PY%" == "27" conda.exe install --quiet --name root mayavi weave
- cmd: if "%TARGET_ARCH%" == "x86" if "%FIPY_SOLVERS%" == "pysparse" conda.exe install --quiet --name root pysparse

- cmd: if "%CONDA_PY%" == "36" 2to3 --write . 1> NUL 2>&1
- cmd: if "%CONDA_PY%" == "36" 2to3 --write --doctests_only . 1> NUL 2>&1

- cmd: python setup.py install

- cmd: pip install scikit-fmm

# Skip .NET project specific build phase.
build: off

test_script:
- python setup.py test --%FIPY_SOLVERS%
- if !%FIPY_INLINE%==! python setup.py test 1> NUL 2>&1
- python setup.py test
- conda env export
# deploy_script:
# - cmd: upload_or_check_non_existence .\recipe guyer --channel=main
Loading