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

updates for rethinkdb 2.4.9

Browse Source
This commit is contained in:
Barbara Miller 2023-05-18 17:16:04 -07:00
parent 1dc2e0395c
commit 4ad3cff415
9 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doublethink/orm.py
View File

@ -1,7 +1,7 @@
'''
doublethink/orm.py - rethinkdb ORM
Copyright (C) 2017-2019 Internet Archive
Copyright (C) 2017-2023 Internet Archive
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -16,10 +16,12 @@ See the License for the specific language governing permissions and
limitations under the License.
'''
import rethinkdb as r
import rethinkdb as rdb
import logging
import doublethink
r = rdb.RethinkDB()
class classproperty(object):
def __init__(self, fget):
self.fget = fget

6
doublethink/rethinker.py
View File

@ -1,7 +1,7 @@
'''
doublethink/rethinker.py - rethinkdb connection-manager
Copyright (C) 2015-2018 Internet Archive
Copyright (C) 2015-2023 Internet Archive
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -16,13 +16,15 @@ See the License for the specific language governing permissions and
limitations under the License.
'''
import rethinkdb as r
import rethinkdb as rdb
import logging
import random
import time
import types
import re
r = rdb.RethinkDB()
class RethinkerWrapper(object):
logger = logging.getLogger('doublethink.RethinkerWrapper')
def __init__(self, rr, wrapped):

6
doublethink/services.py
View File

@ -1,7 +1,7 @@
'''
doublethink/services.py - rethinkdb service registry
Copyright (C) 2015-2017 Internet Archive
Copyright (C) 2015-2023 Internet Archive
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -16,12 +16,14 @@ See the License for the specific language governing permissions and
limitations under the License.
'''
import rethinkdb as r
import rethinkdb as rdb
import logging
import socket
import os
import doublethink
r = rdb.RethinkDB()
class ServiceRegistry(object):
'''
Simple rethinkdb service registry.

4
setup.py
View File

@ -10,7 +10,7 @@ except:
setuptools.setup(
name='doublethink',
version='0.3.0',
version='0.4.0',
packages=['doublethink'],
classifiers=[
'Programming Language :: Python :: 2.7',
@ -19,7 +19,7 @@ setuptools.setup(
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
],
install_requires=['rethinkdb>=2.3,<2.4'],
install_requires=['rethinkdb>=2.4,<2.5'],
extras_require={'test': test_deps},
url='https://github.com/internetarchive/doublethink',
author='Noah Levitt',

6
tests/test_cli.py
View File

@ -1,7 +1,7 @@
'''
test_cli.py - unit tests for doublethink CLI
Copyright (C) 2015-2017 Internet Archive
Copyright (C) 2015-2023 Internet Archive
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -21,9 +21,11 @@ import doublethink.cli
import logging
import sys
import pytest
import rethinkdb as r
import rethinkdb as rdb
import pkg_resources
r = rdb.RethinkDB()
logging.basicConfig(stream=sys.stderr, level=logging.INFO,
format="%(asctime)s %(process)d %(levelname)s %(threadName)s %(name)s.%(funcName)s(%(filename)s:%(lineno)d) %(message)s")

4
tests/test_misc.py
View File

@ -20,9 +20,11 @@ import doublethink
import logging
import sys
import pytest
import rethinkdb as r
import rethinkdb as rdb
from doublethink import parse_rethinkdb_url
r = rdb.RethinkDB()
logging.basicConfig(
stream=sys.stderr, level=logging.INFO, format=(
'%(asctime)s %(process)d %(levelname)s %(threadName)s '

6
tests/test_orm.py
View File

@ -1,7 +1,7 @@
'''
tests_orm.py - unit tests for doublethink ORM
Copyright (C) 2015-2017 Internet Archive
Copyright (C) 2015-2023 Internet Archive
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -20,7 +20,9 @@ import doublethink
import logging
import sys
import pytest
import rethinkdb as r
import rethinkdb as rdb
r = rdb.RethinkDB()
logging.basicConfig(stream=sys.stderr, level=logging.INFO,
format="%(asctime)s %(process)d %(levelname)s %(threadName)s %(name)s.%(funcName)s(%(filename)s:%(lineno)d) %(message)s")

6
tests/test_rethinker.py
View File

@ -1,7 +1,7 @@
'''
tests_rethinker.py - unit tests for doublethink connection manager
Copyright (C) 2015-2018 Internet Archive
Copyright (C) 2015-2023 Internet Archive
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -22,13 +22,15 @@ import sys
import types
import gc
import pytest
import rethinkdb as r
import rethinkdb as rdb
import datetime
try:
from unittest import mock
except:
import mock
r = rdb.RethinkDB()
logging.basicConfig(stream=sys.stderr, level=logging.INFO,
format="%(asctime)s %(process)d %(levelname)s %(threadName)s %(name)s.%(funcName)s(%(filename)s:%(lineno)d) %(message)s")

6
tests/test_svcreg.py
View File

@ -1,7 +1,7 @@
'''
tests_rethinker.py - unit tests for doublethink
Copyright (C) 2015-2017 Internet Archive
Copyright (C) 2015-2023 Internet Archive
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -22,12 +22,14 @@ import sys
import types
import gc
import pytest
import rethinkdb as r
import rethinkdb as rdb
import time
import socket
import os
import datetime
r = rdb.RethinkDB()
logging.basicConfig(stream=sys.stderr, level=logging.INFO,
format="%(asctime)s %(process)d %(levelname)s %(threadName)s %(name)s.%(funcName)s(%(filename)s:%(lineno)d) %(message)s")