diff --git a/MANIFEST.in b/MANIFEST.in index 55a0460d..696c1146 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1 @@ -recursive-include immutabase/static * +recursive-include datasette/static * diff --git a/datasette/.DS_Store b/datasette/.DS_Store new file mode 100644 index 00000000..459d1977 Binary files /dev/null and b/datasette/.DS_Store differ diff --git a/immutabase/__init__.py b/datasette/__init__.py similarity index 100% rename from immutabase/__init__.py rename to datasette/__init__.py diff --git a/immutabase/app.py b/datasette/app.py similarity index 99% rename from immutabase/app.py rename to datasette/app.py index af68b54f..9f48bf24 100644 --- a/immutabase/app.py +++ b/datasette/app.py @@ -466,13 +466,13 @@ def app_factory(files, num_threads=3): jinja = SanicJinja2( app, loader=FileSystemLoader([ - str(app_root / 'immutabase' / 'templates') + str(app_root / 'datasette' / 'templates') ]) ) app.add_route(IndexView.as_view(files, jinja, executor), '/') # TODO: /favicon.ico and /-/static/ deserve far-future cache expires app.add_route(favicon, '/favicon.ico') - app.static('/-/static/', str(app_root / 'immutabase' / 'static')) + app.static('/-/static/', str(app_root / 'datasette' / 'static')) app.add_route( DatabaseView.as_view(files, jinja, executor), '/' diff --git a/immutabase/cli.py b/datasette/cli.py similarity index 92% rename from immutabase/cli.py rename to datasette/cli.py index fda822e9..4131b52b 100644 --- a/immutabase/cli.py +++ b/datasette/cli.py @@ -6,7 +6,7 @@ from .app import app_factory, ensure_build_metadata @click.group(cls=DefaultGroup, default='serve', default_if_no_args=True) def cli(): """ - Immutabase! + Datasette! """ @@ -26,7 +26,7 @@ def serve(files, host, port, debug, reload): """Serve up specified database files with a web UI""" if reload: import hupper - hupper.start_reloader('immutabase.cli.serve') + hupper.start_reloader('datasette.cli.serve') click.echo('Serve! files={} on port {}'.format(files, port)) app = app_factory(files) diff --git a/immutabase/static/bootstrap-4.0.0-beta.2.min.css b/datasette/static/bootstrap-4.0.0-beta.2.min.css similarity index 100% rename from immutabase/static/bootstrap-4.0.0-beta.2.min.css rename to datasette/static/bootstrap-4.0.0-beta.2.min.css diff --git a/immutabase/templates/base.html b/datasette/templates/base.html similarity index 100% rename from immutabase/templates/base.html rename to datasette/templates/base.html diff --git a/immutabase/templates/database.html b/datasette/templates/database.html similarity index 100% rename from immutabase/templates/database.html rename to datasette/templates/database.html diff --git a/immutabase/templates/index.html b/datasette/templates/index.html similarity index 100% rename from immutabase/templates/index.html rename to datasette/templates/index.html diff --git a/immutabase/templates/row.html b/datasette/templates/row.html similarity index 100% rename from immutabase/templates/row.html rename to datasette/templates/row.html diff --git a/immutabase/templates/table.html b/datasette/templates/table.html similarity index 100% rename from immutabase/templates/table.html rename to datasette/templates/table.html diff --git a/setup.py b/setup.py index 5e1b037f..7e699d14 100644 --- a/setup.py +++ b/setup.py @@ -1,10 +1,10 @@ from setuptools import setup, find_packages setup( - name='immutabase', + name='datasette', version='0.1', packages=find_packages(), - package_data={'immutabase': ['templates/*.html']}, + package_data={'datasette': ['templates/*.html']}, include_package_data=True, install_requires=[ 'click==6.7', @@ -15,7 +15,7 @@ setup( ], entry_points=''' [console_scripts] - immutabase=immutabase.cli:cli + datasette=datasette.cli:cli ''', setup_requires=['pytest-runner'], tests_require=['pytest'], diff --git a/test_helpers.py b/test_helpers.py index 8e970f5e..1e65f924 100644 --- a/test_helpers.py +++ b/test_helpers.py @@ -1,4 +1,4 @@ -from immutabase import app +from datasette import app import pytest import json