fix Twitch. Update snapcraft.yaml. Add pyproject.toml. Remove setup.p…

…y, requirements.txt, test-requirements.txt, as they are already specified in pyproject.toml

Installer.bat

@@ -105,7 +105,7 @@ if %errorlevel%==2 goto 1
 
 :install4
 cls
-pip install -r requirements.txt
+pip install .
 pip install maigret
 goto:after
 

README.md

@@ -55,7 +55,7 @@ Also, you can run Maigret using cloud shells and Jupyter notebooks (see buttons
 
 ### Package installing
 
-**NOTE**: Python 3.7 or higher and pip is required, **Python 3.8 is recommended.**
+**NOTE**: Python 3.10 or higher and pip is required, **Python 3.11 is recommended.**
 
 ```bash
 # install from pypi
@@ -70,10 +70,12 @@ maigret username
 ```bash
 # or clone and install manually
 git clone https://github.com/soxoj/maigret && cd maigret
-pip3 install -r requirements.txt
+
+# build and install
+pip3 install .
 
 # usage
-./maigret.py username
+maigret username
 ```
 
 ### Docker

maigret/resources/data.json

@@ -16713,14 +16713,14 @@
         },
         "Twitch": {
             "tags": [
-                "streaming"
+                "streaming", "us"
             ],
-            "urlProbe": "https://m.twitch.tv/{username}",
+            "urlProbe": "https://twitchtracker.com/{username}",
             "checkType": "status_code",
             "alexaRank": 34,
             "urlMain": "https://www.twitch.tv/",
-            "url": "https://www.twitch.tv/{username}",
-            "usernameClaimed": "jenny",
+            "url": "https://twitchtracker.com/{username}",
+            "usernameClaimed": "adam",
             "usernameUnclaimed": "noonewouldeverusethis7"
         },
         "Nitter": {

opensuse.txt

@@ -5,43 +5,43 @@
 #
 # Then run 'pip3 install -r opensuse.txt' as usual.
 #
-aiodns==3.0.0
-aiohttp==3.8.6
-aiohttp-socks==0.7.1
+aiodns>=3.0.0
+aiohttp>=3.8.6
+aiohttp-socks>=0.7.1
 arabic-reshaper~=3.0.0
 async-timeout
-attrs==22.2.0
-certifi==2023.7.22
-chardet==5.0.0
+attrs>=22.2.0
+certifi>=2023.7.22
+chardet>=5.0.0
 colorama
-future==0.18.3
-future-annotations==1.0.0
-html5lib==1.1
-idna==3.4
+future>=0.18.3
+future-annotations>=1.0.0
+html5lib>=1.1
+idna>=3.4
 Jinja2
-lxml==4.9.2
+lxml>=4.9.2
 MarkupSafe
-mock==4.0.3
+mock>=4.0.3
 multidict
-pycountry==22.3.5
-PyPDF2==3.0.1
-PySocks==1.7.1
-python-bidi==0.4.2
+pycountry>=22.3.5
+PyPDF2>=3.0.1
+PySocks>=1.7.1
+python-bidi>=0.4.2
 requests
-requests-futures==1.0.0
-six==1.16.0
+requests-futures>=1.0.0
+six>=1.16.0
 socid-extractor>=0.0.24
-soupsieve==2.3.2.post1
-stem==1.8.1
-torrequest==0.1.0
+soupsieve>=2.3.2.post1
+stem>=1.8.1
+torrequest>=0.1.0
 tqdm
 typing-extensions
-webencodings==0.5.1
+webencodings>=0.5.1
 svglib
 xhtml2pdf~=0.2.11
-XMind==1.2.0
+XMind>=1.2.0
 yarl
 networkx
-pyvis==0.2.1
+pyvis>=0.2.1
 reportlab
-cloudscraper==1.2.71
+cloudscraper>=1.2.71

pyproject.toml

@@ -0,0 +1,80 @@
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.poetry]
+name = "maigret"
+version = "0.4.4"
+description = "🕵️‍♂️ Collect a dossier on a person by username from thousands of sites."
+authors = ["Soxoj <[email protected]>"]
+readme = "README.md"
+license = "MIT License"
+homepage = "https://pypi.org/project/maigret"
+documentation = "https://maigret.readthedocs.io"
+repository = "https://github.com/soxoj/maigret"
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Programming Language :: Python :: 3",
+    "Intended Audience :: Information Technology",
+    "Operating System :: OS Independent",
+    "License :: OSI Approved :: MIT License",
+    "Natural Language :: English"
+]
+
+[tool.poetry.urls]
+"Bug Tracker" = "https://github.com/soxoj/maigret/issues"
+
+[tool.poetry.dependencies]
+python = "^3.10"
+aiodns = "^3.0.0"
+aiohttp = "^3.8.6"
+aiohttp-socks = "^0.7.1"
+arabic-reshaper = "^3.0.0"
+async-timeout = "^4.0.3"
+attrs = "^22.2.0"
+certifi = "^2023.7.22"
+chardet = "^5.0.0"
+colorama = "^0.4.6"
+future = "^0.18.3"
+future-annotations= "^1.0.0"
+html5lib = "^1.1"
+idna = "^3.4"
+Jinja2 = "^3.1.3"
+lxml = "^4.9.2"
+MarkupSafe = "^2.1.1"
+mock = "^4.0.3"
+multidict = "^6.0.4"
+pycountry = "^23.12.11"
+PyPDF2 = "^3.0.1"
+PySocks = "^1.7.1"
+python-bidi = "^0.4.2"
+requests = "^2.31.0"
+requests-futures = "^1.0.0"
+six = "^1.16.0"
+socid-extractor = "^0.0.24"
+soupsieve = "^2.3.2.post1"
+stem = "^1.8.1"
+torrequest = "^0.1.0"
+tqdm = "^4.66.1"
+typing-extensions = "^4.8.0"
+webencodings = "^0.5.1"
+xhtml2pdf = "^0.2.11"
+XMind = "^1.2.0"
+yarl = "^1.8.2"
+networkx = "^2.6.3"
+pyvis = "^0.2.1"
+reportlab = "^4.2.0"
+cloudscraper = "^1.2.71"
+
+
+[tool.poetry.group.dev.dependencies]
+flake8 = "^6.1.0"
+pytest = "^7.2.0"
+pytest-asyncio = "^0.23.2"
+pytest-cov = "^4.0.0"
+pytest-httpserver = "^1.0.0"
+pytest-rerunfailures = "^12.0"
+reportlab = "^4.2.0"
+
+[tool.poetry.scripts]
+maigret = "maigret.maigret:run"

snapcraft.yaml

@@ -1,43 +1,32 @@
-name: maigret2
-adopt-info: maigret2
-summary: SOCMINT / Instagram
+title: Maigret
+icon: static/maigret.png
+name: maigret
+summary: 🕵️‍♂️ Collect a dossier on a person by username from thousands of sites.
 description: |
-  Test Test Test
+  **Maigret** collects a dossier on a person **by username only**, checking for accounts on a huge number of sites and gathering all the available information from web pages. No API keys required. Maigret is an easy-to-use and powerful fork of Sherlock.
+  
+  Currently supported more than 3000 sites, search is launched against 500 popular sites in descending order of popularity by default. Also supported checking of Tor sites, I2P sites, and domains (via DNS resolving).
 
+version: 0.4.4
 license: MIT
-
-base: core20
-grade: stable
+base: core22
 confinement: strict
-compression: lzo
 
-architectures:
-  - build-on: amd64
+source-code: https://github.com/soxoj/maigret
+issues:
+  - https://github.com/soxoj/maigret/issues
+donation:
+  - https://patreon.com/soxoj
+contact:
+  - mailto:[email protected]
 
-apps:
-  maigret2:
-    command: bin/maigret
-    environment:
-      LC_ALL: C.UTF-8
-    plugs:
-      - home
-      - network
-
 parts:
-  maigret2:
+  maigret:
     plugin: python
-    source: https://github.com/soxoj/maigret
-    source-type: git
-
-    build-packages:
-      - python3-pip
-      - python3-six
-      - python3
-
-    stage-packages:
-      - python3
-      - python3-six
+    source: .
 
-    override-pull: |
-      snapcraftctl pull
-      snapcraftctl set-version "$(git describe --tags | sed 's/^v//' | cut -d "-" -f1)"
+type: app
+apps:
+  maigret:
+    command: bin/maigret
+    plugs: [ network, network-bind, home ]