From 99a825c055c8abe4358064e7cb3c134a75c0cd5d Mon Sep 17 00:00:00 2001 From: Barbara Miller Date: Mon, 11 Sep 2023 16:40:39 -0700 Subject: [PATCH 1/9] initial commit, trying trough branch jammy+focal --- setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index fdebe60..fb10b29 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ ''' 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 modify it under the terms of the GNU General Public License @@ -53,7 +53,7 @@ setuptools.setup( license='GPL', packages=['warcprox'], install_requires=deps, - extras_require={'trough': ['trough>=0.1.4',],}, + extras_require={'trough': ['git+https://github.com/internetarchive/trough.git@jammy_focal',],}, setup_requires=['pytest-runner'], tests_require=['mock', 'pytest', 'warcio'], entry_points={ @@ -68,10 +68,10 @@ setuptools.setup( 'Development Status :: 5 - Production/Stable', 'Environment :: Console', '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.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Topic :: Internet :: Proxy Servers', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Software Development :: Libraries :: Python Modules', From a90c9c3dd466c5066440f55ab6a465edf4917d22 Mon Sep 17 00:00:00 2001 From: Barbara Miller Date: Mon, 11 Sep 2023 17:01:02 -0700 Subject: [PATCH 2/9] trough 0.20 maybe --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fb10b29..6c1b0f6 100755 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ setuptools.setup( license='GPL', packages=['warcprox'], install_requires=deps, - extras_require={'trough': ['git+https://github.com/internetarchive/trough.git@jammy_focal',],}, + extras_require={'trough': ['0.20',],}, setup_requires=['pytest-runner'], tests_require=['mock', 'pytest', 'warcio'], entry_points={ From 5e779af2e90e94d37e048d2b527fb596aff9885d Mon Sep 17 00:00:00 2001 From: Barbara Miller Date: Mon, 11 Sep 2023 17:38:10 -0700 Subject: [PATCH 3/9] trough and doublethink updates --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 6c1b0f6..06b3e7c 100755 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ deps = [ 'certauth==1.1.6', 'warctools>=4.10.0', 'urlcanon>=0.3.0', - 'doublethink>=0.2.0.dev87', + 'doublethink @ git+https://github.com/galgeek/doublethink.git@two_dot_four', 'urllib3>=1.23', 'requests>=2.0.1', 'PySocks>=1.6.8', @@ -53,7 +53,7 @@ setuptools.setup( license='GPL', packages=['warcprox'], install_requires=deps, - extras_require={'trough': ['0.20',],}, + extras_require={'trough': ['trough @ git+https://github.com/internetarchive/trough.git@jammy_focal',],}, setup_requires=['pytest-runner'], tests_require=['mock', 'pytest', 'warcio'], entry_points={ @@ -77,4 +77,3 @@ setuptools.setup( 'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: System :: Archiving', ]) - From 3b5d9d8ef0e15c1b25f9511bd387a1c564371b3c Mon Sep 17 00:00:00 2001 From: Barbara Miller Date: Tue, 12 Sep 2023 14:39:09 -0700 Subject: [PATCH 4/9] update rethinkdb import --- warcprox/bigtable.py | 2 +- warcprox/stats.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/warcprox/bigtable.py b/warcprox/bigtable.py index ff2ad0a..043c044 100644 --- a/warcprox/bigtable.py +++ b/warcprox/bigtable.py @@ -33,7 +33,7 @@ import hashlib import threading import datetime import doublethink -import rethinkdb as r +from rethinkdb import RethinkDB; r = RethinkDB() from warcprox.dedup import DedupableMixin class RethinkCaptures: diff --git a/warcprox/stats.py b/warcprox/stats.py index 3bc560e..e1e2d85 100644 --- a/warcprox/stats.py +++ b/warcprox/stats.py @@ -29,7 +29,7 @@ import doublethink import json import logging import os -import rethinkdb as r +from rethinkdb import RethinkDB; r = RethinkDB() import sqlite3 import threading import time From 4fbf523a3ecc0f270932b629aa9151869ca7ca5b Mon Sep 17 00:00:00 2001 From: Barbara Miller Date: Tue, 12 Sep 2023 16:05:23 -0700 Subject: [PATCH 5/9] get doublethink from github.com/internetarchive --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 06b3e7c..89ad8d0 100755 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ deps = [ 'certauth==1.1.6', 'warctools>=4.10.0', 'urlcanon>=0.3.0', - 'doublethink @ git+https://github.com/galgeek/doublethink.git@two_dot_four', + 'doublethink @ git+https://github.com/internetarchive/doublethink.git@two_dot_four', 'urllib3>=1.23', 'requests>=2.0.1', 'PySocks>=1.6.8', From c620d7dd19138bf4f3c1260c00dd950fe4cc3fae Mon Sep 17 00:00:00 2001 From: Barbara Miller Date: Wed, 13 Sep 2023 18:03:38 -0700 Subject: [PATCH 6/9] use galgeek for now --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 89ad8d0..06b3e7c 100755 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ deps = [ 'certauth==1.1.6', 'warctools>=4.10.0', 'urlcanon>=0.3.0', - 'doublethink @ git+https://github.com/internetarchive/doublethink.git@two_dot_four', + 'doublethink @ git+https://github.com/galgeek/doublethink.git@two_dot_four', 'urllib3>=1.23', 'requests>=2.0.1', 'PySocks>=1.6.8', From 8f0039de02e73f43ed73f812fdda0e263314c513 Mon Sep 17 00:00:00 2001 From: Barbara Miller Date: Tue, 19 Sep 2023 13:57:34 -0700 Subject: [PATCH 7/9] internetarchive/doublethink.git@Py311 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 06b3e7c..81b36c0 100755 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ deps = [ 'certauth==1.1.6', 'warctools>=4.10.0', 'urlcanon>=0.3.0', - 'doublethink @ git+https://github.com/galgeek/doublethink.git@two_dot_four', + 'doublethink @ git+https://github.com/internetarchive/doublethink.git@Py311', 'urllib3>=1.23', 'requests>=2.0.1', 'PySocks>=1.6.8', From bc0da12c484fef7c099eaa216d92b6ff8acc084a Mon Sep 17 00:00:00 2001 From: Barbara Miller Date: Wed, 20 Sep 2023 10:57:54 -0700 Subject: [PATCH 8/9] bump version for Py311 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 81b36c0..d725b1b 100755 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ except: setuptools.setup( name='warcprox', - version='2.4.31', + version='2.4.32', description='WARC writing MITM HTTP/S proxy', url='https://github.com/internetarchive/warcprox', author='Noah Levitt', From a20ad226cb640fb17d04ac71afe6cac46cb245d1 Mon Sep 17 00:00:00 2001 From: Barbara Miller Date: Wed, 27 Sep 2023 11:58:39 -0700 Subject: [PATCH 9/9] update version to 2.5, for Python version updates --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d725b1b..d6e758b 100755 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ except: setuptools.setup( name='warcprox', - version='2.4.32', + version='2.5', description='WARC writing MITM HTTP/S proxy', url='https://github.com/internetarchive/warcprox', author='Noah Levitt',