osmsg 0.2.4__tar.gz → 0.3.0__tar.gz

{osmsg-0.2.4 → osmsg-0.3.0}/PKG-INFO

@@ -1,29 +1,22 @@
 Metadata-Version: 2.1
 Name: osmsg
-Version: 0.2.4
+Version: 0.3.0
 Summary: OpenStreetMap Stats Generator: Commandline
-License: MIT
-Author: Kshitij Raj Sharma
-Author-email: skshitizraj@gmail.com
-Requires-Python: >=3.6,<4.0
-Classifier: License :: OSI Approved :: MIT License
+License: GPL-3.0-only
+Keywords: osm,stats,commandline,openstreetmap
+Author-email: Kshitij Raj Sharma <skshitizraj@gmail.com>
+Requires-Python: >=3.9
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: geopandas (==0.10.2)
-Requires-Dist: humanize
-Requires-Dist: matplotlib
-Requires-Dist: osmium
-Requires-Dist: pandas (==1.5.2)
-Requires-Dist: requests
-Requires-Dist: seaborn
-Requires-Dist: shapely
-Requires-Dist: tqdm
+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
 
 # OpenStreetMap Stats Generator

osmsg-0.3.0/osmsg/__version__.py

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

{osmsg-0.2.4 → 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.4 → 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.4/pyproject.toml

@@ -1,44 +0,0 @@
-[build-system]
-requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "osmsg"
-version = "0.2.5"
-description = "OpenStreetMap Stats Generator: Commandline"
-readme = "README.md"
-authors = [{name = "Kshitij Raj Sharma", email = "skshitizraj@gmail.com"}]
-license = "MIT"
-
-[tool.poetry]
-name = "osmsg"
-version = "0.2.4"
-description = "OpenStreetMap Stats Generator: Commandline"
-readme = "README.md"
-authors = [ "Kshitij Raj Sharma <skshitizraj@gmail.com>"]
-license = "MIT"
-
-[project.scripts]
-osmsg = "osmsg.app:main"
-
-[tool.poetry.dependencies]
-python = "^3.6"
-osmium = "*"
-pandas = "==1.5.2"
-requests = "*"
-shapely = "*"
-geopandas = "==0.10.2"
-tqdm = "*"
-seaborn = "*"
-matplotlib = "*"
-humanize = "*"
-
-[tool.poetry.scripts]
-osmsg = "osmsg.app:main"
-
-[tool.commitizen]
-name = "cz_conventional_commits"
-tag_format = "v$version"
-version_scheme = "semver"
-version_provider = "pep621"
-update_changelog_on_bump = true