Skip to content

Commit

Permalink
Merge pull request #23 from oyamad/julia1.0
Browse files Browse the repository at this point in the history
Updates for Julia >= 1.0
  • Loading branch information
oyamad committed Apr 27, 2020
2 parents fc450d5 + 9aba5a6 commit ba8a37e
Show file tree
Hide file tree
Showing 9 changed files with 192 additions and 72 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,6 +2,7 @@
*.jl.*.cov
*.jl.mem
deps/deps.jl
Manifest.toml

#Ipython Notebook
.ipynb_checkpoints
Expand Down
20 changes: 13 additions & 7 deletions .travis.yml
@@ -1,15 +1,21 @@
language: julia
sudo: false
julia:
- 0.7
- 1.0
matrix:
allow_failures:
- julia: 1.0
- 1.4
notifications:
email: false
#script: # use the default script setting which is equivalent to the following
after_success:
- julia -e 'Pkg.add("Documenter")'
- julia -e 'cd(Pkg.dir("MatchingMarkets")); ENV["DOCUMENTER_DEBUG"] = "true"; include(joinpath("docs", "make.jl"))'
- julia -e 'cd(Pkg.dir("MatchingMarkets")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'
- julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'

jobs:
include:
- stage: Documentation
julia: 1.0
script: julia --project=docs -e '
using Pkg;
Pkg.develop(PackageSpec(path=pwd()));
Pkg.instantiate();
include("docs/make.jl");'
after_success: skip
14 changes: 14 additions & 0 deletions Project.toml
@@ -0,0 +1,14 @@
name = "MatchingMarkets"
uuid = "e68f4404-efa2-50fc-b2c2-4576a91ecd1b"

[deps]
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[compat]
julia = "≥ 1.0.0"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
1 change: 0 additions & 1 deletion REQUIRE

This file was deleted.

2 changes: 2 additions & 0 deletions docs/Project.toml
@@ -0,0 +1,2 @@
[deps]
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
24 changes: 10 additions & 14 deletions docs/make.jl
@@ -1,23 +1,19 @@
using Documenter, MatchingMarkets

makedocs(
modules = [MatchingMarkets],
format = :html,
sitename = "MatchingMarkets.jl",
pages = Any[
makedocs(;
modules=[MatchingMarkets],
format=Documenter.HTML(),
pages=[
"Home" => "index.md",
"Library" => Any[
"Library" => [
"lib/public.md",
"lib/internals.md",
],
]
],
repo="https://github.com/oyamad/MatchingMarkets.jl/blob/{commit}{path}#L{line}",
sitename="MatchingMarkets.jl",
)

deploydocs(
repo = "github.com/oyamad/MatchingMarkets.jl.git",
branch = "gh-pages",
target = "build",
julia = "0.6",
deps = nothing,
make = nothing,
deploydocs(;
repo="github.com/oyamad/MatchingMarkets.jl",
)
5 changes: 3 additions & 2 deletions docs/src/index.md
Expand Up @@ -11,10 +11,11 @@ end

## Installation

This is an unregistered package. To install, open a `Julia` session and type
This is an unregistered package.
To install, enter Pkg mode by pressing `]` and run

```julia
Pkg.clone("https://github.com/oyamad/MatchingMarkets.jl")
add https://github.com/oyamad/MatchingMarkets.jl
```

## Usage
Expand Down
14 changes: 8 additions & 6 deletions examples/examples.ipynb
Expand Up @@ -703,25 +703,27 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
"@webio": {
"lastCommId": null,
"lastKernelId": null
},
"anaconda-cloud": {},
"kernelspec": {
"display_name": "Julia 0.7.0",
"display_name": "Julia 1.4.1",
"language": "julia",
"name": "julia-0.7"
"name": "julia-1.4"
},
"language_info": {
"file_extension": ".jl",
"mimetype": "application/julia",
"name": "julia",
"version": "0.7.0"
"version": "1.4.1"
}
},
"nbformat": 4,
Expand Down

0 comments on commit ba8a37e

Please sign in to comment.