Skip to content

updates for Python 3.11 #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 27, 2023
Merged

updates for Python 3.11 #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
99a825c
initial commit, trying trough branch jammy+focal
Sep 11, 2023
a90c9c3
trough 0.20 maybe
Sep 12, 2023
5e779af
trough and doublethink updates
Sep 12, 2023
3b5d9d8
update rethinkdb import
Sep 12, 2023
4fbf523
get doublethink from github.com/internetarchive
Sep 12, 2023
c620d7d
use galgeek for now
Sep 14, 2023
8f0039d
internetarchive/doublethink.git@Py311
Sep 19, 2023
bc0da12
bump version for Py311
galgeek Sep 20, 2023
a20ad22
update version to 2.5, for Python version updates
galgeek Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,7 +27,7 @@
'certauth==1.1.6',
'warctools>=4.10.0',
'urlcanon>=0.3.0',
'doublethink>=0.2.0.dev87',
'doublethink @ git+https://github.com/internetarchive/doublethink.git@Py311',
'urllib3>=1.23',
'requests>=2.0.1',
'PySocks>=1.6.8',
Expand All @@ -44,7 +44,7 @@

setuptools.setup(
name='warcprox',
version='2.4.31',
version='2.5',
description='WARC writing MITM HTTP/S proxy',
url='https://github.com/internetarchive/warcprox',
author='Noah Levitt',
Expand All @@ -53,7 +53,7 @@
license='GPL',
packages=['warcprox'],
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'],
tests_require=['mock', 'pytest', 'warcio'],
entry_points={
Expand All @@ -68,13 +68,12 @@
'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',
'Topic :: System :: Archiving',
])

2 changes: 1 addition & 1 deletion warcprox/bigtable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import threading
import datetime
import doublethink
import rethinkdb as r
from rethinkdb import RethinkDB; r = RethinkDB()
from warcprox.dedup import DedupableMixin

class RethinkCaptures:
Expand Down
2 changes: 1 addition & 1 deletion warcprox/stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import json
import logging
import os
import rethinkdb as r
from rethinkdb import RethinkDB; r = RethinkDB()
import sqlite3
import threading
import time
Expand Down