Rename part 1

Author: boxed

HISTORY.rst

@@ -147,7 +147,7 @@ Changelog
 
 * New feature: default sort ordering. Just pass `default_sort_order` to `Table`.
 
-* `Link` class is now just inherited from tri.form `Link`. Introduced a deprecation warning for the constructor argument `url`.
+* `Link` class is now just inherited from tri_form `Link`. Introduced a deprecation warning for the constructor argument `url`.
 
 * Simplified `prepare` handling for `Table`. You should no longer need to care about this for most operations. You will still need to call `prepare` to trigger the parsing of URL parameters for sorting etc.
 

MANIFEST.in

@@ -5,6 +5,6 @@ include LICENSE
 include README.rst
 include requirements.txt
 include test_requirements.txt
-recursive-include lib/tri/table/templates *
+recursive-include lib/tri_table/templates *
 include table.scss
-include table.css
+include table.css

doc_output.py

@@ -1,7 +1,7 @@
-from tri.declarative import *
-from tri.table import *
-from tri.query import *
-from tri.query import MISSING as q_MISSING
+from tri_declarative import *
+from tri_table import *
+from tri_query import *
+from tri_query import MISSING as q_MISSING
 
 documentation = {
     'Table': documentation_tree(Table),

docs/architecture_overview.rst

@@ -11,7 +11,7 @@ Declarative/programmatic hybrid API
 -----------------------------------
 
 The ``@declarative``, ``@with_meta`` and ``@creation_ordered``
-decorators from tri.declarative enables us to very easily write an API
+decorators from tri_declarative enables us to very easily write an API
 that can look both like a normal simple python API:
 
 .. code:: python
@@ -59,7 +59,7 @@ Namespace dispatching
 
 I've already hinted at this above in the example where we do
 ``column__foo__show=False``. This is an example of the powerful
-namespace dispatch mechanism from tri.declarative. It's inspired by the
+namespace dispatch mechanism from tri_declarative. It's inspired by the
 query syntax of Django where you use ``__`` to jump namespace. (If
 you're not familiar with Django, here's the gist of it: you can do
 ``Table.objects.filter(foreign_key__column='foo')``
@@ -69,7 +69,7 @@ still keeping the code simple. Here's a contrived example:
 
 .. code:: python
 
-    from tri.declarative import dispatch, EMPTY
+    from tri_declarative import dispatch, EMPTY
 
 
     @dispatch(

docs/conf.py

@@ -28,13 +28,13 @@
 # version is used.
 sys.path.insert(0, project_root)
 
-import tri.table
-import tri.query
-import tri.form
+import tri_table
+import tri_query
+import tri_form
 
-from tri.declarative import generate_rst_docs
+from tri_declarative import generate_rst_docs
 
-generate_rst_docs('.', [tri.table.Table, tri.table.Column, tri.query.Query, tri.query.Variable, tri.form.Form, tri.form.Field, tri.form.Link], (tri.form.MISSING, tri.query.MISSING))
+generate_rst_docs('.', [tri_table.Table, tri_table.Column, tri_query.Query, tri_query.Variable, tri_form.Form, tri_form.Field, tri_form.Link], (tri_form.MISSING, tri_query.MISSING))
 
 # -- General configuration -----------------------------------------------------
 
@@ -62,17 +62,17 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'tri.table'
+project = u'tri_table'
 copyright = u'2015, Anders Hovmöller'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = tri.table.__version__
+version = tri_table.__version__
 # The full version, including alpha/beta/rc tags.
-release = tri.table.__version__
+release = tri_table.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -190,7 +190,7 @@
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'tri.tablesdoc'
+htmlhelp_basename = 'tri_tablesdoc'
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -209,7 +209,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'tri.table.tex', u'tri.table Documentation',
+  ('index', 'tri_table.tex', u'tri_table Documentation',
    u'Anders Hovmöller', 'manual'),
 ]
 
@@ -239,7 +239,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'tri.table', u'tri.table Documentation',
+    ('index', 'tri_table', u'tri_table Documentation',
      [u'Anders Hovmöller'], 1)
 ]
 
@@ -253,8 +253,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'tri.table', u'tri.table Documentation',
-   u'Anders Hovmöller', 'tri.table', 'One line description of project.',
+  ('index', 'tri_table', u'tri_table Documentation',
+   u'Anders Hovmöller', 'tri_table', 'One line description of project.',
    'Miscellaneous'),
 ]
 

docs/usage.rst

@@ -3,9 +3,9 @@ Usage
 
 You need to add `tri.table` to installed apps or copy the templates to your own template directory.
 
-Other than that it should just be to `from tri.table import Table, Column` and off you go.
+Other than that it should just be to `from tri_table import Table, Column` and off you go.
 
 Styling
 -------
 
-There is a `table.scss` file included with the project that provides a default styling for the table if you want a fast and easy starting point for styling.
+There is a `table.scss` file included with the project that provides a default styling for the table if you want a fast and easy starting point for styling.

examples/examples/views.py

@@ -1,8 +1,8 @@
 from .models import Bar, Foo
 from os.path import dirname, abspath, join
 from django.http import HttpResponse
-from tri.table import Table, render_table_to_response
-from tri.table import Column
+from tri_table import Table, render_table_to_response
+from tri_table import Column
 
 
 def index(request):

lib/tri/table/__init__.py

@@ -30,7 +30,7 @@
     format_html,
 )
 from django.utils.safestring import mark_safe
-from tri.declarative import (
+from tri_declarative import (
     class_shortcut,
     creation_ordered,
     declarative,
@@ -49,7 +49,7 @@
     sort_after,
     with_meta,
 )
-from tri.form import (
+from tri_form import (
     create_members_from_model,
     DISPATCH_PATH_SEPARATOR,
     evaluate_and_group_links,
@@ -60,25 +60,25 @@
     member_from_model,
     render_template,
 )
-from tri.form.render import (
+from tri_form.render import (
     render_attrs,
     render_class,
 )
-from tri.named_struct import (
+from tri_named_struct import (
     NamedStruct,
     NamedStructField,
 )
-from tri.query import (
+from tri_query import (
     Q_OP_BY_OP,
     Query,
     QueryException,
 )
-from tri.struct import (
+from tri_struct import (
     merged,
     Struct,
 )
 
-from tri.table.db_compat import setup_db_compat
+from tri_table.db_compat import setup_db_compat
 
 __version__ = '7.0.2'  # pragma: no mutate
 

lib/tri/table/db_compat.py

@@ -1,12 +1,12 @@
-from tri.declarative import Shortcut
+from tri_declarative import Shortcut
 
 
 def setup_db_compat():
     setup_db_compat_django()
 
 
 def setup_db_compat_django():
-    from tri.table import register_column_factory
+    from tri_table import register_column_factory
     try:
         # noinspection PyUnresolvedReferences
         from django.db.models import IntegerField, FloatField, TextField, BooleanField, AutoField, CharField, DateField, DateTimeField, DecimalField, EmailField, TimeField, ForeignKey, ManyToOneRel, ManyToManyField, ManyToManyRel

setup.py

@@ -15,7 +15,7 @@ def read_reqs(name):
 
 
 def read_version():
-    with open(os.path.join('lib', 'tri/table', '__init__.py'), encoding='utf8') as f:
+    with open(os.path.join('lib', 'tri_table', '__init__.py'), encoding='utf8') as f:
         m = re.search(r'''__version__\s*=\s*['"]([^'"]*)['"]''', f.read())
         if m:
             return m.group(1)