Updated requirements, README, and export script

README.md

@@ -49,7 +49,7 @@ There, you'll find three zip files containing Voronoms exports in three formats,
 - Separate tab-separated tables, named by country and admin level, e.g. `"GB-2.txt"`. Tables have two columns, `geoNameId` and `geoJSON`.
 - PNG plots of the boundaries for each country and admin level.
 
-The zip filenames include the version of Voronoms that created them and the download date of the GeoNames file from which they were generated: `"voronoms-{format}-{voronoms-version}-{geonames-date}.zip"`.
+The zip filenames include the version of Voronoms that created them and the download date of the GeoNames file from which they were generated: `"voronoms-{voronoms-version}-{geonames-date}-{format}.zip"`.
 
 ## Generating Voronoms
 

prepare_exports.py

@@ -21,7 +21,7 @@
 
 
 
-    zipname = f"voronoms-{fmt}-{VORONOMS_VER}-{ddate}.zip"
+    zipname = f"voronoms-{VORONOMS_VER}-{ddate}-{fmt}.zip"
     zippath = Path(EXPORT_DIR, zipname)
 
     with ZipFile(zippath, "w") as z:

requirements.txt

@@ -1,14 +1,88 @@
-tables
-jupyterlab
-ipywidgets
-turbo
-numpy
-scipy
-pandas
-matplotlib
-pysal
-geopandas
-descartes
-requests
-tqdm
-viridis
+appdirs==1.4.3
+appnope==0.1.0
+attrs==19.3.0
+backcall==0.1.0
+black==19.10b0
+bleach==3.1.0
+certifi==2019.11.28
+chardet==3.0.4
+Click==7.0
+click-plugins==1.1.1
+cligj==0.5.0
+cycler==0.10.0
+decorator==4.4.1
+defusedxml==0.6.0
+Deprecated==1.2.7
+descartes==1.1.0
+docopt==0.6.2
+entrypoints==0.3
+Fiona==1.8.13
+geopandas==0.6.2
+idna==2.8
+ipykernel==5.1.3
+ipython==7.11.1
+ipython-genutils==0.2.0
+ipywidgets==7.5.1
+jedi==0.15.2
+Jinja2==2.10.3
+joblib==0.14.1
+json5==0.8.5
+jsonschema==3.2.0
+jupyter-client==5.3.4
+jupyter-core==4.6.1
+jupyterlab==1.2.5
+jupyterlab-server==1.0.6
+kiwisolver==1.1.0
+MarkupSafe==1.1.1
+matplotlib==3.1.2
+mistune==0.8.4
+munch==2.5.0
+nbconvert==5.6.1
+nbformat==5.0.3
+notebook==6.0.3
+numexpr==2.7.1
+numpy==1.18.1
+palettable==3.3.0
+pandas==0.25.3
+pandocfilters==1.4.2
+parso==0.5.2
+pathspec==0.7.0
+pexpect==4.8.0
+pickleshare==0.7.5
+prometheus-client==0.7.1
+prompt-toolkit==3.0.2
+ptyprocess==0.6.0
+Pygments==2.5.2
+pymongo==3.10.1
+pyparsing==2.4.6
+pyproj==2.4.2.post1
+pyrsistent==0.15.7
+pysal==2.1.0
+python-dateutil==2.8.1
+pytz==2019.3
+pyzmq==18.1.1
+redis==3.3.11
+regex==2020.1.8
+requests==2.22.0
+Rtree==0.9.3
+scikit-learn==0.22.1
+scipy==1.4.1
+seaborn==0.9.0
+Send2Trash==1.5.0
+Shapely==1.6.4.post2
+six==1.14.0
+tables==3.6.1
+terminado==0.8.3
+testpath==0.4.4
+toml==0.10.0
+tornado==6.0.3
+tqdm==4.41.1
+traitlets==4.3.3
+turbo==0.4.9
+typed-ast==1.4.1
+urllib3==1.25.8
+viridis==0.4.2
+wcwidth==0.1.8
+webencodings==0.5.1
+widgetsnbextension==3.5.1
+wrapt==1.11.2