backup/warcprox
1
0
Fork 0
mirror of https://github.com/internetarchive/warcprox.git synced 2025-01-18 13:22:09 +01:00
Code Issues Projects Releases Activity

Merge pull request #192 from internetarchive/Py311

Browse Source 
updates for 3.11 (and back to 3.8)
@vbanos and @avdempsey have agreed this PR is ok to merge
This commit is contained in:
Barbara Miller 2023-09-27 12:03:26 -07:00 committed by GitHub
commit 4cb8e0d5dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
setup.py
View File

@ -2,7 +2,7 @@
''' '''
setup.py - setuptools installation configuration for warcprox setup.py - setuptools installation configuration for warcprox
Copyright (C) 2013-2022 Internet Archive Copyright (C) 2013-2023 Internet Archive
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -27,7 +27,7 @@ deps = [
'certauth==1.1.6', 'certauth==1.1.6',
'warctools>=4.10.0', 'warctools>=4.10.0',
'urlcanon>=0.3.0', 'urlcanon>=0.3.0',
'doublethink>=0.2.0.dev87', 'doublethink @ git+https://github.com/internetarchive/doublethink.git@Py311',
'urllib3>=1.23', 'urllib3>=1.23',
'requests>=2.0.1', 'requests>=2.0.1',
'PySocks>=1.6.8', 'PySocks>=1.6.8',
@ -44,7 +44,7 @@ except:
setuptools.setup( setuptools.setup(
name='warcprox', name='warcprox',
version='2.4.31', version='2.5',
description='WARC writing MITM HTTP/S proxy', description='WARC writing MITM HTTP/S proxy',
url='https://github.com/internetarchive/warcprox', url='https://github.com/internetarchive/warcprox',
author='Noah Levitt', author='Noah Levitt',
@ -53,7 +53,7 @@ setuptools.setup(
license='GPL', license='GPL',
packages=['warcprox'], packages=['warcprox'],
install_requires=deps, install_requires=deps,
extras_require={'trough': ['trough>=0.1.4',],}, extras_require={'trough': ['trough @ git+https://github.com/internetarchive/trough.git@jammy_focal',],},
setup_requires=['pytest-runner'], setup_requires=['pytest-runner'],
tests_require=['mock', 'pytest', 'warcio'], tests_require=['mock', 'pytest', 'warcio'],
entry_points={ entry_points={
@ -68,13 +68,12 @@ setuptools.setup(
'Development Status :: 5 - Production/Stable', 'Development Status :: 5 - Production/Stable',
'Environment :: Console', 'Environment :: Console',
'License :: OSI Approved :: GNU General Public License (GPL)', 'License :: OSI Approved :: GNU General Public License (GPL)',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Topic :: Internet :: Proxy Servers', 'Topic :: Internet :: Proxy Servers',
'Topic :: Internet :: WWW/HTTP', 'Topic :: Internet :: WWW/HTTP',
'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Software Development :: Libraries :: Python Modules',
'Topic :: System :: Archiving', 'Topic :: System :: Archiving',
]) ])

2
warcprox/bigtable.py
View File

@ -33,7 +33,7 @@ import hashlib
import threading import threading
import datetime import datetime
import doublethink import doublethink
import rethinkdb as r from rethinkdb import RethinkDB; r = RethinkDB()
from warcprox.dedup import DedupableMixin from warcprox.dedup import DedupableMixin
class RethinkCaptures: class RethinkCaptures:

2
warcprox/stats.py
View File

@ -29,7 +29,7 @@ import doublethink
import json import json
import logging import logging
import os import os
import rethinkdb as r from rethinkdb import RethinkDB; r = RethinkDB()
import sqlite3 import sqlite3
import threading import threading
import time import time