diff --git a/setup.py b/setup.py index cdb646ce..fee3441c 100755 --- a/setup.py +++ b/setup.py @@ -14,22 +14,22 @@ class PyTest(TestCommand): import pytest import sys import os - cmdline = ' --cov rezag -v test/' + cmdline = ' --cov webagg -v test/' errcode = pytest.main(cmdline) sys.exit(errcode) setup( - name='rezag', + name='webagg', version='1.0', author='Ilya Kreymer', author_email='ikreymer@gmail.com', - license='MIT', + license='Apache 2.0', packages=find_packages(), - url='https://github.com/webrecorder/rezag', + url='https://github.com/webrecorder/webagg', description='Resource Aggregator', long_description=open('README.rst').read(), provides=[ - 'rezag', + 'webagg', ], install_requires=[ 'pywb==1.0b', diff --git a/test/test_dir_agg.py b/test/test_dir_agg.py index 7fe75920..2500b9cf 100644 --- a/test/test_dir_agg.py +++ b/test/test_dir_agg.py @@ -5,8 +5,8 @@ import json from .testutils import to_path -from rezag.aggindexsource import DirectoryIndexSource, SimpleAggregator -from rezag.indexsource import MementoIndexSource +from webagg.aggregator import DirectoryIndexSource, SimpleAggregator +from webagg.indexsource import MementoIndexSource #============================================================================= diff --git a/test/test_handlers.py b/test/test_handlers.py index 1c8ec45e..043b6aea 100644 --- a/test/test_handlers.py +++ b/test/test_handlers.py @@ -2,14 +2,14 @@ from gevent import monkey; monkey.patch_all(thread=False) from collections import OrderedDict -from rezag.handlers import DefaultResourceHandler, HandlerSeq +from webagg.handlers import DefaultResourceHandler, HandlerSeq -from rezag.indexsource import MementoIndexSource, FileIndexSource, LiveIndexSource -from rezag.aggindexsource import GeventTimeoutAggregator, SimpleAggregator -from rezag.aggindexsource import DirectoryIndexSource +from webagg.indexsource import MementoIndexSource, FileIndexSource, LiveIndexSource +from webagg.aggregator import GeventTimeoutAggregator, SimpleAggregator +from webagg.aggregator import DirectoryIndexSource -from rezag.app import add_route, application -from rezag.utils import MementoUtils +from webagg.app import add_route, application +from webagg.utils import MementoUtils import webtest import bottle diff --git a/test/test_indexsource.py b/test/test_indexsource.py index b69206cd..90a3e156 100644 --- a/test/test_indexsource.py +++ b/test/test_indexsource.py @@ -1,7 +1,7 @@ -from rezag.indexsource import FileIndexSource, RemoteIndexSource, MementoIndexSource, RedisIndexSource -from rezag.indexsource import LiveIndexSource +from webagg.indexsource import FileIndexSource, RemoteIndexSource, MementoIndexSource, RedisIndexSource +from webagg.indexsource import LiveIndexSource -from rezag.aggindexsource import SimpleAggregator +from webagg.aggregator import SimpleAggregator from pywb.utils.timeutils import timestamp_now diff --git a/test/test_memento_agg.py b/test/test_memento_agg.py index 0e5ded7c..c323da13 100644 --- a/test/test_memento_agg.py +++ b/test/test_memento_agg.py @@ -1,16 +1,16 @@ from gevent import monkey; monkey.patch_all(thread=False) -from rezag.aggindexsource import SimpleAggregator, GeventTimeoutAggregator -from rezag.aggindexsource import ThreadedTimeoutAggregator, BaseAggregator +from webagg.aggregator import SimpleAggregator, GeventTimeoutAggregator +from webagg.aggregator import ThreadedTimeoutAggregator, BaseAggregator -from rezag.indexsource import FileIndexSource, RemoteIndexSource, MementoIndexSource +from webagg.indexsource import FileIndexSource, RemoteIndexSource, MementoIndexSource from .testutils import json_list, to_path import json import pytest import time -from rezag.handlers import IndexHandler +from webagg.handlers import IndexHandler sources = { diff --git a/test/test_timeouts.py b/test/test_timeouts.py index 263d21f3..04370c5d 100644 --- a/test/test_timeouts.py +++ b/test/test_timeouts.py @@ -1,9 +1,9 @@ from gevent import monkey; monkey.patch_all(thread=False) import time -from rezag.indexsource import FileIndexSource +from webagg.indexsource import FileIndexSource -from rezag.aggindexsource import SimpleAggregator, TimeoutMixin -from rezag.aggindexsource import GeventTimeoutAggregator, GeventTimeoutAggregator +from webagg.aggregator import SimpleAggregator, TimeoutMixin +from webagg.aggregator import GeventTimeoutAggregator, GeventTimeoutAggregator from .testutils import json_list diff --git a/rezag/__init__.py b/webagg/__init__.py similarity index 100% rename from rezag/__init__.py rename to webagg/__init__.py diff --git a/rezag/aggindexsource.py b/webagg/aggregator.py similarity index 99% rename from rezag/aggindexsource.py rename to webagg/aggregator.py index 02885f58..544ffd55 100644 --- a/rezag/aggindexsource.py +++ b/webagg/aggregator.py @@ -15,7 +15,7 @@ from heapq import merge from collections import deque from itertools import chain -from rezag.indexsource import FileIndexSource +from webagg.indexsource import FileIndexSource from pywb.utils.wbexception import NotFoundException, WbException import six import glob diff --git a/rezag/app.py b/webagg/app.py similarity index 96% rename from rezag/app.py rename to webagg/app.py index 23f20bce..baa61a35 100644 --- a/rezag/app.py +++ b/webagg/app.py @@ -1,4 +1,4 @@ -from rezag.inputrequest import DirectWSGIInputRequest, POSTInputRequest +from webagg.inputrequest import DirectWSGIInputRequest, POSTInputRequest from bottle import route, request, response, default_app, abort import bottle diff --git a/rezag/handlers.py b/webagg/handlers.py similarity index 97% rename from rezag/handlers.py rename to webagg/handlers.py index fdc6cc65..6f05405a 100644 --- a/rezag/handlers.py +++ b/webagg/handlers.py @@ -1,5 +1,5 @@ -from rezag.responseloader import WARCPathLoader, LiveWebLoader -from rezag.utils import MementoUtils +from webagg.responseloader import WARCPathLoader, LiveWebLoader +from webagg.utils import MementoUtils from pywb.utils.wbexception import BadRequestException, WbException from pywb.utils.wbexception import NotFoundException from bottle import response diff --git a/rezag/indexsource.py b/webagg/indexsource.py similarity index 98% rename from rezag/indexsource.py rename to webagg/indexsource.py index 06822150..269df379 100644 --- a/rezag/indexsource.py +++ b/webagg/indexsource.py @@ -9,9 +9,9 @@ from pywb.utils.wbexception import NotFoundException from pywb.cdx.cdxobject import CDXObject from pywb.cdx.query import CDXQuery -from rezag.liverec import patched_requests as requests +from webagg.liverec import patched_requests as requests -from rezag.utils import MementoUtils +from webagg.utils import MementoUtils WAYBACK_ORIG_SUFFIX = '{timestamp}id_/{url}' diff --git a/rezag/inputrequest.py b/webagg/inputrequest.py similarity index 100% rename from rezag/inputrequest.py rename to webagg/inputrequest.py diff --git a/rezag/liverec.py b/webagg/liverec.py similarity index 100% rename from rezag/liverec.py rename to webagg/liverec.py diff --git a/rezag/responseloader.py b/webagg/responseloader.py similarity index 98% rename from rezag/responseloader.py rename to webagg/responseloader.py index 774d7c34..0bacb440 100644 --- a/rezag/responseloader.py +++ b/webagg/responseloader.py @@ -1,7 +1,7 @@ -from rezag.liverec import BaseRecorder -from rezag.liverec import request as remote_request +from webagg.liverec import BaseRecorder +from webagg.liverec import request as remote_request -from rezag.utils import MementoUtils +from webagg.utils import MementoUtils from pywb.utils.timeutils import timestamp_to_datetime, datetime_to_http_date from pywb.utils.timeutils import iso_date_to_datetime diff --git a/rezag/utils.py b/webagg/utils.py similarity index 100% rename from rezag/utils.py rename to webagg/utils.py