rename to pyrogramv2

Author: illvart

.github/FUNDING.yml

@@ -1,3 +1,2 @@
-github: delivrance
-liberapay: delivrance
-open_collective: pyrogram
+github: [illvart]
+custom: ["https://linktr.ee/illvart"]

.github/workflows/publish.yml

@@ -0,0 +1,30 @@
+name: Upload Python Package
+
+on:
+  push:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.11"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -e ".[dev]"
+    - name: Build package
+      run: hatch build
+    - name: Publish package
+      env:
+        HATCH_INDEX_USER: __token__
+        HATCH_INDEX_AUTH: ${{ secrets.PYPI_API_TOKEN }}
+      run: |
+        hatch publish

.github/workflows/python.yml

@@ -1,34 +1,28 @@
-name: Pyrogram
+name: PyrogramV2
 
 on: [push, pull_request]
 
 jobs:
   build:
-
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
-      - uses: actions/checkout@v3
-
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install tox
-
       - name: Generate API
         run: |
           make venv
           make api
-
       - name: Run tests
         run: |
           tox

.gitignore

@@ -7,11 +7,11 @@ unknown_errors.txt
 .DS_Store
 
 # Pyrogram generated code
-pyrogram/errors/exceptions/
-pyrogram/raw/functions/
-pyrogram/raw/types/
-pyrogram/raw/base/
-pyrogram/raw/all.py
+pyrogramv2/errors/exceptions/
+pyrogramv2/raw/functions/
+pyrogramv2/raw/types/
+pyrogramv2/raw/base/
+pyrogramv2/raw/all.py
 docs/source/telegram
 docs/source/api/methods/
 docs/source/api/bound-methods/

MANIFEST.in

@@ -1,11 +1,11 @@
 ## Include
-include README.md COPYING COPYING.lesser NOTICE requirements.txt
+include README.md COPYING COPYING.lesser NOTICE
 recursive-include compiler *.py *.tl *.tsv *.txt
 recursive-include tests *.py
 
 ## Exclude
-prune pyrogram/errors/exceptions
-prune pyrogram/raw/functions
-prune pyrogram/raw/types
-prune pyrogram/raw/base
-exclude pyrogram/raw/all.py
+prune pyrogramv2/errors/exceptions
+prune pyrogramv2/raw/functions
+prune pyrogramv2/raw/types
+prune pyrogramv2/raw/base
+exclude pyrogramv2/raw/all.py

Makefile

@@ -1,7 +1,7 @@
 VENV := venv
 PYTHON := $(VENV)/bin/python
 HOST = $(shell ifconfig | grep "inet " | tail -1 | cut -d\  -f2)
-TAG = v$(shell grep -E '__version__ = ".*"' pyrogram/__init__.py | cut -d\" -f2)
+TAG = v$(shell grep -E '__version__ = ".*"' pyrogramv2/__init__.py | cut -d\" -f2)
 
 RM := rm -rf
 
@@ -11,14 +11,14 @@ venv:
 	$(RM) $(VENV)
 	python3 -m venv $(VENV)
 	$(PYTHON) -m pip install -U pip wheel setuptools
-	$(PYTHON) -m pip install -U -r requirements.txt -r dev-requirements.txt
+	$(PYTHON) -m pip install -U -e .
 	@echo "Created venv with $$($(PYTHON) --version)"
 
 clean-build:
 	$(RM) *.egg-info build dist
 
 clean-api:
-	$(RM) pyrogram/errors/exceptions pyrogram/raw/all.py pyrogram/raw/base pyrogram/raw/functions pyrogram/raw/types
+	$(RM) pyrogramv2/errors/exceptions pyrogramv2/raw/all.py pyrogramv2/raw/base pyrogramv2/raw/functions pyrogramv2/raw/types
 
 clean:
 	make clean-build

README.md

@@ -22,12 +22,12 @@
     </a>
 </p>
 
-## Pyrogram
+## PyrogramV2
 
 > Elegant, modern and asynchronous Telegram MTProto API framework in Python for users and bots
 
 ``` python
-from pyrogram import Client, filters
+from pyrogramv2 import Client, filters
 
 app = Client("my_account")
 
@@ -65,7 +65,7 @@ If you'd like to support Pyrogram, you can consider:
 ### Installing
 
 ``` bash
-pip3 install pyrogram
+pip3 install pyrogramv2
 ```
 
 ### Resources

compiler/api/compiler.py

@@ -28,7 +28,7 @@
 # from black import format_str, FileMode
 
 HOME_PATH = Path("compiler/api")
-DESTINATION_PATH = Path("pyrogram/raw")
+DESTINATION_PATH = Path("pyrogramv2/raw")
 NOTICE_PATH = "NOTICE"
 
 SECTION_RE = re.compile(r"---(\w+)---")
@@ -176,13 +176,13 @@ def get_docstring_arg_type(t: str):
         else:
             return f"``{t.lower()}``"
     elif t == "TLObject" or t == "X":
-        return "Any object from :obj:`~pyrogram.raw.types`"
+        return "Any object from :obj:`~pyrogramv2.raw.types`"
     elif t == "!X":
-        return "Any function from :obj:`~pyrogram.raw.functions`"
+        return "Any function from :obj:`~pyrogramv2.raw.functions`"
     elif t.lower().startswith("vector"):
         return "List of " + get_docstring_arg_type(t.split("<", 1)[1][:-1])
     else:
-        return f":obj:`{t} <pyrogram.raw.base.{t}>`"
+        return f":obj:`{t} <pyrogramv2.raw.base.{t}>`"
 
 
 def get_references(t: str, kind: str):
@@ -336,7 +336,7 @@ def start(format: bool = False):
 
         docstring += f"\n\n    Constructors:\n" \
                      f"        This base type has {constr_count} constructor{'s' if constr_count > 1 else ''} available.\n\n" \
-                     f"        .. currentmodule:: pyrogram.raw.types\n\n" \
+                     f"        .. currentmodule:: pyrogramv2.raw.types\n\n" \
                      f"        .. autosummary::\n" \
                      f"            :nosignatures:\n\n" \
                      f"            {items}"
@@ -346,7 +346,7 @@ def start(format: bool = False):
         if references:
             docstring += f"\n\n    Functions:\n        This object can be returned by " \
                          f"{ref_count} function{'s' if ref_count > 1 else ''}.\n\n" \
-                         f"        .. currentmodule:: pyrogram.raw.functions\n\n" \
+                         f"        .. currentmodule:: pyrogramv2.raw.functions\n\n" \
                          f"        .. autosummary::\n" \
                          f"            :nosignatures:\n\n" \
                          f"            " + references
@@ -419,7 +419,7 @@ def start(format: bool = False):
                 constructor_docs = "Telegram API type."
 
             docstring += constructor_docs + "\n"
-            docstring += f"\n    Constructor of :obj:`~pyrogram.raw.base.{c.qualtype}`."
+            docstring += f"\n    Constructor of :obj:`~pyrogramv2.raw.base.{c.qualtype}`."
         else:
             function_docs = docs["method"].get(c.qualname, None)
 
@@ -440,7 +440,7 @@ def start(format: bool = False):
             if references:
                 docstring += f"\n    Functions:\n        This object can be returned by " \
                              f"{count} function{'s' if count > 1 else ''}.\n\n" \
-                             f"        .. currentmodule:: pyrogram.raw.functions\n\n" \
+                             f"        .. currentmodule:: pyrogramv2.raw.functions\n\n" \
                              f"        .. autosummary::\n" \
                              f"            :nosignatures:\n\n" \
                              f"            " + references
@@ -630,23 +630,23 @@ def start(format: bool = False):
         f.write("objects = {")
 
         for c in combinators:
-            f.write(f'\n    {c.id}: "pyrogram.raw.{c.section}.{c.qualname}",')
+            f.write(f'\n    {c.id}: "pyrogramv2.raw.{c.section}.{c.qualname}",')
 
-        f.write('\n    0xbc799737: "pyrogram.raw.core.BoolFalse",')
-        f.write('\n    0x997275b5: "pyrogram.raw.core.BoolTrue",')
-        f.write('\n    0x1cb5c415: "pyrogram.raw.core.Vector",')
-        f.write('\n    0x73f1f8dc: "pyrogram.raw.core.MsgContainer",')
-        f.write('\n    0xae500895: "pyrogram.raw.core.FutureSalts",')
-        f.write('\n    0x0949d9dc: "pyrogram.raw.core.FutureSalt",')
-        f.write('\n    0x3072cfa1: "pyrogram.raw.core.GzipPacked",')
-        f.write('\n    0x5bb8e511: "pyrogram.raw.core.Message",')
+        f.write('\n    0xbc799737: "pyrogramv2.raw.core.BoolFalse",')
+        f.write('\n    0x997275b5: "pyrogramv2.raw.core.BoolTrue",')
+        f.write('\n    0x1cb5c415: "pyrogramv2.raw.core.Vector",')
+        f.write('\n    0x73f1f8dc: "pyrogramv2.raw.core.MsgContainer",')
+        f.write('\n    0xae500895: "pyrogramv2.raw.core.FutureSalts",')
+        f.write('\n    0x0949d9dc: "pyrogramv2.raw.core.FutureSalt",')
+        f.write('\n    0x3072cfa1: "pyrogramv2.raw.core.GzipPacked",')
+        f.write('\n    0x5bb8e511: "pyrogramv2.raw.core.Message",')
 
         f.write("\n}\n")
 
 
 if "__main__" == __name__:
     HOME_PATH = Path(".")
-    DESTINATION_PATH = Path("../../pyrogram/raw")
+    DESTINATION_PATH = Path("../../pyrogramv2/raw")
     NOTICE_PATH = Path("../../NOTICE")
 
     start(format=False)

compiler/api/template/combinator.txt

@@ -2,9 +2,9 @@
 
 from io import BytesIO
 
-from pyrogram.raw.core.primitives import Int, Long, Int128, Int256, Bool, Bytes, String, Double, Vector
-from pyrogram.raw.core import TLObject
-from pyrogram import raw
+from pyrogramv2.raw.core.primitives import Int, Long, Int128, Int256, Bool, Bytes, String, Double, Vector
+from pyrogramv2.raw.core import TLObject
+from pyrogramv2 import raw
 from typing import List, Optional, Any
 
 {warning}

compiler/api/template/type.txt

@@ -3,8 +3,8 @@
 {warning}
 
 from typing import Union
-from pyrogram import raw
-from pyrogram.raw.core import TLObject
+from pyrogramv2 import raw
+from pyrogramv2.raw.core import TLObject
 
 {name} = Union[{types}]
 
@@ -14,7 +14,7 @@ class {name}:  # type: ignore
     """{docstring}
     """
 
-    QUALNAME = "pyrogram.raw.base.{qualname}"
+    QUALNAME = "pyrogramv2.raw.base.{qualname}"
 
     def __init__(self):
         raise TypeError("Base types can only be used for type checking purposes: "

compiler/docs/compiler.py

@@ -25,9 +25,9 @@
 DESTINATION = "docs/source/telegram"
 PYROGRAM_API_DEST = "docs/source/api"
 
-FUNCTIONS_PATH = "pyrogram/raw/functions"
-TYPES_PATH = "pyrogram/raw/types"
-BASE_PATH = "pyrogram/raw/base"
+FUNCTIONS_PATH = "pyrogramv2/raw/functions"
+TYPES_PATH = "pyrogramv2/raw/types"
+BASE_PATH = "pyrogramv2/raw/base"
 
 FUNCTIONS_BASE = "functions"
 TYPES_BASE = "types"
@@ -78,7 +78,7 @@ def build(path, level=0):
                         page_template.format(
                             title=full_name,
                             title_markup="=" * len(full_name),
-                            full_class_path="pyrogram.raw.{}".format(
+                            full_class_path="pyrogramv2.raw.{}".format(
                                 ".".join(full_path.split("/")[:-1]) + "." + name
                             )
                         )
@@ -100,14 +100,14 @@ def build(path, level=0):
 
         if k != base:
             inner_path = base + "/" + k + "/index" + ".rst"
-            module = "pyrogram.raw.{}.{}".format(base, k)
+            module = "pyrogramv2.raw.{}.{}".format(base, k)
         else:
             for i in sorted(list(all_entities), reverse=True):
                 if i != base:
                     entities.insert(0, "{0}/index".format(i))
 
             inner_path = base + "/index" + ".rst"
-            module = "pyrogram.raw.{}".format(base)
+            module = "pyrogramv2.raw.{}".format(base)
 
         with open(DESTINATION + "/" + inner_path, "w", encoding="utf-8") as f:
             if k == base:
@@ -126,7 +126,7 @@ def build(path, level=0):
             f.write("\n")
 
 
-def pyrogram_api():
+def pyrogramv2_api():
     def get_title_list(s: str) -> list:
         return [i.strip() for i in [j.strip() for j in s.split("\n") if j] if i]
 
@@ -353,7 +353,7 @@ def get_title_list(s: str) -> list:
                     title = "{}()".format(method)
 
                     f2.write(title + "\n" + "=" * len(title) + "\n\n")
-                    f2.write(".. automethod:: pyrogram.Client.{}()".format(method))
+                    f2.write(".. automethod:: pyrogramv2.Client.{}()".format(method))
 
             functions = ["idle", "compose"]
 
@@ -362,7 +362,7 @@ def get_title_list(s: str) -> list:
                     title = "{}()".format(func)
 
                     f2.write(title + "\n" + "=" * len(title) + "\n\n")
-                    f2.write(".. autofunction:: pyrogram.{}()".format(func))
+                    f2.write(".. autofunction:: pyrogramv2.{}()".format(func))
 
         f.write(template.format(**fmt_keys))
 
@@ -517,7 +517,7 @@ def get_title_list(s: str) -> list:
                     title = "{}".format(type)
 
                     f2.write(title + "\n" + "=" * len(title) + "\n\n")
-                    f2.write(".. autoclass:: pyrogram.types.{}()\n".format(type))
+                    f2.write(".. autoclass:: pyrogramv2.types.{}()\n".format(type))
 
         f.write(template.format(**fmt_keys))
 
@@ -631,7 +631,7 @@ def get_title_list(s: str) -> list:
                     title = "{}()".format(bm)
 
                     f2.write(title + "\n" + "=" * len(title) + "\n\n")
-                    f2.write(".. automethod:: pyrogram.types.{}()".format(bm))
+                    f2.write(".. automethod:: pyrogramv2.types.{}()".format(bm))
 
         f.write(template.format(**fmt_keys))
 
@@ -651,13 +651,13 @@ def start():
     generate(TYPES_PATH, TYPES_BASE)
     generate(FUNCTIONS_PATH, FUNCTIONS_BASE)
     generate(BASE_PATH, BASE_BASE)
-    pyrogram_api()
+    pyrogramv2_api()
 
 
 if "__main__" == __name__:
-    FUNCTIONS_PATH = "../../pyrogram/raw/functions"
-    TYPES_PATH = "../../pyrogram/raw/types"
-    BASE_PATH = "../../pyrogram/raw/base"
+    FUNCTIONS_PATH = "../../pyrogramv2/raw/functions"
+    TYPES_PATH = "../../pyrogramv2/raw/types"
+    BASE_PATH = "../../pyrogramv2/raw/base"
     HOME = "."
     DESTINATION = "../../docs/source/telegram"
     PYROGRAM_API_DEST = "../../docs/source/api"