osmsg 0.2.3__tar.gz → 0.3.0__tar.gz

{osmsg-0.2.3/osmsg.egg-info → osmsg-0.3.0}/PKG-INFO

@@ -1,13 +1,23 @@
 Metadata-Version: 2.1
 Name: osmsg
-Version: 0.2.3
-Summary: OpenStreetMap Stats Generator : Commandline
-Home-page: https://github.com/kshitijrajsharma/OSMSG
-Author: Kshitij Raj Sharma
+Version: 0.3.0
+Summary: OpenStreetMap Stats Generator: Commandline
+License: GPL-3.0-only
+Keywords: osm,stats,commandline,openstreetmap
 Author-email: Kshitij Raj Sharma <skshitizraj@gmail.com>
-License: MIT
+Requires-Python: >=3.9
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Topic :: Scientific/Engineering :: GIS
+Classifier: Topic :: Utilities
+Provides-Extra: docs
+Provides-Extra: test
+Project-URL: documentation, https://github.com/kshitijrajsharma/osmsg
+Project-URL: homepage, https://github.com/kshitijrajsharma/osmsg
+Project-URL: repository, https://github.com/kshitijrajsharma/osmsg
 Description-Content-Type: text/markdown
-License-File: LICENSE
 
 # OpenStreetMap Stats Generator
 
@@ -15,7 +25,7 @@ On the Fly Commandline Stats Generator for OpenStreetMap User Contributions
 
 I tweet stats Every day/week/month for Global/Region and #hotosm hashtag at https://twitter.com/stats_osm and store them [OSMSG Stats Dir](https://github.com/kshitij-raj-sharma/OSMSG-stats/)
 
-Monitored stats are available under `stats`, Currently Bot monitors OSM as whole , hotosm hashtag , Nepal Country : weekly,monthly and yearly stats are stored in github and twitter.
+Monitored stats are available under `stats`, Currently Bot monitors OSM as whole , hotosm hashtag , Nepal Country : weekly,monthly and yearly stats are stored in github and twitter. 
 
 ### Usage:
 For installation & Local Setup follow [Installation](./docs/Installation.md)
@@ -91,3 +101,4 @@ Follow [stats_request_docs](./docs/Request_Stats.md)
 pip install streamlit
 streamlit run streamlit_app.py
 ```
+

{osmsg-0.2.3 → osmsg-0.3.0}/README.md

@@ -4,7 +4,7 @@ On the Fly Commandline Stats Generator for OpenStreetMap User Contributions
 
 I tweet stats Every day/week/month for Global/Region and #hotosm hashtag at https://twitter.com/stats_osm and store them [OSMSG Stats Dir](https://github.com/kshitij-raj-sharma/OSMSG-stats/)
 
-Monitored stats are available under `stats`, Currently Bot monitors OSM as whole , hotosm hashtag , Nepal Country : weekly,monthly and yearly stats are stored in github and twitter.
+Monitored stats are available under `stats`, Currently Bot monitors OSM as whole , hotosm hashtag , Nepal Country : weekly,monthly and yearly stats are stored in github and twitter. 
 
 ### Usage:
 For installation & Local Setup follow [Installation](./docs/Installation.md)

osmsg-0.3.0/osmsg/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.3.0"

{osmsg-0.2.3 → osmsg-0.3.0}/osmsg/app.py

@@ -41,6 +41,7 @@ import pandas as pd
 from matplotlib.font_manager import FontProperties
 from tqdm import tqdm
 
+from .__version__ import __version__
 from .changefiles import (
     get_download_urls_changefiles,
     get_prev_hour,
@@ -471,6 +472,9 @@ def auth(username, password):
 
 def parse_args():
     parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--version", action="version", version=f"%(prog)s {__version__}"
+    )
     parser.add_argument(
         "--start_date",
         help="Start date in the format YYYY-MM-DD HH:M:Sz eg: 2023-01-28 17:43:09+05:45",

{osmsg-0.2.3 → osmsg-0.3.0}/osmsg/utils.py

@@ -313,7 +313,7 @@ def create_charts(df, fname):
         other_editors_count = grouped_editors.iloc[num_categories:].sum()
 
         # Create a new series with the top categories and "others" count
-        editors_data = top_editors.append(
+        editors_data = top_editors._append(
             pd.Series(other_editors_count, index=["Others"])
         )
 
@@ -528,12 +528,16 @@ def update_stats(df1, df2):
     # Iterate over the integer columns and update the values
     for col in int_cols:
         merged_df[col] = merged_df.apply(
-            lambda row: pd.to_numeric(row[f"{col}_x"], errors="coerce")
-            + pd.to_numeric(row[f"{col}_y"], errors="coerce")
-            if pd.notnull(row[f"{col}_x"]) and pd.notnull(row[f"{col}_y"])
-            else pd.to_numeric(row[f"{col}_x"], errors="coerce") or 0
-            if pd.notnull(row[f"{col}_x"])
-            else pd.to_numeric(row[f"{col}_y"], errors="coerce") or 0,
+            lambda row: (
+                pd.to_numeric(row[f"{col}_x"], errors="coerce")
+                + pd.to_numeric(row[f"{col}_y"], errors="coerce")
+                if pd.notnull(row[f"{col}_x"]) and pd.notnull(row[f"{col}_y"])
+                else (
+                    pd.to_numeric(row[f"{col}_x"], errors="coerce") or 0
+                    if pd.notnull(row[f"{col}_x"])
+                    else pd.to_numeric(row[f"{col}_y"], errors="coerce") or 0
+                )
+            ),
             axis=1,
         )
 
@@ -641,12 +645,16 @@ def update_summary(df1, df2):
     # Iterate over the integer columns and update the values
     for col in int_cols:
         merged_df[col] = merged_df.apply(
-            lambda row: pd.to_numeric(row[f"{col}_x"], errors="coerce")
-            + pd.to_numeric(row[f"{col}_y"], errors="coerce")
-            if pd.notnull(row[f"{col}_x"]) and pd.notnull(row[f"{col}_y"])
-            else pd.to_numeric(row[f"{col}_x"], errors="coerce") or 0
-            if pd.notnull(row[f"{col}_x"])
-            else pd.to_numeric(row[f"{col}_y"], errors="coerce") or 0,
+            lambda row: (
+                pd.to_numeric(row[f"{col}_x"], errors="coerce")
+                + pd.to_numeric(row[f"{col}_y"], errors="coerce")
+                if pd.notnull(row[f"{col}_x"]) and pd.notnull(row[f"{col}_y"])
+                else (
+                    pd.to_numeric(row[f"{col}_x"], errors="coerce") or 0
+                    if pd.notnull(row[f"{col}_x"])
+                    else pd.to_numeric(row[f"{col}_y"], errors="coerce") or 0
+                )
+            ),
             axis=1,
         )
     if "editors" in df1.columns:

osmsg-0.3.0/pyproject.toml

@@ -0,0 +1,142 @@
+[project]
+name = "osmsg"
+version = "0.3.0"
+dynamic = []
+description = "OpenStreetMap Stats Generator: Commandline"
+readme = "README.md"
+authors = [
+    { name = "Kshitij Raj Sharma", email = "skshitizraj@gmail.com" },
+]
+requires-python = ">=3.9"
+dependencies = [
+    "pandas <= 2.2.2",
+    "osmium <= 3.7.0",
+    "requests <= 2.32.3",
+    "shapely <= 2.0.6",
+    "geopandas <= 1.0.1",
+    "tqdm <= 4.66.5",
+    "seaborn <= 0.13.2",
+    "matplotlib <= 3.9.2",
+    "humanize <= 4.10.0",
+]
+keywords = [
+    "osm",
+    "stats",
+    "commandline",
+    "openstreetmap",
+]
+classifiers = [
+    "Topic :: Utilities",
+    "Topic :: Scientific/Engineering :: GIS",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+]
+
+[project.license]
+text = "GPL-3.0-only"
+
+[project.urls]
+homepage = "https://github.com/kshitijrajsharma/osmsg"
+documentation = "https://github.com/kshitijrajsharma/osmsg"
+repository = "https://github.com/kshitijrajsharma/osmsg"
+
+[project.optional-dependencies]
+test = [
+    "pytest>=7.4.2",
+    "pytest-mock>=3.14.0",
+    "coverage>=7.6.1",
+    "coverage-badge>=1.1.2",
+]
+docs = [
+    "mkdocs>=1.5.3",
+    "mkdocs-material>=9.4.2",
+    "mkdocstrings-python>=1.7.0",
+    "mkdocs-exclude>=1.0.2",
+]
+
+[project.scripts]
+osmsg = "osmsg.app:main"
+
+[build-system]
+requires = [
+    "pdm-pep517>=1.1.4",
+]
+build-backend = "pdm.pep517.api"
+
+[tool.pytest.ini_options]
+addopts = "-ra -q -p no:warnings"
+testpaths = [
+    "tests",
+]
+pythonpath = "osmsg"
+
+[tool.commitizen]
+name = "cz_conventional_commits"
+tag_format = "v$version"
+version_scheme = "semver"
+version_provider = "pep621"
+update_changelog_on_bump = true
+version_files = [
+    "pyproject.toml:version",
+    "osmsg/__version__.py",
+]
+
+[tool.pdm.version]
+from = "osmsg/__version__.py"
+
+[tool.pdm.build]
+includes = [
+    "osmsg",
+]
+source-includes = [
+    "tests",
+    "LICENSE",
+    "README.md",
+]
+
+[tool.black]
+line-length = 132
+target-versions = [
+    "py39",
+    "py310",
+    "py311",
+]
+
+[tool.ruff]
+fix = true
+line-length = 132
+target-version = "py39"
+exclude = [
+    ".git",
+    ".ruff_cache",
+    ".vscode",
+    "__pypackages__",
+    "build",
+    "dist",
+    "osmsg/__version__.py",
+]
+
+[tool.ruff.lint]
+select = [
+    "I",
+    "E",
+    "W",
+    "D",
+    "B",
+    "F",
+    "N",
+    "Q",
+]
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
+
+[tool.coverage.run]
+source = [
+    "osmsg",
+]
+
+[tool.coverage.report]
+show_missing = true

osmsg-0.2.3/MANIFEST.in

@@ -1 +0,0 @@
-include data/countries_un.geojson

osmsg-0.2.3/PKG-INFO

@@ -1,93 +0,0 @@
-Metadata-Version: 2.1
-Name: osmsg
-Version: 0.2.3
-Summary: OpenStreetMap Stats Generator : Commandline
-Home-page: https://github.com/kshitijrajsharma/OSMSG
-Author: Kshitij Raj Sharma
-Author-email: Kshitij Raj Sharma <skshitizraj@gmail.com>
-License: MIT
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
-# OpenStreetMap Stats Generator
-
-On the Fly Commandline Stats Generator for OpenStreetMap User Contributions
-
-I tweet stats Every day/week/month for Global/Region and #hotosm hashtag at https://twitter.com/stats_osm and store them [OSMSG Stats Dir](https://github.com/kshitij-raj-sharma/OSMSG-stats/)
-
-Monitored stats are available under `stats`, Currently Bot monitors OSM as whole , hotosm hashtag , Nepal Country : weekly,monthly and yearly stats are stored in github and twitter.
-
-### Usage:
-For installation & Local Setup follow [Installation](./docs/Installation.md)
-```
-osmsg [-h] [--start_date START_DATE] [--end_date END_DATE] [--username USERNAME]
-             [--password PASSWORD] [--timezone {Nepal,UTC}] [--name NAME]
-             [--country COUNTRY [COUNTRY ...]] [--tags TAGS [TAGS ...]]
-             [--hashtags HASHTAGS [HASHTAGS ...]] [--length LENGTH [LENGTH ...]] [--force]
-             [--field_mappers] [--meta] [--tm_stats] [--rows ROWS] [--users USERS [USERS ...]]
-             [--workers WORKERS] [--url URL [URL ...]] [--last_week] [--last_day] [--last_month]
-             [--last_year] [--last_hour] [--days DAYS] [--charts] [--summary] [--exact_lookup]
-             [--changeset] [--all_tags] [--temp]
-             [--format {csv,json,excel,image,text} [{csv,json,excel,image,text} ...]]
-             [--read_from_metadata READ_FROM_METADATA] [--boundary BOUNDARY] [--update]
-```
-
-### Options:
-Hit following command for listing out the option with their documentation
-```
-osmsg --help
-```
-
-### Features
-It is a python package that processes osm files live and produces stats on the fly
-
-1. It can Generate Stats on Country Level for countries based on geofabrik urls . Countries are available in [here](./data/countries.csv)
-2. It can also take any other server replication changefile to extract stats (Tested with Geofabrik and Planet Replication)
-3. Can Generate hashtag statistics
-4. Supports multiple output formats , Visualize Automatic Stats Being Genarated [here](./stats/)
-5. It can create summary charts automatically along with stats , Visualize them [here](./stats/Global/Daily/)
-6. Can generate stats for any custom timestamp provided
-
-```
-{"name":"username","uid":uid,"changesets":1,"nodes.create":1071,"nodes.modify":2100,"nodes.delete":0,"ways.create":146,"ways.modify":69,"ways.delete":0,"relations.create":0,"relations.modify":1,"relations.delete":0,"building.create":138,"building.modify":11,"building.delete":0,"highway.create":5,"highway.modify":49,"highway.delete":0,"waterway.create":0,"waterway.modify":4,"waterway.delete":0,"amenity.create":0,"amenity.modify":3,"amenity.delete":0,"landuse.create":3,"landuse.modify":1,"landuse.delete":0,"natural.create":0,"natural.modify":3,"natural.delete":0,"total_map_changes":3387}
-```
-
-### Get Started :
-
-- Extract Stat of last hour and visualize stats/charts
-  
-  By default replication is minute url.
-
-```
-osmsg --last_hour
-```
-
-- With Hashtags information
-
-```
-osmsg --last_hour --changeset
-```
-
-  
-- Last week data with summary & all tags info and using day replication
-```
-osmsg --last_week --url day --summary --all_tags
-```
-
-For More , Follow [Manual](./docs/Manual.md)
-
-### Contributing
-Contributions are always welcome! Follow [Contributing Guidelines](./CONTRIBUTING.md) & Go through [Code of Conduct](./CODE_OF_CONDUCT.md)
-
-### Version Control
-Follow [Version Control Docs](./docs/Version_control.md)
-
-### Request Stats Tracking on Github 
-Follow [stats_request_docs](./docs/Request_Stats.md)
-
-## Visualize stats with streamlit
-
-```bash
-pip install streamlit
-streamlit run streamlit_app.py
-```