From c8638537e3199d57d950b9b6d5ab5c371727f763 Mon Sep 17 00:00:00 2001 From: Cristian Date: Mon, 2 Nov 2020 08:32:49 -0500 Subject: [PATCH 1/2] fix: Move wheel in setup.py to avoid wheel building issue --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b250a491..cdec8133 100755 --- a/setup.py +++ b/setup.py @@ -44,6 +44,9 @@ setuptools.setup( url=REPO_URL, project_urls=PROJECT_URLS, python_requires=">=3.7", + setup_requires=[ + "wheel", + ], install_requires=[ "requests==2.24.0", "atomicwrites==1.4.0", @@ -67,7 +70,6 @@ setuptools.setup( extras_require={ 'dev': [ "setuptools", - "wheel", "twine", "flake8", "ipdb", From ac0ec160d141a2a1d7fd4053fd7294bdb07ef2cc Mon Sep 17 00:00:00 2001 From: Cristian Date: Mon, 2 Nov 2020 08:51:48 -0500 Subject: [PATCH 2/2] lint: Fix warnings in master branch --- archivebox/core/settings.py | 1 - archivebox/extractors/mercury.py | 2 +- archivebox/logging_util.py | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py index 3417beb2..28a3e1fe 100644 --- a/archivebox/core/settings.py +++ b/archivebox/core/settings.py @@ -25,7 +25,6 @@ IS_SHELL = 'shell' in sys.argv[:3] or 'shell_plus' in sys.argv[:3] ### Django Core Settings ################################################################################ -DEBUG = True WSGI_APPLICATION = 'core.wsgi.application' ROOT_URLCONF = 'core.urls' diff --git a/archivebox/extractors/mercury.py b/archivebox/extractors/mercury.py index 5fec1961..741c3291 100644 --- a/archivebox/extractors/mercury.py +++ b/archivebox/extractors/mercury.py @@ -3,7 +3,7 @@ __package__ = 'archivebox.extractors' from pathlib import Path from subprocess import CompletedProcess -from typing import Optional, Tuple, List +from typing import Optional, List import json from ..index.schema import Link, ArchiveResult, ArchiveError diff --git a/archivebox/logging_util.py b/archivebox/logging_util.py index 1a81fd79..1c92eba2 100644 --- a/archivebox/logging_util.py +++ b/archivebox/logging_util.py @@ -4,7 +4,6 @@ import re import os import sys import time -import platform import argparse from math import log from multiprocessing import Process