diff --git a/debian/patches/Add-vendor-in-path.patch b/debian/patches/Add-vendor-in-path.patch index 9271377..41e10b2 100644 --- a/debian/patches/Add-vendor-in-path.patch +++ b/debian/patches/Add-vendor-in-path.patch @@ -1,7 +1,6 @@ From: Sophie Brun Date: Mon, 6 Dec 2021 17:30:46 +0100 Subject: Add usr/lib/python3/dist-packages/faraday/vendor in import path - Last-Update: 2021-12-07 Add usr/lib/python3/dist-packages/faraday/vendor in PYTHONPATH to use @@ -13,7 +12,7 @@ 3 files changed, 6 insertions(+) diff --git a/faraday/manage.py b/faraday/manage.py -index c3458aa..05c8ddc 100755 +index 47b3347..7f3a531 100755 --- a/faraday/manage.py +++ b/faraday/manage.py @@ -29,6 +29,8 @@ if platform.system() == "Linux": @@ -26,10 +25,10 @@ # python path sys.path.append("/usr/share/pgcli") diff --git a/faraday/searcher/searcher.py b/faraday/searcher/searcher.py -index 4ebcef8..f88dc58 100755 +index 7eccd7e..c90ed85 100755 --- a/faraday/searcher/searcher.py +++ b/faraday/searcher/searcher.py -@@ -23,6 +23,8 @@ from pathlib import Path +@@ -21,6 +21,8 @@ from pathlib import Path import click import requests diff --git a/debian/patches/Remove-failing-tests.patch b/debian/patches/Remove-failing-tests.patch index c9e7490..229359d 100644 --- a/debian/patches/Remove-failing-tests.patch +++ b/debian/patches/Remove-failing-tests.patch @@ -3,19 +3,18 @@ Subject: Remove failing tests --- - tests/test_searcher.py | 885 ------------------------------------- + tests/test_searcher.py | 884 ------------------------------------- tests/test_server_utils_filters.py | 246 ----------- - 2 files changed, 1131 deletions(-) + 2 files changed, 1130 deletions(-) delete mode 100644 tests/test_searcher.py delete mode 100644 tests/test_server_utils_filters.py diff --git a/tests/test_searcher.py b/tests/test_searcher.py deleted file mode 100644 -index 69acee5..0000000 +index fc13e69..0000000 --- a/tests/test_searcher.py +++ /dev/null -@@ -1,885 +0,0 @@ -- +@@ -1,884 +0,0 @@ -import json - -import pytest diff --git a/debian/patches/Remove-sqlalchemy-requirement.patch b/debian/patches/Remove-sqlalchemy-requirement.patch index 8c2c480..a972689 100644 --- a/debian/patches/Remove-sqlalchemy-requirement.patch +++ b/debian/patches/Remove-sqlalchemy-requirement.patch @@ -1,7 +1,6 @@ From: Sophie Brun Date: Tue, 7 Dec 2021 10:56:02 +0100 Subject: Remove sqlalchemy requirement - Last-Update: 2021-12-07 dh_python generates automatically the Python dependencies with version @@ -12,7 +11,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt -index 8420bf7..49e6ca6 100644 +index 9c188be..fb082e3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,7 +21,7 @@ python-dateutil>=2.6.0 diff --git a/debian/patches/change-path-to-server-www.patch b/debian/patches/change-path-to-server-www.patch index ddad8d8..a21a97e 100644 --- a/debian/patches/change-path-to-server-www.patch +++ b/debian/patches/change-path-to-server-www.patch @@ -13,10 +13,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faraday/server/web.py b/faraday/server/web.py -index ccc9c0b..8aa244e 100644 +index 7725412..ca07262 100644 --- a/faraday/server/web.py +++ b/faraday/server/web.py -@@ -68,7 +68,7 @@ class FaradayRedirectResource(Redirect): +@@ -77,7 +77,7 @@ class FaradayRedirectResource(Redirect): class WebServer: API_URL_PATH = b'_api' diff --git a/debian/patches/create-logs-dir.patch b/debian/patches/create-logs-dir.patch index 2cdfc47..d4b16dc 100644 --- a/debian/patches/create-logs-dir.patch +++ b/debian/patches/create-logs-dir.patch @@ -1,7 +1,6 @@ From: Sophie Brun Date: Tue, 17 Aug 2021 16:23:52 +0200 Subject: Create logs dir - After first installation faraday will first fail because ~/.faraday/logs does not exist. After the failure when we run again faraday it works. @@ -14,7 +13,7 @@ 1 file changed, 3 insertions(+) diff --git a/faraday/server/config.py b/faraday/server/config.py -index 3ec9f2d..1d4fa9f 100644 +index 938b990..2332ba9 100644 --- a/faraday/server/config.py +++ b/faraday/server/config.py @@ -24,10 +24,13 @@ LOGGING_LEVEL = INFO diff --git a/debian/patches/dont-check-update.patch b/debian/patches/dont-check-update.patch index 3b21157..d31fc48 100644 --- a/debian/patches/dont-check-update.patch +++ b/debian/patches/dont-check-update.patch @@ -15,10 +15,10 @@ 1 file changed, 3 deletions(-) diff --git a/faraday/start_server.py b/faraday/start_server.py -index 1246f29..4f5107f 100644 +index bb84399..4ab2c68 100644 --- a/faraday/start_server.py +++ b/faraday/start_server.py -@@ -109,7 +109,6 @@ def main(): +@@ -121,7 +121,6 @@ def main(): check_postgresql() parser = argparse.ArgumentParser() parser.add_argument('--debug', action='store_true', help='run Faraday Server in debug mode') @@ -26,7 +26,7 @@ parser.add_argument('--no-setup', action='store_true', help=argparse.SUPPRESS) parser.add_argument('--port', type=int, help='Overides server.ini port configuration') parser.add_argument('--websocket_port', help='Overides server.ini websocket port configuration') -@@ -132,8 +131,6 @@ def main(): +@@ -144,8 +143,6 @@ def main(): if result == 0: logger.error("Faraday Server port in use. Check your processes and run the server again...") sys.exit(1) diff --git a/debian/patches/use-packaged-filteralchemy.patch b/debian/patches/use-packaged-filteralchemy.patch index 5f531e5..fbc755b 100644 --- a/debian/patches/use-packaged-filteralchemy.patch +++ b/debian/patches/use-packaged-filteralchemy.patch @@ -15,7 +15,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt -index a8bed82..8420bf7 100644 +index 6be4f75..9c188be 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,7 +26,7 @@ tqdm>=4.15.0 diff --git a/debian/patches/use-pgcli-debian-package.patch b/debian/patches/use-pgcli-debian-package.patch index 59b374c..0a5e341 100644 --- a/debian/patches/use-pgcli-debian-package.patch +++ b/debian/patches/use-pgcli-debian-package.patch @@ -14,7 +14,7 @@ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/faraday/manage.py b/faraday/manage.py -index 8d6e8e5..b88a8ad 100755 +index 00d5189..47b3347 100755 --- a/faraday/manage.py +++ b/faraday/manage.py @@ -29,6 +29,9 @@ if platform.system() == "Linux": @@ -28,7 +28,7 @@ import requests import alembic.command diff --git a/requirements.txt b/requirements.txt -index 93d8893..a8bed82 100644 +index 4c71014..6be4f75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ bleach>=3.3.0