From 2776dd32649698d9dc6176f1036a617a54e0235a Mon Sep 17 00:00:00 2001 From: Seth Axen Date: Tue, 26 Sep 2023 11:12:04 +0200 Subject: [PATCH 1/4] Remove deprecated InferenceObjectsNetCDF package --- lib/InferenceObjectsNetCDF/LICENSE | 21 ------------------- lib/InferenceObjectsNetCDF/Project.toml | 17 --------------- .../src/InferenceObjectsNetCDF.jl | 12 ----------- 3 files changed, 50 deletions(-) delete mode 100644 lib/InferenceObjectsNetCDF/LICENSE delete mode 100644 lib/InferenceObjectsNetCDF/Project.toml delete mode 100644 lib/InferenceObjectsNetCDF/src/InferenceObjectsNetCDF.jl diff --git a/lib/InferenceObjectsNetCDF/LICENSE b/lib/InferenceObjectsNetCDF/LICENSE deleted file mode 100644 index 92cac767..00000000 --- a/lib/InferenceObjectsNetCDF/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2022 Seth Axen and contributors - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/lib/InferenceObjectsNetCDF/Project.toml b/lib/InferenceObjectsNetCDF/Project.toml deleted file mode 100644 index ce31ac2f..00000000 --- a/lib/InferenceObjectsNetCDF/Project.toml +++ /dev/null @@ -1,17 +0,0 @@ -name = "InferenceObjectsNetCDF" -uuid = "7cb6d088-77df-42c3-8f05-5ca8d42599d1" -authors = ["Seth Axen "] -version = "0.4.0" - -[deps] -DimensionalData = "0703355e-b756-11e9-17c0-8b28908087d0" -InferenceObjects = "b5cf5a8d-e756-4ee3-b014-01d49d192c00" -NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab" -Reexport = "189a3867-3050-52da-a836-e630ba90ab69" - -[compat] -DimensionalData = "0.23.1, 0.24" -InferenceObjects = "0.3.10" -NCDatasets = "0.12" -Reexport = "1" -julia = "1.6" diff --git a/lib/InferenceObjectsNetCDF/src/InferenceObjectsNetCDF.jl b/lib/InferenceObjectsNetCDF/src/InferenceObjectsNetCDF.jl deleted file mode 100644 index 3d8c2aa5..00000000 --- a/lib/InferenceObjectsNetCDF/src/InferenceObjectsNetCDF.jl +++ /dev/null @@ -1,12 +0,0 @@ -module InferenceObjectsNetCDF - -using DimensionalData: DimensionalData, Dimensions, LookupArrays -using NCDatasets: NCDatasets -using Reexport: @reexport -@reexport using InferenceObjects - -function __init__() - @warn "InferenceObjectsNetCDF is discontinued. For the same functionality, use `from_netcdf` and `to_netcdf` in InferenceObjects." -end - -end # module From 6fd59200da56f263295818d7f46f653343cb8b7d Mon Sep 17 00:00:00 2001 From: Seth Axen Date: Tue, 26 Sep 2023 11:13:01 +0200 Subject: [PATCH 2/4] Remove deleted subdirs from compathelper check --- .github/workflows/CompatHelper.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml index d7bfc0a1..ac79dadd 100644 --- a/.github/workflows/CompatHelper.yml +++ b/.github/workflows/CompatHelper.yml @@ -14,8 +14,7 @@ jobs: shell: julia {0} run: | using CompatHelper - subdirs = [""; readdir("lib/"; join=true)] - CompatHelper.main(; subdirs) + CompatHelper.main() env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }} From d41479fcbd3dd8a5c0360d66def6505ba4b8e96e Mon Sep 17 00:00:00 2001 From: Seth Axen Date: Tue, 26 Sep 2023 11:41:00 +0200 Subject: [PATCH 3/4] Remove lib dep installation for docs --- .github/workflows/CI.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f90036a6..f81dfea8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -59,16 +59,6 @@ jobs: with: version: '1' - uses: julia-actions/julia-buildpkg@v1 - - name: Install dependencies - run: | - using Pkg - pkg_specs = [PackageSpec(path=pwd())] - for subpath in readdir("lib"; join=true) - push!(pkg_specs, PackageSpec(path=subpath)) - end - Pkg.develop(pkg_specs) - Pkg.instantiate() - shell: julia --project=docs {0} - uses: julia-actions/julia-docdeploy@v1 with: install-package: false From 6f0e947ae4759e8f00b9fd8ca3466dfae1b8c8fa Mon Sep 17 00:00:00 2001 From: Seth Axen Date: Tue, 26 Sep 2023 13:21:46 +0200 Subject: [PATCH 4/4] Allow docdeploy to install package --- .github/workflows/CI.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f81dfea8..e0711f12 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -60,7 +60,5 @@ jobs: version: '1' - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-docdeploy@v1 - with: - install-package: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}