renaming to geoclustering due to pypi

bellingcat · Jul 1, 2022 · 6f83246 · 6f83246
1 parent b02139c
commit 6f83246
Show file tree

Hide file tree

Showing 13 changed files with 1,158 additions and 15 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -68,7 +68,7 @@ jobs:
         if: always()
         run: |
           . .venv/bin/activate
-          pip uninstall -y geocluster
+          pip uninstall -y geoclustering
 
   release:
     name: Release

diff --git a/Pipfile b/Pipfile
@@ -0,0 +1,19 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+click = "*"
+geojson = "*"
+keplergl = "*"
+numpy = "*"
+pandas = "*"
+scikit-learn = "*"
+
+[dev-packages]
+black = "*"
+wheel = "*"
+
+[requires]
+python_version = "3.9"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# geocluster
+# geoclustering
 
 > 📍 command-line tool for clustering geolocations.
 
@@ -18,8 +18,8 @@ A cluster is created when a certain number of points (=> `--size`) each are with
 Clone the repository:
 
 ```sh
-git clone https://github.com/fspoettel/geocluster
-cd geocluster
+git clone https://github.com/bellingcat/geoclustering
+cd geoclustering
 ```
 
 Install keplergl build dependencies:
@@ -37,7 +37,7 @@ pip install .
 ## Usage
 
 ```
-Usage: geocluster [OPTIONS] FILENAME
+Usage: geoclustering [OPTIONS] FILENAME
 
 Options:
   -d, --distance FLOAT            (in km) Max. distance between two points in

diff --git a/geocluster/__init__.py → geoclustering/__init__.py b/geocluster/__init__.py → geoclustering/__init__.py
diff --git a/geocluster/__main__.py → geoclustering/__main__.py b/geocluster/__main__.py → geoclustering/__main__.py
@@ -1,9 +1,9 @@
 import click
 import webbrowser
 
-import geocluster.clustering as clustering
-import geocluster.encoding as encoding
-import geocluster.io as io
+import geoclustering.clustering as clustering
+import geoclustering.encoding as encoding
+import geoclustering.io as io
 
 
 @click.command()

diff --git a/geocluster/clustering.py → geoclustering/clustering.py b/geocluster/clustering.py → geoclustering/clustering.py
diff --git a/geocluster/encoding.py → geoclustering/encoding.py b/geocluster/encoding.py → geoclustering/encoding.py
diff --git a/geocluster/io.py → geoclustering/io.py b/geocluster/io.py → geoclustering/io.py
@@ -68,7 +68,7 @@ def write_visualization(dirname, filename, data):
     map.add_data(data=data, name="clusters")
 
     # config configures a default color scheme for our clusters layer.
-    config_file = resource_filename("geocluster", "kepler_config.json")
+    config_file = resource_filename("geoclustering", "kepler_config.json")
     with open(config_file) as f:
         map.config = json.loads(f.read())
 

diff --git a/geocluster/kepler_config.json → geoclustering/kepler_config.json b/geocluster/kepler_config.json → geoclustering/kepler_config.json
diff --git a/geocluster/version.py → geoclustering/version.py b/geocluster/version.py → geoclustering/version.py
@@ -2,7 +2,7 @@
 _MINOR = "1"
 # On main and in a nightly release the patch should be one ahead of the last
 # released build.
-_PATCH = "0"
+_PATCH = "1"
 # This is mainly for nightly builds which have the suffix ".dev$DATE". See
 # https://semver.org/#is-v123-a-semantic-version for the semantics.
 _SUFFIX = ""

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-TAG=$(python -c 'from geocluster.version import VERSION; print("v" + VERSION)')
+TAG=$(python -c 'from geoclustering.version import VERSION; print("v" + VERSION)')
 
 read -p "Creating new release for $TAG. Do you want to continue? [Y/n] " prompt
 

diff --git a/setup.py b/setup.py
@@ -3,11 +3,11 @@
 # version.py defines the VERSION and VERSION_SHORT variables.
 # We use exec here so we don't import cached_path whilst setting up.
 VERSION = {}  # type: ignore
-with open("geocluster/version.py", "r") as version_file:
+with open("geoclustering/version.py", "r") as version_file:
     exec(version_file.read(), VERSION)
 
 setup(
-    name="geocluster",
+    name="geoclustering",
     version=VERSION["VERSION"],
     description="📍 command-line tool for clustering geolocations.",
     long_description=open("README.md").read(),
@@ -21,9 +21,9 @@
     author="Bellingcat",
     author_email="[email protected]",
     license="MIT",
-    packages=["geocluster"],
+    packages=["geoclustering"],
     keywords=["cluster", "gis", "pattern-analysis"],
-    entry_points={"console_scripts": ["geocluster = geocluster.__main__:main"]},
+    entry_points={"console_scripts": ["geoclustering = geoclustering.__main__:main"]},
     install_requires=[
         "click",
         "geojson",