Skip to content

Commit

Permalink
Merge 916c539 into 79fc414
Browse files Browse the repository at this point in the history
  • Loading branch information
joshday authored Aug 11, 2018
2 parents 79fc414 + 916c539 commit ac13e7a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 18 deletions.
1 change: 1 addition & 0 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
julia 0.7-beta
LearnBase 0.2 0.3.0
RecipesBase
Reexport
29 changes: 18 additions & 11 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
environment:
matrix:
- julia_version: 0.7
- julia_version: latest
- julia_version: 1
- julia_version: nightly

platform:
- x86
- x64
- x86 # 32-bit
- x64 # 64-bit

## uncomment the following lines to allow failures on nightly julia
## (tests will run but not make your overall status red)
#matrix:
# allow_failures:
# - julia_version: latest
# # Uncomment the following lines to allow failures on nightly julia
# # (tests will run but not make your overall status red)
# matrix:
# allow_failures:
# - julia_version: latest

branches:
only:
Expand All @@ -25,12 +26,18 @@ notifications:
on_build_status_changed: false

install:
- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/master/bin/install.ps1'))
- ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))

build_script:
- echo "%JL_BUILD_SCRIPT%"
- julia -e "%JL_BUILD_SCRIPT%"
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"

test_script:
- echo "%JL_TEST_SCRIPT%"
- julia -e "%JL_TEST_SCRIPT%"
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

# # Uncomment to support code coverage upload. Should only be enabled for packages
# # which would have coverage gaps without running on Windows
# on_success:
# - echo "%JL_CODECOV_SCRIPT%"
# - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"
10 changes: 3 additions & 7 deletions src/PenaltyFunctions.jl
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
__precompile__(true)

module PenaltyFunctions

using LearnBase, LinearAlgebra, InteractiveUtils
import LearnBase: prox, deriv, value
eval(Expr(:toplevel, Expr(:export, setdiff(names(LearnBase), [:LearnBase])...)))

using RecipesBase
using LinearAlgebra, InteractiveUtils, Reexport, RecipesBase
@reexport using LearnBase
import LearnBase: prox, deriv, value, addgrad!

export
Penalty,
Expand Down

0 comments on commit ac13e7a

Please sign in to comment.