Merge pull request #740 from JuliaRobotics/21Q1/maint/prep12

rm depr warn

Author: dehann

.travis.yml

@@ -2,20 +2,20 @@ language: julia
 sudo: required
 
 os:
-    - linux
+  - linux
 
 arch:
-    - amd64
+  - amd64
 
 services:
-    - neo4j
+  - neo4j
 
 julia:
-    - 1.5
-    - nightly
+  - 1.5
+  - nightly
 
 env:
-    - IIF_TEST=false
+  - IIF_TEST=false
 
 branches:
   only:
@@ -29,9 +29,10 @@ jobs:
     - julia: 1.4
       env:
         - IIF_TEST=true
+        - DO_CGDFG_TESTS=true
       if: NOT branch =~ /(^v\d+\.\d+(\.\d+)?([-+]\S*)?$)|(^release.*$)/
     - arch: arm64
-      env: SKIP_CGDFG_TESTS=true
+      env: DO_CGDFG_TESTS=false
       before_script:
     - stage: "Documentation"
       julia: 1.4

src/Deprecated.jl

@@ -135,8 +135,9 @@ end
 ## Deprecated in v0.11 Remove in the v0.12 cycle
 ##==============================================================================
 
-export AbstractRelativeFactor, AbstractRelativeFactorMinimize
-
+# @warn("BREAKING CHANGE coming to DistributedFactorGraphs v0.12: deprecating AbstractRelativeFactor, use AbstractRelativeRoots instead")
+# @warn("BREAKING CHANGE coming to DistributedFactorGraphs v0.12: deprecating AbstractRelativeFactorMinimize, use AbstractRelativeMinimize instead")
+# export AbstractRelativeFactor, AbstractRelativeFactorMinimize
 const AbstractRelativeFactor = AbstractRelativeRoots
 const AbstractRelativeFactorMinimize = AbstractRelativeMinimize
 

src/DistributedFactorGraphs.jl

@@ -315,9 +315,6 @@ if get(ENV, "DFG_USE_CGDFG", "") == "true"
 end
 
 function __init__()
-    @warn("BREAKING CHANGE coming to DistributedFactorGraphs v0.12: deprecating AbstractRelativeFactor, use AbstractRelativeRoots instead")
-    @warn("BREAKING CHANGE coming to DistributedFactorGraphs v0.12: deprecating AbstractRelativeFactorMinimize, use AbstractRelativeMinimize instead")
-
     @require GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231" begin
         @info "DistributedFactorGraphs.jl is adding tools using GraphPlot.jl"
         include("DFGPlots/DFGPlots.jl")

test/runtests.jl

@@ -32,7 +32,7 @@ end
 end
 
 
-if get(ENV, "SKIP_CGDFG_TESTS", "") != "true"
+if get(ENV, "DO_CGDFG_TESTS", "") == "true"
     apis = [
         LightDFG,
         CloudGraphsDFG,
@@ -87,7 +87,7 @@ if get(ENV, "IIF_TEST", "") == "true"
 
     apis = Vector{AbstractDFG}()
     push!(apis, LightDFG(solverParams=SolverParams(), userId="testUserId"))
-    get(ENV, "SKIP_CGDFG_TESTS", "false") != "true" && push!(apis, CloudGraphsDFG(solverParams=SolverParams(), userId="testUserId")) 
+    get(ENV, "DO_CGDFG_TESTS", "false") == "true" && push!(apis, CloudGraphsDFG(solverParams=SolverParams(), userId="testUserId")) 
 
     for api in apis
         @testset "Testing Driver: $(typeof(api))" begin