Skip to content

Commit 01610ce

Browse files
committed
Merge branch 'release/0.7.1'
2 parents a53ba1c + 1098d2c commit 01610ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+3281
-769
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
dist
77
build
88
_build
9+
.cache
910

1011
# Installer logs
1112
pip-log.txt
@@ -25,5 +26,8 @@ config.py
2526
/migrations
2627
/seeders
2728
development.db
29+
*orator.yml
30+
/docs/orator/
31+
profile.html
2832

2933
Makefile

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
### 0.7.1
2+
3+
(November 30th, 2015)
4+
5+
##### Improvements
6+
7+
- [#20](https://github.com/sdispater/orator/issues/20) Collections have been improved (New methods added)
8+
- Commands have been improved
9+
- The `to_dict` methods on the `Model`, `Collection` classes and paginators are now deprecated. Use `serialize` instead.
10+
11+
##### Fixes
12+
13+
* [#22](https://github.com/sdispater/orator/issues/22) Model.fill() and other methods now accept a dictionary in addition to keyword arguments.
14+
* MySQL charset config value was not used when connecting. This is now fixed. (Thanks to [@heavenshell](https://github.com/heavenshell))
15+
* [#24](https://github.com/sdispater/orator/issues/24) Dynamic properties called the wrong methods when accessing the related items.
16+
17+
118
### 0.7
219

320
(November 10th, 2015)

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ You can install Orator in 2 different ways:
2929
The different dbapi packages are not part of the package dependencies,
3030
so you must install them in order to connect to corresponding databases:
3131

32-
* Postgres: ``pyscopg2``
32+
* Postgres: ``psycopg2``
3333
* MySQL: ``PyMySQL`` or ``mysqlclient``
3434
* Sqlite: The ``sqlite3`` module is bundled with Python by default
3535

docs/_static/theme_overrides.css

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@import url(http://fonts.googleapis.com/css?family=Montserrat:400,700);
2-
@import url(http://fonts.googleapis.com/css?family=Source+Code+Pro:400,500,600);
2+
@import url(http://fonts.googleapis.com/css?family=Source+Code+Pro:300,400,500,600);
33
@import url(http://fonts.googleapis.com/css?family=Material+Icons);
4+
@import url(https://fonts.googleapis.com/css?family=Open+Sans:600,400,300);
45

56
body {
67
font: 400 13px/26px "Open Sans",sans-serif;
@@ -691,15 +692,15 @@ p > code.docutils {
691692
}
692693

693694
.rst-content table.field-list .field-body strong {
694-
color: #F3888B;
695-
font-weight: 400;
695+
color: #E9767F;
696+
font-weight: 600;
696697
margin-top: 0;
697698
}
698699

699700
.rst-content dl:not(.docutils).class > dt {
700701
border: 0;
701702
background: transparent;
702-
font-size: inherit;
703+
font-size: 13px;
703704
margin-bottom: 24px;
704705
color: #579ED1;
705706
font-weight: 600;
@@ -709,35 +710,59 @@ p > code.docutils {
709710
.rst-content dl:not(.docutils).class > dt > em.property {
710711
font-weight: 400;
711712
font-style: normal;
713+
font-family: "Source Code Pro","Consolas","Menlo","Monaco","Courier New",Courier,monospace;
712714
}
713715

714716
.rst-content dl:not(.docutils).class > dt > code {
715-
color: #F9A167;
717+
color: #69B69F;
716718
font-weight: 400;
717719
}
718720

719721
.rst-content dl:not(.docutils) dl.classmethod > dt,
720722
.rst-content dl:not(.docutils) dl.method > dt {
721723
border-left: 1px solid #F2F2F2;
722724
background: transparent;
723-
font-size: inherit;
725+
font-size: 13px;
724726
}
725727

726728
.rst-content dl:not(.docutils) dl.classmethod > dt > code,
727729
.rst-content dl:not(.docutils) dl.method > dt > code {
728-
color: #D9664F;
730+
color: #8986BF;
729731
font-weight: 400;
730732
}
731733

732734
.rst-content dl:not(.docutils) dl.classmethod > dt > em,
733735
.rst-content dl:not(.docutils) dl.method > dt > em {
734736
font-weight: 400;
737+
font-family: "Source Code Pro","Consolas","Menlo","Monaco","Courier New",Courier,monospace;
738+
font-size: 13px;
739+
font-style: normal;
735740
}
736741

737742
.rst-content dl:not(.docutils) dl.classmethod > dt > em.property,
738743
.rst-content dl:not(.docutils) dl.method > dt > em.property {
739744
font-weight: 400;
740-
color: #7AC;
745+
color: #579ED1;
746+
font-style: normal;
747+
}
748+
749+
/* Sections styles */
750+
751+
#available-methods ul {
752+
list-style: none;
753+
-webkit-column-count: 3; /* Chrome, Safari, Opera */
754+
-moz-column-count: 3; /* Firefox */
755+
column-count: 3;
756+
}
757+
758+
#available-methods ul > li {
759+
list-style: none;
760+
}
761+
762+
h3 > code.docutils {
763+
font-size: 17px;
764+
font-weight: 300;
765+
margin: 0;
741766
}
742767

743768

@@ -898,16 +923,16 @@ tt.code .integer, code.code .integer { color: #F4BC87 }
898923
.highlight .vi { color: #69B69F } /* Name.Variable.Instance */
899924
.highlight .nd { color: #879ED1 } /* Name.Decorator */
900925
.highlight .ne { color: #CB6077; font-weight: 400 } /* Name.Exception */
901-
.highlight .o { color: #878F84 } /* Operator */
902-
.highlight .n { color: #878F84 }
926+
.highlight .o { color: #878787 } /* Operator */
927+
.highlight .n { color: #878787 }
903928
.highlight .c { color: #A8AFAD; font-style: normal; }
904929
.highlight .sd { color: #A8AFAD; font-style: normal; }
905930
.highlight .nl { color: #E9767F } /* Name.Label */
906931
.highlight .nn { color: #8986BF } /* Name.Namespace */
907932
.highlight .nx { color: #E9767F } /* Name.Other */
908933
.highlight .py { color: #E9767F } /* Name.Property */
909934
.highlight .nb { color: #63ABA3 } /* Name.Builtin */
910-
.highlight .p { color: #878F84 } /* Punctuation */
935+
.highlight .p { color: #878787 } /* Punctuation */
911936

912937
/* Inline code */
913938

@@ -918,9 +943,9 @@ tt.code, code.code {
918943
padding: 0.3em 0.5em;
919944
background-color: #FAFAFA;
920945
}
921-
tt.code .name, code.code .name { color: #878F84 }
922-
tt.code .operator, code.code .operator { color: #878F84 }
923-
tt.code .punctuation, code.code .punctuation { color: #878F84 }
946+
tt.code .name, code.code .name { color: #878787 }
947+
tt.code .operator, code.code .operator { color: #878787 }
948+
tt.code .punctuation, code.code .punctuation { color: #878787 }
924949
tt.code .string, code.code .string { color: #59B6CF }
925950
tt.code .number, code.code .number { color: #E9767F }
926951
tt.code .integer, code.code .integer { color: #E9767F }

docs/api/index.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/api/orm.rst

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/basic_usage.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ Here is an example of how read / write connections should be configured:
5959
6060
config = {
6161
'mysql': {
62-
'read': [
62+
'read': {
6363
'host': '192.168.1.1'
64-
],
65-
'read': [
64+
},
65+
'write': {
6666
'host': '192.168.1.2'
67-
],
67+
},
6868
'driver': 'mysql',
6969
'database': 'database',
7070
'username': 'root',

0 commit comments

Comments
 (0)