Skip to content

Commit

Permalink
Rename the files using python name convention
Browse files Browse the repository at this point in the history
Convert - to _ in both the file names and script name
Update the test files
  • Loading branch information
henrykironde committed Feb 21, 2017
1 parent 22bad96 commit 394701e
Show file tree
Hide file tree
Showing 49 changed files with 97 additions and 97 deletions.
2 changes: 1 addition & 1 deletion scripts/abalone-age.json → scripts/abalone_age.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@
"urls": {
"data": "http://archive.ics.uci.edu/ml/machine-learning-databases/abalone/abalone.data"
},
"version": "1.2.0"
"version": "1.2.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,5 @@
"urls": {
"main": "http://esapubs.org/archive/ecol/E096/269/Data_Files/Amniote_Database_Aug_2015.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
"urls": {
"species": "http://esapubs.org/archive/ecol/E094/243/Antarctic_Site_Inventory_census_data_1994_2012.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def __init__(self, **kwargs):
self.citation = "Falster, D.S., Duursma, R.A., Ishihara, M.I., Barneche, D.R., FitzJohn, R.G., Varhammar, A., Aiba, M., Ando, M., Anten, N., Aspinwall, M.J. and Baltzer, J.L., 2015. BAAD: a Biomass And Allometry Database for woody plants."
self.tags = ['plants', 'observational']
self.retriever_minimum_version = "2.0.dev"
self.version = "1.2.0"
self.version = "1.2.1"
self.description = "The data set is a Biomass and allometry database (BAAD) for woody plants containing 259634 measurements collected in 176 different studies from 21084 individuals across 678 species."

def download(self, engine=None, debug=False):
Expand Down
2 changes: 1 addition & 1 deletion scripts/bird-size.json → scripts/bird_size.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
"urls": {
"species": "http://esapubs.org/archive/ecol/E088/096/avian_ssd_jan07.txt"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -198,5 +198,5 @@
"wdbc": "http://archive.ics.uci.edu/ml/machine-learning-databases/breast-cancer-wisconsin/wdbc.data",
"wpbc": "http://archive.ics.uci.edu/ml/machine-learning-databases/breast-cancer-wisconsin/wpbc.data"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def __init__(self, **kwargs):
self.ref = "http://www.pwrc.usgs.gov/BBS/"
self.tags = ["birds", "continental-scale"]
self.retriever_minimum_version = '2.0.dev'
self.version = '1.3.0'
self.version = '1.3.1'
self.urls = {
"counts": "ftp://ftpext.usgs.gov/pub/er/md/laurel/BBS/DataFiles/States/",
"routes": "ftp://ftpext.usgs.gov/pub/er/md/laurel/BBS/DataFiles/Routes.zip",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def __init__(self, **kwargs):
self.ref = "http://www.pwrc.usgs.gov/BBS/"
self.tags = ["birds", "continental-scale"]
self.retriever_minimum_version = '2.0.dev'
self.version = '1.3.0'
self.version = '1.3.1'
self.urls = {
"counts": "ftp://ftpext.usgs.gov/pub/er/md/laurel/BBS/DataFiles/50-StopData/1997ToPresent_SurveyWide/",
"routes": "ftp://ftpext.usgs.gov/pub/er/md/laurel/BBS/DataFiles/Routes.zip",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@
"PopulationAbunMark_Recap": "http://esapubs.org/archive/ecol/E095/258/PopulationAbunMark-Recap.csv",
"PopulationAbunTransect": "http://esapubs.org/archive/ecol/E095/258/PopulationAbunTransect.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
2 changes: 1 addition & 1 deletion scripts/car-eval.json → scripts/car_eval.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
"urls": {
"data": "http://archive.ics.uci.edu/ml/machine-learning-databases/car/car.data"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@
"main": "http://files.figshare.com/2023547/Species_abundances.csv",
"sites": "http://files.figshare.com/2023504/Sites_table_abundances.csv"
},
"version": 1.0
"version": "1.0.1"
}
2 changes: 1 addition & 1 deletion scripts/elton-traits.json → scripts/elton_traits.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@
"MammCitations": "http://esapubs.org/archive/ecol/E095/178/MamFuncDatSources.txt",
"MammFuncDat": "http://esapubs.org/archive/ecol/E095/178/MamFuncDat.txt"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@
"urls": {
"host_characteristics": "http://esapubs.org/archive/ecol/E094/045/FPEDB.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
"urls": {
"biomass": "http://esapubs.org/archive/ecol/E095/177/CForBioData_v1.0.txt"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,5 @@
"urls": {
"data": "http://archive.ics.uci.edu/ml/machine-learning-databases/forest-fires/forestfires.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def __init__(self, **kwargs):
self.name = "Forest Inventory and Analysis"
self.shortname = "forest-inventory-analysis"
self.retriever_minimum_version = '2.0.dev'
self.version = '1.3.0'
self.version = '1.3.1'
self.ref = "http://fia.fs.fed.us/"
self.urls = {"main": "https://apps.fs.usda.gov/fiadb-downloads/CSV/",
'species': 'https://apps.fs.usda.gov/fiadb-downloads/CSV/REF_SPECIES.csv'}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,5 +162,5 @@
"swamp": "http://www.esapubs.org/archive/ecol/E090/251/datafiles/swamp_all_modern.txt",
"upland_plots_1989_2007": "http://www.esapubs.org/archive/ecol/E090/251/datafiles/upland_plots_89-07.txt"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -194,5 +194,5 @@
"sites": "http://esapubs.org/archive/ecol/E091/216/Site_variables.txt",
"species": "http://esapubs.org/archive/ecol/E091/216/Species_list.txt"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -260,5 +260,5 @@
"precip": "http://esapubs.org/archive/ecol/E094/084/data/Fray_Jorge_Precipitation_1989-2005.csv",
"seeds": "http://esapubs.org/archive/ecol/E094/084/data/Fray_Jorge_Seeds_1989-2002.txt"
},
"version": "1.2.0"
"version": "1.2.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def __init__(self, **kwargs):
self.name = "Alwyn H. Gentry Forest Transect Dataset"
self.shortname = "gentry-forest-transects"
self.retriever_minimum_version = '2.0.dev'
self.version = '1.3.0'
self.version = '1.3.1'
self.urls = {"stems": "http://www.mobot.org/mobot/gentry/123/all_Excel.zip",
"sites": "https://ndownloader.figshare.com/files/5515373",
"species": "",
Expand Down
2 changes: 1 addition & 1 deletion scripts/home-ranges.json → scripts/home_ranges.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
"urls": {
"home_ranges": "http://datadryad.org/bitstream/handle/10255/dryad.84768/Tamburelloetal_HomeRangeDatabase.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def __init__(self):
ref="http://www.esapubs.org/archive/ecol/E089/032/",
description="The data set provides access to data on densities and percent cover in the 60 experimental plots from 2003 to 2007 and to update data from 1996 to 2002 that are already published in Ecological Archives.It includes densities of mussels, an herbivorous limpet, herbivorous snails, a predatory snail, a barnacle , and fucoid algae and percent cover by mussels, barnacles, fucoids, and other sessile organisms.",
retriever_minimum_version='2.0.dev',
version='1.3.0',
version='1.3.1',
urls={"main": "http://www.esapubs.org/archive/ecol/E089/032/Succession_sampling_03-07_data.txt"},
tables={"main": Table("main", cleanup=Cleanup(correct_invalid_value, nulls=[-999.9]))}
)
Expand Down
2 changes: 1 addition & 1 deletion scripts/la-selva-trees.py → scripts/la_selva_trees.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def __init__(self):
description="The data set helps to examine the post-establishment ecology of 10 species of tropical wet forest trees selected to span a range of predicted life history patterns at the La Selva Biological Station in Costa Rica.",
ref="http://esapubs.org/archive/ecol/E087/132/",
retriever_minimum_version= "2.0.dev",
version='1.2.0',
version='1.2.1',
citation="David B. Clark and Deborah A. Clark. 2006. Tree growth, mortality, physical condition, and microsite in an old-growth lowland tropical rain forest. Ecology 87:2132.")

def download(self, engine=None, debug=False):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
"urls": {
"Leaf_herbivory": "http://www.esapubs.org/archive/ecol/E095/065/Leaf_herbivory.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
"species": "http://esapubs.org/archive/ecol/E092/201/data/MCDB_species.csv",
"trapping": "http://esapubs.org/archive/ecol/E092/201/data/MCDB_trapping.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
2 changes: 1 addition & 1 deletion scripts/mammal-diet.json → scripts/mammal_diet.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,5 @@
"urls": {
"diet": "http://datadryad.org/bitstream/handle/10255/dryad.64565/MammalDIET_v1.0.txt"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
"urls": {
"species": "http://esapubs.org/archive/ecol/E084/093/Mammal_lifehistories_v2.txt"
},
"version": "1.1.0"
"version": "1.1.1"
}
2 changes: 1 addition & 1 deletion scripts/mammal-masses.json → scripts/mammal_masses.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@
"urls": {
"MammalMasses": "http://www.esapubs.org/Archive/ecol/E084/094/MOMv3.3.txt"
},
"version": "1.2.0"
"version": "1.2.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
"urls": {
"MetabolicRate": "http://www.esapubs.org/archive/ecol/E091/198/data.txt"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,5 @@
"species_list": "http://esapubs.org/archive/ecol/E094/128/species_list.csv",
"species_name_changes": "http://esapubs.org/archive/ecol/E094/128/species_name_changes.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -234,5 +234,5 @@
"species": "http://esapubs.org/archive/ecol/E091/243/species_list.csv",
"taxonomy": "http://esapubs.org/archive/ecol/E091/243/taxonomic_grouping.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -162,5 +162,5 @@
"quadrat_inventory": "http://esapubs.org/archive/ecol/E088/161/quadrat_inventory.csv",
"species": "http://esapubs.org/archive/ecol/E088/161/species_list.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
"allrecords_density": "http://esapubs.org/archive/ecol/E092/143/allrecords_density.csv",
"species_list": "http://esapubs.org/archive/ecol/E092/143/species_list.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -166,5 +166,5 @@
"species_plot_year": "http://esapubs.org/archive/ecol/E091/152/MSH_SPECIES_PLOT_YEAR.csv",
"structure_plot_year": "http://esapubs.org/archive/ecol/E091/152/MSH_STRUCTURE_PLOT_YEAR.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,5 @@
"bvd_species_raw": "http://esapubs.org/archive/ecol/E095/257/bvd_species_raw_030614.csv",
"taxa_table": "http://esapubs.org/archive/ecol/E095/257/taxa_table_030614.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
2 changes: 1 addition & 1 deletion scripts/plant-comp-ok.json → scripts/plant_comp_ok.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@
"richness": "http://esapubs.org/archive/ecol/E091/124/TGPP_rich.csv",
"species": "http://esapubs.org/archive/ecol/E091/124/TGPP_specodes.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def __init__(self, **kwargs):
self.name = "A database on the life history traits of the Northwest European flora"
self.shortname = "plant-life-hist-eu"
self.retriever_minimum_version = '2.0.dev'
self.version = '1.3.0'
self.version = '1.3.1'
self.ref = "http://www.uni-oldenburg.de/en/biology/landeco/research/projects/leda/"
self.urls = {
"Age_of_first_flowering": "http://www.uni-oldenburg.de/fileadmin/user_upload/biologie/ag/landeco/download/LEDA/Data_files/age_of_first_flowering.txt",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@
"species": "http://esapubs.org/archive/ecol/E088/162/species_codes.txt",
"trees": "http://esapubs.org/archive/ecol/E088/162/Oosting_Trees_1998.txt"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@
"urls": {
"PlantTaxonomy": "http://plants.usda.gov/java/downloadData?fileName=plantlst.txt&static=true"
},
"version": "1.1.0"
"version": "1.1.1"
}
2 changes: 1 addition & 1 deletion scripts/poker-hands.json → scripts/poker_hands.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,5 @@
"testing": "http://archive.ics.uci.edu/ml/machine-learning-databases/poker/poker-hand-testing.data",
"training": "http://archive.ics.uci.edu/ml/machine-learning-databases/poker/poker-hand-training-true.data"
},
"version": "1.2.0"
"version": "1.2.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
"urls": {
"main": "http://www.esapubs.org/Archive/ecol/E089/051/Predator_and_prey_body_sizes_in_marine_food_webs_vsn3.txt"
},
"version": "1.1.0"
"version": "1.1.1"
}
2 changes: 1 addition & 1 deletion scripts/prism-climate.py → scripts/prism_climate.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def __init__(self, **kwargs):
self.name = "PRISM Climate Data"
self.shortname = "prism-climate"
self.retriever_minimum_version = '2.0.dev'
self.version = '1.1.0'
self.version = '1.1.1'
self.ref = "http://prism.oregonstate.edu/"
self.urls = {"climate": "http://services.nacse.org/prism/data/public/4km/"}
self.description = "The PRISM data set represents climate observations from a wide range of monitoring networks, applies sophisticated quality control measures, and develops spatial climate datasets to reveal short- and long-term climate patterns. "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@
"ind_loc_girth": "http://esapubs.org/archive/ecol/E092/115/UPSP_Demo_data.txt",
"sp_list": "http://esapubs.org/archive/ecol/E092/115/UPSP_Species_list2.txt"
},
"version": "1.1.0"
"version": "1.1.1"
}
2 changes: 1 addition & 1 deletion scripts/veg-plots-sdl.json → scripts/veg_plots_sdl.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,5 @@
"Species": "http://esapubs.org/archive/ecol/E094/083/Species.csv",
"Stake_info": "http://esapubs.org/archive/ecol/E094/083/Stake_info.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,5 @@
],
"retriever": "True",
"title": "Wine Composition",
"version": "1.1.0"
"version": "1.1.1"
}
2 changes: 1 addition & 1 deletion scripts/wine-quality.json → scripts/wine_quality.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,5 +134,5 @@
"red": "http://archive.ics.uci.edu/ml/machine-learning-databases/wine-quality/winequality-red.csv",
"white": "http://archive.ics.uci.edu/ml/machine-learning-databases/wine-quality/winequality-white.csv"
},
"version": "1.1.0"
"version": "1.1.1"
}
2 changes: 1 addition & 1 deletion scripts/wood-density.py → scripts/wood_density.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def __init__(self, **kwargs):
self.name = "Global wood density database - Zanne et al. 2009"
self.shortname = "wood-density"
self.retriever_minimum_version = '2.0.dev'
self.version = '1.2.0'
self.version = '1.2.1'
self.urls = {"GWDD": "http://datadryad.org/bitstream/handle/10255/dryad.235/GlobalWoodDensityDatabase.xls?sequence=1"}
self.tags = ["Taxon > Plants", "Spatial Scale > Global",
"Data Type > Observational"]
Expand Down
6 changes: 3 additions & 3 deletions test/test_regression_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
]

db_md5 = [
# ('DelMoral2010', '0'),
('bird-size', '98dcfdca19d729c90ee1c6db5221b775'),
('mammal-masses', '6fec0fc63007a4040d9bbc5cfcd9953e')
# ('mt_st_helens_veg', '0'),
('bird_size', '98dcfdca19d729c90ee1c6db5221b775'),
('mammal_masses', '6fec0fc63007a4040d9bbc5cfcd9953e')
]


Expand Down
Loading

0 comments on commit 394701e

Please sign in to comment.