From 1d8b20aa28c668b9b15d38b689d8a3539917dccb Mon Sep 17 00:00:00 2001 From: Dylan Asmar Date: Mon, 18 Dec 2023 11:26:23 -0700 Subject: [PATCH 1/5] added .vscode and Manifest.toml --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 606a907..60f3ac1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ *.jl.mem docs/build docs/site +.vscode +Manifest.toml From 7b70ce11b7be06c85b30948d7f8d281dc3b77c71 Mon Sep 17 00:00:00 2001 From: Dylan Asmar Date: Mon, 18 Dec 2023 11:26:32 -0700 Subject: [PATCH 2/5] file cleanup --- .travis.yml | 17 ----------------- REQUIRE | 5 ----- appveyor.yml | 34 ---------------------------------- 3 files changed, 56 deletions(-) delete mode 100644 .travis.yml delete mode 100644 REQUIRE delete mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 8938e8e..0000000 --- a/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Documentation: http://docs.travis-ci.com/user/languages/julia/ -language: julia -os: - - linux -julia: - - 1 -notifications: - email: false - -script: - - git clone https://github.com/JuliaRegistries/General $(julia -e 'import Pkg; println(joinpath(Pkg.depots1(), "registries", "General"))') - - git clone https://github.com/JuliaPOMDP/Registry $(julia -e 'import Pkg; println(joinpath(Pkg.depots1(), "registries", "JuliaPOMDP"))') - - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi - - julia --project --color=yes --check-bounds=yes -e 'import Pkg; Pkg.build(); Pkg.test("MCVI"; coverage=true)' - -after_success: - - julia --project --color=yes -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())' - diff --git a/REQUIRE b/REQUIRE deleted file mode 100644 index 0684753..0000000 --- a/REQUIRE +++ /dev/null @@ -1,5 +0,0 @@ -julia 0.7 -POMDPs -ParticleFilters -JSON -JLD diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 3a735b4..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,34 +0,0 @@ -environment: - matrix: - - JULIAVERSION: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe" - - JULIAVERSION: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe" - - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe" - - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe" - -branches: - only: - - master - - /release-.*/ - -notifications: - - provider: Email - on_build_success: false - on_build_failure: false - on_build_status_changed: false - -install: -# Download most recent Julia Windows binary - - ps: (new-object net.webclient).DownloadFile( - $env:JULIAVERSION, - "C:\projects\julia-binary.exe") -# Run installer silently, output to C:\projects\julia - - C:\projects\julia-binary.exe /S /D=C:\projects\julia - -build_script: -# Need to convert from shallow to complete for Pkg.clone to work - - IF EXIST .git\shallow (git fetch --unshallow) - - C:\projects\julia\bin\julia -e "versioninfo(); - Pkg.clone(pwd(), \"MCVI\"); Pkg.build(\"MCVI\")" - -test_script: - - C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"MCVI\")" From 61d8d13347451891f1bde1c955496ab147b1ce32 Mon Sep 17 00:00:00 2001 From: Dylan Asmar Date: Mon, 18 Dec 2023 11:53:03 -0700 Subject: [PATCH 3/5] pomdptools upgrade --- Project.toml | 5 ++--- test/runtests.jl | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Project.toml b/Project.toml index 98a8b1b..aaa44c3 100644 --- a/Project.toml +++ b/Project.toml @@ -22,10 +22,9 @@ julia = "1" POMDPLinter = "0.1" [extras] -POMDPModelTools = "08074719-1b2a-587c-a292-00f91cc44415" +POMDPTools = "7588e00f-9cae-40de-98dc-e0c70c48cdd7" POMDPModels = "355abbd5-f08e-5560-ac9e-8b5f2592a0ca" -POMDPSimulators = "e0d0a172-29c6-5d4e-96d0-f262df5d01fd" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["POMDPModels", "POMDPModelTools", "POMDPSimulators", "Test"] +test = ["POMDPModels", "POMDPTools", "Test"] diff --git a/test/runtests.jl b/test/runtests.jl index 2b97800..2d88bac 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -3,8 +3,7 @@ using Test import MCVI: init_lower_action, lower_bound, upper_bound using POMDPs using Random -using POMDPModelTools -using POMDPSimulators +using POMDPTools using POMDPModels # for LightDark1d using POMDPLinter: @requirements_info, @show_requirements From faa116afd85001899f6cdcd895030bf33a5e9fb5 Mon Sep 17 00:00:00 2001 From: Dylan Asmar Date: Mon, 18 Dec 2023 11:53:29 -0700 Subject: [PATCH 4/5] ci update and badge change --- .github/workflows/CI.yml | 35 +++++++++++++++++++++++++++-------- README.md | 4 ++-- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index af98974..1189c97 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,16 +1,35 @@ name: CI - -on: [push, pull_request] - +on: + push: + branches: + - master + tags: '*' + pull_request: jobs: test: - runs-on: ubuntu-latest - + name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + version: + - "1" + os: + - ubuntu-latest + - macOS-latest + - windows-latest + arch: + - x64 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 with: - version: '1' - arch: x64 + version: ${{ matrix.version }} + arch: ${{ matrix.arch }} + - uses: julia-actions/cache@v1 - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 + - uses: julia-actions/julia-processcoverage@v1 + - uses: codecov/codecov-action@v3 + with: + files: lcov.info \ No newline at end of file diff --git a/README.md b/README.md index ce3bcbb..d677a8e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # MCVI -[![Build Status](https://travis-ci.org/JuliaPOMDP/MCVI.jl.svg?branch=master)](https://travis-ci.org/JuliaPOMDP/MCVI.jl) -[![Coverage Status](https://coveralls.io/repos/github/JuliaPOMDP/MCVI.jl/badge.svg?branch=master)](https://coveralls.io/github/JuliaPOMDP/MCVI.jl?branch=master) +[![CI](https://github.com/JuliaPOMDP/MCVI.jl/actions/workflows/CI.yml/badge.svg)](https://github.com/JuliaPOMDP/MCVI.jl/actions/workflows/CI.yml) +[![codecov.io](http://codecov.io/github/JuliaPOMDP/MCVI.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaPOMDP/MCVI.jl?branch=master) The Monte Carlo Value Iteration (MCVI) offline solver for `POMDPs.jl`. From daa9fbd3d4479b22a28739b5c98fd93c23c00530 Mon Sep 17 00:00:00 2001 From: Dylan Asmar Date: Mon, 18 Dec 2023 11:53:50 -0700 Subject: [PATCH 5/5] version bump --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index aaa44c3..dc6b318 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "MCVI" uuid = "30d33687-f7ed-5b0d-8b26-3dc9b7abd572" repo = "https://github.com/JuliaPOMDP/MCVI.jl" -version = "0.3.2" +version = "0.3.3" [deps] Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"