My Privacy DNS | Shortcuts: Matrix | PyFunceble | Porn Records (Requires login) | Support | PRIM

Verified Commit 872fa794 authored by Nissar Chababy's avatar Nissar Chababy
Browse files

Introduction of PyFunceble v3.2.0 (Teal Blauwbok: Moth)

Fixed:
  * Issue with the creation of files when the `output/` directory
    is missing.

  * Issue with some analytic files which were named `NoneNone`.

  * Issue with the quiet mode which was not completely quiet while using
    the `-m` (multiprocessing) argument

Improved:
  * The documentation.

  * Tests of the AdBlock decoder.

  * The way we handle subdomains which are behind a public suffix.

  * The way we generate the shadow file. It can now take advantage
    of multiprocessing.

New:
  * Deployment to Docker Hub.

  * Deployment to Anaconda Cloud.

  * Domains are now converted to lower case while testing
    them (only).

  * Notice about the `-d` argument.

  * Tests are now with Python 3.6.10, 3.7.7 and 3.8.3.

  * A way to define the location of the output directory through the
    `PYFUNCEBLE_OUTPUT_LOCATION` environment variable.

  * Shadow file is not generated by default. You should explicitly
    give us the permission to do that through the `--shadow` argument.

Removed:
  * `urllib3` as a (direct) dependency.

Contributors:
  * @NeolithEra
  * @spirillen
  * @ZeroDot1
parent 7ff6e5e2
......@@ -286,13 +286,13 @@ http_codes:
links:
api_date_format: "https://pyfunceble.funilrys.com/api/date-format"
api_no_referer: "https://pyfunceble.funilrys.com/api/no-referer"
config: "https://raw.githubusercontent.com/funilrys/PyFunceble/dev/.PyFunceble_production.yaml"
dir_structure: "https://raw.githubusercontent.com/funilrys/PyFunceble/dev/dir_structure_production.json"
config: "https://raw.githubusercontent.com/funilrys/PyFunceble/master/.PyFunceble_production.yaml"
dir_structure: "https://raw.githubusercontent.com/funilrys/PyFunceble/master/dir_structure_production.json"
iana: "https://raw.githubusercontent.com/PyFunceble/iana/master/iana-domains-db.json"
ipv4_reputation: "https://reputation.alienvault.com/reputation.data"
mariadb: "https://raw.githubusercontent.com/funilrys/PyFunceble/dev/db_types/mariadb.sql"
mysql: "https://raw.githubusercontent.com/funilrys/PyFunceble/dev/db_types/mysql.sql"
mariadb: "https://raw.githubusercontent.com/funilrys/PyFunceble/master/db_types/mariadb.sql"
mysql: "https://raw.githubusercontent.com/funilrys/PyFunceble/master/db_types/mysql.sql"
psl: "https://raw.githubusercontent.com/PyFunceble/public-suffix/master/public-suffix.json"
repo: "https://github.com/funilrys/PyFunceble"
requirements: "https://raw.githubusercontent.com/funilrys/PyFunceble/dev/requirements.txt"
requirements: "https://raw.githubusercontent.com/funilrys/PyFunceble/master/requirements.txt"
user_agents: "https://raw.githubusercontent.com/PyFunceble/user_agents/master/user_agents.json"
\ No newline at end of file
# pylint:disable=invalid-name, cyclic-import
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -25,7 +25,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......@@ -104,7 +104,7 @@ class Infrastructure:
:type: str
"""
PROD_CONFIG_LINK = "https://raw.githubusercontent.com/funilrys/PyFunceble/dev/.PyFunceble_production.yaml" # pylint: disable=line-too-long
PROD_CONFIG_LINK = "https://raw.githubusercontent.com/funilrys/PyFunceble/master/.PyFunceble_production.yaml" # pylint: disable=line-too-long
"""
Sets the link to the production configuration file.
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......@@ -65,7 +65,7 @@ class Package:
:type: str
"""
VERSION = "3.1.18.dev (Teal Blauwbok: Ladybug)"
VERSION = "3.1.20.dev (Teal Blauwbok: Moth)"
"""
Sets the package version.
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
# pylint: disable=too-many-lines, line-too-long
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -27,7 +27,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......@@ -92,12 +92,12 @@ def tool(): # pragma: no cover pylint: disable=too-many-branches,too-many-state
description = (
f"{Style.BRIGHT}{Fore.GREEN}PyFunceble{Style.RESET_ALL} - "
"The tool to check the availability or syntax of domains, IPv4, IPv6 or URL."
"The tool to check the availability or syntax of domain, IP or URL."
)
epilog = (
f"{Style.BRIGHT}{Fore.YELLOW}For an in-depth usage, explanation and examples of the arguments, "
f"you should read the documentation at{Fore.GREEN} https://pyfunceble.readthedocs.io/en/dev/"
f"you should read the documentation at{Fore.GREEN} https://pyfunceble.readthedocs.io/en/master/"
f"{Style.RESET_ALL}\n\n"
f"Crafted with {Fore.RED}{Fore.RESET} by "
f"{Style.BRIGHT}{Fore.CYAN}Nissar Chababy (@funilrys){Style.RESET_ALL} "
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -27,7 +27,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......@@ -447,8 +447,11 @@ class Production: # pragma: no cover pylint: disable=too-few-public-methods
regexes = {
"PyFunceble/%s/" % "dev": r"PyFunceble\/%s\/" % "master",
"=%s" % "dev": "=%s" % "master",
"/en/%s" % "dev": "en/%s" % "master",
r"/pyfunceble-%s.png" % "dev": r"/pyfunceble-dev.png",
"/en/%s" % "dev": r"en\/%s" % "master",
"/pyfunceble-%s.png" % "dev": r"\/pyfunceble.png",
"/project/pyfunceble-%s" % "dev": r"\/project\/pyfunceble$",
"pypistats.org/packages/pyfunceble-%s"
% "dev": r"pypistats\.org\/packages\/pyfunceble$s",
}
elif self.is_master_version():
# The current version is the master version.
......@@ -457,8 +460,11 @@ class Production: # pragma: no cover pylint: disable=too-few-public-methods
regexes = {
"PyFunceble/%s/" % "master": r"PyFunceble\/%s\/" % "dev",
"=%s" % "master": "=%s" % "dev",
"/en/%s" % "master": "en/%s" % "dev",
r"/pyfunceble-dev.png": r"/(d[dmw])/pyfunceble-%s.png" % "dev",
"/en/%s" % "master": r"en\/%s" % "dev",
"/pyfunceble.png": r"\/pyfunceble-%s.png" % "dev",
"/project/pyfunceble": r"/project\/pyfunceble-%s$" % "dev",
"pypistats.org/packages/pyfunceble": r"pypistats\.org\/packages\/pyfunceble-%s$"
% "dev",
}
else:
# The current version is not the master nor the dev version.
......@@ -477,7 +483,7 @@ class Production: # pragma: no cover pylint: disable=too-few-public-methods
# We process the replacement.
to_update = PyFunceble.helpers.Regex(regex).replace_match(
to_update, replacement
to_update, replacement, multiline=True
)
to_update = PyFunceble.helpers.Regex(r"/{1,}en/(dev|master)").replace_match(
......@@ -530,7 +536,7 @@ class Production: # pragma: no cover pylint: disable=too-few-public-methods
# And we process the replacement.
to_update = PyFunceble.helpers.Regex(regex).replace_match(
to_update, replacement
to_update, replacement, multiline=True
)
# We finally replace the content of the file with the filtered
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
# pylint: disable=line-too-long
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -27,7 +27,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
"""
The tool to check the availability or syntax of domains, IPv4, IPv6 or URL.
The tool to check the availability or syntax of domain, IP or URL.
::
......@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
https://pyfunceble.readthedocs.io/en/dev/
https://pyfunceble.readthedocs.io/en/master/
Project homepage:
https://pyfunceble.github.io/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment