remove old pyDataverse methods (now supported natively)

Author: gaelforget

src/downloads.jl

@@ -7,11 +7,6 @@ using Tar, CodecZlib, ZipFile
 
 ##
 
-OCCA_file_list()=file_list(:OCCA_clim)
-ECCO_file_list()=file_list(:ECCO_clim)
-
-##
-
 """
     file_download(DOI::String,nam::String,pth=tempdir())
 

src/pyDataverse.jl

@@ -1,36 +1,8 @@
 module pyDataverse
 
 using DataFrames
-import Dataverse.restDataverse: files_to_DataFrame
 import Dataverse: pyDataverse_APIs
 
-"""
-    APIs(;do_install=true,base_url = "https://dataverse.harvard.edu/")
-
-```
-(DataAccessApi,NativeApi)=pyDataverse.APIs()
-```
-"""
-function APIs(;do_install=true,base_url = "https://dataverse.harvard.edu/")
-    error("pyDataverse_APIs is now available via the PyCall extension.")
-end
-
-"""
-    demo(option::String)
-
-- call `demo_download` if `option=="download"`
-- call `demo_metadata` if `option=="metadata"`
-"""
-function demo(option="download")
-    if option=="download"
-        demo_download()
-    elseif option=="metadata"
-        demo_metadata()
-    else
-        println("unknown option")
-    end
-end
-
 """
     demo_download(;path=tempdir(),DOI = "doi:10.7910/DVN/KBHLOD")
 
@@ -57,72 +29,4 @@ function demo_download(;path=tempdir(),DOI = "doi:10.7910/DVN/KBHLOD")
     filenames
 end
 
-#Deprecated : see `dataset_file_list`+`files_to_DataFrame` instead
-function tree_children_to_DataFrame(files)	
-	nf=length(files)
-	filename=[files[ff]["filename"] for ff in 1:nf]
-	pid=[files[ff]["pid"] for ff in 1:nf]
-	datafile_id=[files[ff]["datafile_id"] for ff in 1:nf]
-	DataFrame(filename=filename,pid=pid,datafile_id=datafile_id)
-end   
-
-"""
-    demo_metadata()
-
-```
-pyDataverse.demo_metadata()
-```
-"""
-function demo_metadata()
-    df1=dataset_file_list(:OCCA_clim)
-	df2=dataverse_file_list(:ECCOv4r2)
-    df1,df2
-end
-
-##
-
-"""
-    dataset_file_list(nam::Symbol=:OCCA_clim)
-
-Lookup DOI from list of demo data sets.
-
-```
-dataset_file_list(:OCCA_clim)
-```
-"""
-function dataset_file_list(nam::Symbol)
-    (DataAccessApi,NativeApi)=pyDataverse_APIs()
-    DOI=(OCCA_clim="doi:10.7910/DVN/RNXA2A",ECCO_clim="doi:10.7910/DVN/3HPRZI")
-    dataset_file_list(DOI[nam])
-end
-
-"""
-    dataset_file_list(DOI::String="doi:10.7910/DVN/ODM2IQ")
-
-Use `NativeApi.get_dataset` to derive the list of files (name, etc) via `files_to_DataFrame`.
-
-```
-dataset_file_list("doi:10.7910/DVN/ODM2IQ")
-```
-"""
-function dataset_file_list(DOI::String)
-    (DataAccessApi,NativeApi)=pyDataverse_APIs()
-    dataset = NativeApi.get_dataset(DOI)
-    dataset_files = dataset.json()["data"]["latestVersion"]["files"]
-    files_to_DataFrame(dataset_files)
-end
-
-"""
-    dataverse_file_list(nam::Symbol=:ECCOv4r2)
-
-- Use `NativeApi.get_children` to get the tree of datasets
-- Loop through and return vector of `dataset_file_list` output
-"""
-function dataverse_file_list(nam::Symbol=:ECCOv4r2)
-    (DataAccessApi,NativeApi)=pyDataverse_APIs()
-    tree = NativeApi.get_children(string(nam), children_types= ["datasets", "datafiles"])
-    #[tree_children_to_DataFrame(leaf["children"]) for leaf in tree]
-    [dataset_file_list(leaf["pid"]) for leaf in tree]
-end
-
 end

test/runtests.jl

@@ -8,12 +8,8 @@ if do_py_test>0
 end
 
 if do_py_test>1
-    tmp=pyDataverse.demo("download")
+    tmp=pyDataverse.demo_download()
     @test isfile(tmp[1])
-
-    df1,df2=pyDataverse.demo("metadata")
-    @test size(df1,1)==56
-    @test size(df2,1)==11
 end
 
 @testset "Dataverse.jl" begin
@@ -23,7 +19,7 @@ end
     j=json_ld.get("10.7910/DVN/CAGYQL")
     @test j["@type"]=="sc:Dataset"
 
-    lst=Dataverse.downloads.OCCA_file_list()
+    lst=Dataverse.file_list(:OCCA_clim)
     pth=joinpath(tempdir(),string(UUIDs.uuid4()))
     mkdir(pth)