fix workflows, demo deps

JuliaSmoothOptimizers · Jun 11, 2024 · 1c159ff · 1c159ff
1 parent e0f214d
commit 1c159ff
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 22 deletions.
diff --git a/.github/workflows/Documentation.yml b/.github/workflows/Documentation.yml
@@ -14,14 +14,6 @@ jobs:
       - uses: julia-actions/setup-julia@latest
         with:
           version: '1'
-      - name: Installing non-registered dependencies
-        run: |
-          using Pkg
-          pkg1 = PackageSpec(url = "https://github.com/JuliaSmoothOptimizers/RegularizedProblems.jl.git")
-          pkg2 = PackageSpec(url = "https://github.com/JuliaSmoothOptimizers/ShiftedProximalOperators.jl.git")
-          pkg_list = [pkg1, pkg2]
-          Pkg.add(pkg_list)
-        shell: julia --project=docs --color=yes {0}
       - name: Install dependencies
         run: julia --project=docs -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
       - name: Build and deploy

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,13 +38,6 @@ jobs:
             ${{ runner.os }}-test-${{ env.cache-name }}-
             ${{ runner.os }}-test-
             ${{ runner.os }}-
-      - name: Installing non-registered dependencies
-        run: |
-          using Pkg
-          pkg = PackageSpec(url = "https://github.com/JuliaSmoothOptimizers/ShiftedProximalOperators.jl.git", rev = "master")
-          pkg_list = [pkg]
-          Pkg.add(pkg_list)
-        shell: julia --project="@." --color=yes {0}
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1

diff --git a/.github/workflows/demos.yml b/.github/workflows/demos.yml
@@ -50,13 +50,9 @@ jobs:
             epstopdf-pkg
       # - name: Setup tmate session
       #   uses: mxschmitt/action-tmate@v3
-      - name: Installing non-registered dependencies
+      - name: Develop package
         run: |
           using Pkg
-          pkg1 = PackageSpec(url = "https://github.com/JuliaSmoothOptimizers/RegularizedProblems.jl.git", rev = "main")
-          pkg2 = PackageSpec(url = "https://github.com/JuliaSmoothOptimizers/ShiftedProximalOperators.jl.git", rev = "master")
-          pkg_list = [pkg1, pkg2]
-          Pkg.add(pkg_list)
           Pkg.develop(path = ".")
           Pkg.instantiate()
         shell: julia --project="examples" --color=yes {0}

diff --git a/examples/Project.toml b/examples/Project.toml
@@ -7,14 +7,15 @@ PGFPlots = "3b7a836e-365b-5785-a47d-02c71176b4aa"
 ProximalOperators = "a725b495-10eb-56fe-b38b-717eba820537"
 RegularizedOptimization = "196f2941-2d58-45ba-9f13-43a2532b2fa8"
 RegularizedProblems = "ea076b23-609f-44d2-bb12-a4ae45328278"
+ShiftedProximalOperators = "d4fd37fa-580c-4e43-9b30-361c21aae263"
 
 [compat]
 ADNLPModels = "0.7"
 DifferentialEquations = "7"
-NLPModels = "0.19, 0.20"
+NLPModels = "0.19, 0.20, 0.21"
 NLPModelsModifiers = "0.7"
 PGFPlots = "^3.4"
 ProximalOperators = "0.15"
 RegularizedOptimization = "0.1"
 RegularizedProblems = "0.1"
-
+ShiftedProximalOperators = "0.2"