DataFrames.transform conflicts with Geometry.transform (#222)

* DataFrames.transform conflicts with Geometry.transform Fixes #221 * DataFrames.transform conflicts with Geometry.transform Fixes #221
microsoft · Jul 5, 2021 · bdd7a10 · bdd7a10
1 parent 4e32790
commit bdd7a10
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/src/Examples/Examples.jl b/src/Examples/Examples.jl
@@ -11,7 +11,7 @@ using ..OpticSim.Emitters
 using ..OpticSim.GlassCat
 
 using StaticArrays
-using DataFrames
+using DataFrames: DataFrame
 using Images
 using Unitful
 using Plots

diff --git a/src/Optical/Emitters/Spectrum.jl b/src/Optical/Emitters/Spectrum.jl
@@ -7,7 +7,7 @@ export Uniform, DeltaFunction, Measured
 
 using ....OpticSim
 using ...Emitters
-using DataFrames
+using DataFrames: DataFrame
 using Distributions
 import Unitful: Length, ustrip
 using Unitful.DefaultSymbols

diff --git a/src/Optical/OpticalSystem.jl b/src/Optical/OpticalSystem.jl
@@ -2,7 +2,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # See LICENSE in the project root for full license information.
 
-using DataFrames
+using DataFrames: nrow
 using Unitful.DefaultSymbols
 using .OpticSim.GlassCat: AbstractGlass, TEMP_REF, PRESSURE_REF, Glass, Air
 

diff --git a/test/Diagnostics/Diagnostics.jl b/test/Diagnostics/Diagnostics.jl
@@ -129,7 +129,7 @@ end
 
 using FiniteDifferences
 using ForwardDiff
-using DataFrames
+using DataFrames: DataFrame
 using Optim
 using JuMP
 using Ipopt

diff --git a/test/TestData/TestData.jl b/test/TestData/TestData.jl
@@ -12,7 +12,7 @@ using OpticSim: tobeziersegments # try to use only exported functions so this li
 using OpticSim.Geometry
 using OpticSim.Emitters
 using StaticArrays
-using DataFrames
+using DataFrames: DataFrame
 using Unitful
 using Images
 using Base: @.

diff --git a/test/testsets/GlassCat.jl b/test/testsets/GlassCat.jl
@@ -6,7 +6,7 @@ using Test
 using OpticSim.GlassCat
 
 using Base.Filesystem
-using DataFrames
+using DataFrames: DataFrame
 using StaticArrays
 using Unitful
 using Unitful.DefaultSymbols