Merge pull request #86 from SciML/actions

attempt to move to Github Actions

Author: ChrisRackauckas

.github/workflows/CI.yml

@@ -0,0 +1,46 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+    tags: '*'
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+          # Disabling Windows tests as it's known to not work:
+          # https://github.com/SciML/diffeqpy/pull/86#issuecomment-1011675735
+          # - windows-latest
+        architecture: [x64]
+        python-version: ['3.10']
+      fail-fast: false
+    name: Test ${{ matrix.os }} ${{ matrix.architecture }}
+      Python ${{ matrix.python-version }}
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: ${{ matrix.architecture }}
+      - name: Install tox
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install --upgrade tox
+      - name: Run test
+        run: python -m tox -- --cov=diffeqpy -s
+        env:
+          TOXENV: py
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v1
+        with:
+          file: ./coverage.xml
+          name: codecov-umbrella

.travis.yml

@@ -4,20 +4,6 @@ os:
 notifications:
   email: false
 before_install:
-  - mkdir -p ~/Downloads
-
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then curl -L https://julialang-s3.julialang.org/bin/linux/x64/1.0/julia-1.0-latest-linux-x86_64.tar.gz -o "$HOME/Downloads/julia.tar.gz"; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then tar xzf "$HOME/Downloads/julia.tar.gz" -C "$HOME/Downloads"; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then cp -r "$(find "$HOME/Downloads" -maxdepth 2 -name "julia*" -type d | head -n 1)" "$HOME/julia"; fi
-
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then curl -L https://julialang-s3.julialang.org/bin/mac/x64/1.0/julia-1.0-latest-mac64.dmg -o "$HOME/Downloads/julia.dmg"; fi
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then hdiutil attach ~/Downloads/julia.dmg; fi
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then cp -r /Volumes/Julia*/Julia*/Contents/Resources/julia $HOME/julia; fi
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then hdiutil detach -force /Volumes/Julia*; fi
-
-  - rm -rf ~/Downloads/julia*
-  - export PATH="$HOME/julia/bin:$PATH"
-
   - pip install --quiet tox
 script:
 

README.md

@@ -1,8 +1,7 @@
 # diffeqpy
 
 [![Join the chat at https://gitter.im/JuliaDiffEq/Lobby](https://badges.gitter.im/JuliaDiffEq/Lobby.svg)](https://gitter.im/JuliaDiffEq/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/SciML/diffeqpy.svg?branch=master)](https://travis-ci.org/SciML/diffeqpy)
-[![Build status](https://ci.appveyor.com/api/projects/status/4ybwcrgopv6wrno1?svg=true)](https://ci.appveyor.com/project/ChrisRackauckas/diffeqpy)
+[![CI](https://github.com/SciML/diffeqpy/workflows/CI/badge.svg)](https://github.com/SciML/diffeqpy/actions)
 
 diffeqpy is a package for solving differential equations in Python. It utilizes
 [DifferentialEquations.jl](http://diffeq.sciml.ai/dev/) for its core routines

appveyor.yml

@@ -9,10 +9,8 @@ environment:
     # https://www.appveyor.com/docs/windows-images-software/#python
 
     - PYTHONDIR: "C:\\Python27-x64"
-      JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/1.0/julia-1.0-latest-win64.exe"
       TOXENV: py
     - PYTHONDIR: "C:\\Python36-x64"
-      JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/1.0/julia-1.0-latest-win64.exe"
       TOXENV: py3-numba
 
 matrix:
@@ -28,14 +26,6 @@ notifications:
 install:
   - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
 
-# Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile(
-        $env:JULIA_URL,
-        "C:\projects\julia-binary.exe")
-# Run installer silently, output to C:\projects\julia
-  - C:\projects\julia-binary.exe /S /D=C:\projects\julia
-  - set PATH=C:\projects\julia\bin;%PATH%
-
 # Install Python packages
   - "%PYTHONDIR%\\python.exe -m pip install --quiet tox"
 

diffeqpy/__init__.py

@@ -1,11 +1,37 @@
 import os
+import shutil
 import subprocess
+import sys
+
+from jill.install import install_julia
 
 script_dir = os.path.dirname(os.path.realpath(__file__))
 
 
-def install():
+def _find_julia():
+    # TODO: this should probably fallback to query jill
+    return shutil.which("julia")
+
+
+def install(*, confirm=False):
     """
-    Install Julia packages required for diffeqpy.
+    Install Julia (if required) and Julia packages required for diffeqpy.
     """
-    subprocess.check_call(['julia', os.path.join(script_dir, 'install.jl')])
+    julia = _find_julia()
+    if not julia:
+        print("No Julia version found. Installing Julia.")
+        install_julia(confirm=confirm)
+        julia = _find_julia()
+        if not julia:
+            raise RuntimeError(
+                "Julia installed with jill but `julia` binary cannot be found in the path"
+            )
+    env = os.environ.copy()
+    env["PYTHON"] = sys.executable
+    subprocess.check_call([julia, os.path.join(script_dir, "install.jl")], env=env)
+
+
+def _ensure_installed(*kwargs):
+    if not _find_julia():
+        # TODO: this should probably ensure that packages are installed too
+        install(*kwargs)

diffeqpy/de.py

@@ -1,6 +1,12 @@
 import os
 import sys
 
+from . import _ensure_installed
+
+# This is terrifying to many people. However, it seems SciML takes pragmatic approach.
+_ensure_installed()
+
+# PyJulia have to be loaded after `_ensure_installed()`
 from julia import Main
 
 script_dir = os.path.dirname(os.path.realpath(__file__))

diffeqpy/install.jl

@@ -3,5 +3,6 @@ Pkg.add("DifferentialEquations")
 Pkg.add("OrdinaryDiffEq")
 Pkg.add("DiffEqBase")
 Pkg.add("PyCall")
+Pkg.build("PyCall")
 using DifferentialEquations
 using PyCall

diffeqpy/setup.jl

@@ -1,4 +1,11 @@
-import DiffEqBase
+@debug "Importing DiffEqBase.jl...."
+try
+    import DiffEqBase
+catch err
+    @error "Failed to import DiffEqBase.jl" exception = (err, catch_backtrace())
+    rethrow()
+end
+
 import PyCall
 
 PyCall.PyObject(::typeof(DiffEqBase.solve)) =
@@ -17,3 +24,11 @@ function DiffEqBase.numargs(f::PyCall.PyObject)
         return nargs
     end
 end
+
+@debug "Importing DifferentialEquationsjl...."
+try
+    import DifferentialEquations
+catch err
+    @error "Failed to import DifferentialEquations.jl" exception = (err, catch_backtrace())
+    rethrow()
+end

setup.py

@@ -24,6 +24,6 @@ def readme():
       author_email='contact@juliadiffeq.org',
       license='MIT',
       packages=['diffeqpy','diffeqpy.tests'],
-      install_requires=['julia>=0.2'],
+      install_requires=['julia>=0.2', 'jill'],
       include_package_data=True,
       zip_safe=False)

tox.ini

@@ -22,6 +22,8 @@ passenv =
     # directly configure PyCall.
     PYTHON
 
+    JULIA_*
+
 [testenv:py3-numba]
 deps =
     {[testenv]deps}