chore: release 0.1.5v

NESPEDUFV · Aug 10, 2022 · 36dddad · 36dddad
1 parent 7a60368
commit 36dddad
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 __pycache__
 data/output/
 docs/build
+**/build
 *.bat
 
 dist/

diff --git a/moredata/datasets/__init__.py b/moredata/datasets/__init__.py
@@ -4,16 +4,16 @@
 
 _module_path = os.path.dirname(__file__)
 _available_csv = {
- "airbnb-berlin-main": "airbnb-berlin-main.csv",
- "airbnb-berlin-host": "airbnb-berlin-host.csv",
- "airbnb-berlin-extra": "airbnb-berlin-extra.csv",
+ "airbnb-berlin-main": "./airbnb/airbnb-berlin-main.csv",
+ "airbnb-berlin-host": "./airbnb/airbnb-berlin-host.csv",
+ "airbnb-berlin-extra": "./airbnb/airbnb-berlin-extra.csv",
 }
 available = list(_available_csv.keys())
 
 
 def get_path(dataset):
  if dataset in _available_csv:
- return os.path.abspath(os.path.join(_module_path, dataset + ".csv"))
+ return os.path.abspath(os.path.join(_module_path, _available_csv[dataset]))
  else:
  msg = "The dataset '{data}' is not available. ".format(data=dataset)
  msg += "Available datasets are {}".format(", ".join(available))

diff --git a/moredata/datasets/airbnb-berlin-extra.csv → ...a/datasets/airbnb/airbnb-berlin-extra.csv b/moredata/datasets/airbnb-berlin-extra.csv → ...a/datasets/airbnb/airbnb-berlin-extra.csv
diff --git a/moredata/datasets/airbnb-berlin-host.csv → ...ta/datasets/airbnb/airbnb-berlin-host.csv b/moredata/datasets/airbnb-berlin-host.csv → ...ta/datasets/airbnb/airbnb-berlin-host.csv
diff --git a/moredata/datasets/airbnb-berlin-main.csv → ...ta/datasets/airbnb/airbnb-berlin-main.csv b/moredata/datasets/airbnb-berlin-main.csv → ...ta/datasets/airbnb/airbnb-berlin-main.csv
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
+dask-geopandas>=0.2.0
 requests>=2.22.0
 SQLAlchemy>=1.4.37
 PyMySQL>=0.10.0

diff --git a/setup.py b/setup.py
@@ -1,24 +1,34 @@
 from setuptools import setup, find_packages
 import os
 
+# get all data dirs in the datasets module
+data_files = []
+
+for item in os.listdir("moredata/datasets"):
+ print("")
+ if not item.startswith("__"):
+ if os.path.isdir(os.path.join("moredata/datasets/", item)):
+ data_files.append(os.path.join("datasets", item, "*"))
+
 if os.environ.get("READTHEDOCS", False) == "True":
  INSTALL_REQUIRES = []
  DOCS_REQUIRES = []
-else: 
+else:
  INSTALL_REQUIRES = [
- "requests==2.22.0",
- "SQLAlchemy==1.4.37",
- "PyMySQL==0.10.0",
- "osm2geojson==0.1.27",
+ "dask-geopandas>=0.2.0",
+ "requests>=2.22.0",
+ "SQLAlchemy>=1.4.37",
+ "PyMySQL>=0.10.0",
+ "osm2geojson>=0.1.27",
  "h3==3.4.3",
- "Rtree==0.9.7",
- "pyproj==2.4.2.post1",
+ "Rtree>=0.9.7",
+ "pyproj>=2.4.2.post1",
  "geopandas>=0.7.0",
- "geopy==2.0.0",
+ "geopy>=2.0.0",
  "pandas>=1.0.1",
  "numpy>=1.18.1",
- "elasticsearch>=7.5.1",
- "shapely==1.7.0",
+ "elasticsearch==7.17.0",
+ "shapely>=1.7.0",
  ]
 
  DOCS_REQUIRES = [
@@ -30,10 +40,11 @@
 
 setup(
  name="moredata",
- url='https://github.com/gegen07/more-data',
- download_url='https://github.com/gegen07/more-data/archive/v0.1.2.tar.gz',
- version='0.1.2',
+ url="https://github.com/gegen07/more-data",
+ download_url="https://github.com/gegen07/more-data/archive/v0.1.5.tar.gz",
+ version="0.1.5",
  packages=find_packages(where="."),
+ package_data={"moredata": data_files},
  python_requires=">=3.6",
  install_requires=INSTALL_REQUIRES,
  extras_require={