Merge branch 'release/0.4'

.travis.yml

@@ -6,3 +6,7 @@ install:
   - pip install -r requirements.txt
   - pip install -r tests-requirements.txt
 script: py.test
+
+before_script:
+  - psql -c 'create database eloquent_test;' -U postgres
+  - mysql -e 'create database eloquent_test;'

CHANGELOG.md

@@ -1,3 +1,18 @@
+### 0.4
+
+(April 28th, 2015)
+
+- Adds Schema Builder
+- Adds scopes support
+- Adds support for related name in relationships declaration
+
+### 0.3.1
+
+(April 19th, 2015)
+
+- Fix MySQLdb compatibiity issues
+- Fix wrong default key value for Builder.lists() method
+
 ### 0.3
 
 (April 3th, 2015)

README.rst

@@ -30,7 +30,7 @@ The different dbapi packages are not part of the package dependencies,
 so you must install them in order to connect to corresponding databases:
 
 * Postgres: ``pyscopg2``
-* MySQL: ``PyMySQL`` or ``MySQL-python``
+* MySQL: ``PyMySQL`` or ``mysqlclient``
 * Sqlite: The ``sqlite3`` module is bundled with Python by default
 
 

docs/_static/theme_overrides.css

@@ -4,6 +4,7 @@
 
 body {
     font: 400 14px/28px "Roboto",sans-serif;
+    color: #7A7A7A;
 }
 
 .wy-body-for-nav {
@@ -110,6 +111,40 @@ article ul li {
     background: none;
 }
 
+.rst-content table.docutils,
+.rst-content table.field-list {
+    border: medium none;
+    width: 100%;
+}
+
+.rst-content table.docutils thead th,
+.rst-content table.field-list thead th
+{
+    font-family: "Montserrat", serif;
+    text-transform: uppercase;
+    color: #7A7A7A;
+    font-weight: 500;
+}
+
+.rst-content table.docutils thead th,
+.rst-content table.field-list thead th,
+.rst-content table.docutils tbody td,
+.rst-content table.field-list tbody td
+{
+    border-top: 0;
+    border-bottom: 1px solid rgba(230, 230, 230, 0.7);
+    border-left: 0;
+    border-right: 0;
+    padding: 20px;
+    white-space: pre-wrap;
+}
+
+.wy-table-odd td,
+.wy-table-striped tr:nth-child(2n-1) td,
+.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td {
+    background: none;
+}
+
 .rst-content .highlighted {
     background: rgba(205, 220, 57, 0.7);
     border: 1px solid rgba(205, 220, 57, 0.9);
@@ -448,7 +483,24 @@ green     #859900  operators, other keywords
 .highlight .o { color: #7A7A7A } /* Operator */
 .highlight .n { color: #7A7A7A }
 .highlight .c { color: #B8AFAD; font-style: normal; }
+.highlight .sd { color: #B8AFAD; font-style: normal; }
 .highlight .nl { color: #A89BB9 } /* Name.Label */
 .highlight .nn { color: #A89BB9 } /* Name.Namespace */
 .highlight .nx { color: #A89BB9 } /* Name.Other */
 .highlight .py { color: #A89BB9 } /* Name.Property */
+
+/* Inline code */
+
+tt.code, code.code {
+    border: 1px solid #F2F2F2;
+    font-weight: normal;
+    display: inline;
+    padding: 0.3em 0.5em;
+    background-color: #FAFAFA;
+}
+tt.code .name, code.code .name { color: #7A7A7A }
+tt.code .operator, code.code .operator { color: #7A7A7A }
+tt.code .punctuation, code.code .punctuation { color: #7A7A7A }
+tt.code .string, code.code .string { color: #7BBDA4 }
+tt.code .number, code.code .number { color: #F4BC87 }
+tt.code .integer, code.code .integer { color: #F4BC87 }

docs/conf.py

@@ -53,9 +53,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.3'
+version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.1'
+release = '0.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/index.rst

@@ -13,3 +13,4 @@ but modified to be more pythonic.
     basic_usage
     query_builder
     orm
+    schema_builder

docs/installation.rst

@@ -17,5 +17,5 @@ You can install Eloquent in 2 different ways:
     so you must install them in order to connect to corresponding databases:
 
     * PostgreSQL: ``pyscopg2``
-    * MySQL: ``PyMySQL`` or ``MySQL-python``
+    * MySQL: ``PyMySQL`` or ``mysqlclient``
     * SQLite: The ``sqlite3`` module is bundled with Python by default