Skip to content

Commit 45a43cf

Browse files
mahenzonmahenzon
committed
update version, update changelog, update locales
1 parent c2ec552 commit 45a43cf

File tree

5 files changed

+79
-51
lines changed

5 files changed

+79
-51
lines changed

‎CHANGELOG.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@ Changelog
22
*********
33

44

5+
**1.1.2**
6+
=========
7+
8+
Bug Fixes
9+
=========
10+
11+
* fix freeze apispec<5 #- `@mahenzon`_
12+
* fix permission plugin Meta.required_fields properly loads relationship fields #- `@mahenzon`_
13+
14+
515
**1.1.1**
616
=========
717

‎docs/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
# The short X.Y version.
6464
version = "1.1"
6565
# The full version, including alpha/beta/rc tags.
66-
release = "1.1.1"
66+
release = "1.1.2"
6767
# The language for content autogenerated by Sphinx. Refer to documentation
6868
# for a list of supported languages.
6969
#

‎docs/locale/ru/LC_MESSAGES/changelog.po‎

Lines changed: 57 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: combojsonapi 1.1\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2021-06-04 09:55+0300\n"
12+
"POT-Creation-Date: 2021-09-01 21:25+0300\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,176 +23,192 @@ msgid "Changelog"
2323
msgstr ""
2424

2525
#: ../../../CHANGELOG.rst:6
26-
msgid "**1.1.1**"
26+
msgid "**1.1.2**"
2727
msgstr ""
2828

29-
#: ../../../CHANGELOG.rst:9 ../../../CHANGELOG.rst:30 ../../../CHANGELOG.rst:66
29+
#: ../../../CHANGELOG.rst:9 ../../../CHANGELOG.rst:19 ../../../CHANGELOG.rst:40
30+
#: ../../../CHANGELOG.rst:76
3031
msgid "Bug Fixes"
3132
msgstr ""
3233

3334
#: ../../../CHANGELOG.rst:11
35+
msgid "fix freeze apispec<5 #- `@mahenzon`_"
36+
msgstr ""
37+
38+
#: ../../../CHANGELOG.rst:12
39+
msgid ""
40+
"fix permission plugin Meta.required_fields properly loads relationship "
41+
"fields #- `@mahenzon`_"
42+
msgstr ""
43+
44+
#: ../../../CHANGELOG.rst:16
45+
msgid "**1.1.1**"
46+
msgstr ""
47+
48+
#: ../../../CHANGELOG.rst:21
3449
msgid "fix event plugin build urls when there's no trailing slash #- `@mahenzon`_"
3550
msgstr ""
3651

37-
#: ../../../CHANGELOG.rst:15
52+
#: ../../../CHANGELOG.rst:25
3853
msgid "**1.1.0**"
3954
msgstr ""
4055

41-
#: ../../../CHANGELOG.rst:18 ../../../CHANGELOG.rst:39
42-
#: ../../../CHANGELOG.rst:58 ../../../CHANGELOG.rst:87
56+
#: ../../../CHANGELOG.rst:28 ../../../CHANGELOG.rst:49
57+
#: ../../../CHANGELOG.rst:68 ../../../CHANGELOG.rst:97
4358
msgid "Enhancements"
4459
msgstr ""
4560

46-
#: ../../../CHANGELOG.rst:20
61+
#: ../../../CHANGELOG.rst:30
4762
msgid "Upgrade apispec, fix tests `#33`_ #- `@mahenzon`_"
4863
msgstr ""
4964

50-
#: ../../../CHANGELOG.rst:21
65+
#: ../../../CHANGELOG.rst:31
5166
msgid "provide custom event params via `extra` attribute `#34`_ #- `@mahenzon`_"
5267
msgstr ""
5368

54-
#: ../../../CHANGELOG.rst:22
69+
#: ../../../CHANGELOG.rst:32
5570
msgid "build and localize docs for RTD `#36`_ #- `@mahenzon`_"
5671
msgstr ""
5772

58-
#: ../../../CHANGELOG.rst:23
73+
#: ../../../CHANGELOG.rst:33
5974
msgid "Add case for permission methods in docs `#30`_ #- `@Bykov25`_"
6075
msgstr ""
6176

62-
#: ../../../CHANGELOG.rst:27
77+
#: ../../../CHANGELOG.rst:37
6378
msgid "**1.0.5**"
6479
msgstr ""
6580

66-
#: ../../../CHANGELOG.rst:32
81+
#: ../../../CHANGELOG.rst:42
6782
msgid "Distribute apispec templates #- `@mahenzon`_"
6883
msgstr ""
6984

70-
#: ../../../CHANGELOG.rst:36
85+
#: ../../../CHANGELOG.rst:46
7186
msgid "**1.0.3**"
7287
msgstr ""
7388

74-
#: ../../../CHANGELOG.rst:41
89+
#: ../../../CHANGELOG.rst:51
7590
msgid ""
7691
"Add custom marshmallow fields for PostgreSQL filtering (PostgreSqlJSONB "
7792
"plugin) #- `@Znbiz`_"
7893
msgstr ""
7994

80-
#: ../../../CHANGELOG.rst:42
95+
#: ../../../CHANGELOG.rst:52
8196
msgid ""
8297
"Filtering and sorting nested JSONB fields (PostgreSqlJSONB plugin) #- "
8398
"`@tarasovdg1`_"
8499
msgstr ""
85100

86-
#: ../../../CHANGELOG.rst:46
101+
#: ../../../CHANGELOG.rst:56
87102
msgid "**1.0.0**"
88103
msgstr ""
89104

90-
#: ../../../CHANGELOG.rst:49
105+
#: ../../../CHANGELOG.rst:59
91106
msgid "Changes"
92107
msgstr ""
93108

94-
#: ../../../CHANGELOG.rst:51
109+
#: ../../../CHANGELOG.rst:61
95110
msgid "Rename Flask-REST-JSONAPI to Flask-COMBO-JSONAPI #- `@mahenzon`_"
96111
msgstr ""
97112

98-
#: ../../../CHANGELOG.rst:55
113+
#: ../../../CHANGELOG.rst:65
99114
msgid "**0.1.1**"
100115
msgstr ""
101116

102-
#: ../../../CHANGELOG.rst:60
117+
#: ../../../CHANGELOG.rst:70
103118
msgid "Added parameter **strict** in PermissionPlugin #- `@Znbiz`_"
104119
msgstr ""
105120

106-
#: ../../../CHANGELOG.rst:61
121+
#: ../../../CHANGELOG.rst:71
107122
msgid "Added parameter **trailing_slash** in EventPlugin #- `@Znbiz`_"
108123
msgstr ""
109124

110-
#: ../../../CHANGELOG.rst:62
125+
#: ../../../CHANGELOG.rst:72
111126
msgid "English docs #- `@Yakov Shapovalov`_"
112127
msgstr ""
113128

114-
#: ../../../CHANGELOG.rst:63
129+
#: ../../../CHANGELOG.rst:73
115130
msgid "Update marshmallow -> 3.0.1 #- `@Znbiz`_"
116131
msgstr ""
117132

118-
#: ../../../CHANGELOG.rst:68
133+
#: ../../../CHANGELOG.rst:78
119134
msgid "update Relationship #- `@Znbiz`_"
120135
msgstr ""
121136

122-
#: ../../../CHANGELOG.rst:69
137+
#: ../../../CHANGELOG.rst:79
123138
msgid ""
124139
"Constant splitter for filters, sorts and includes in plugin "
125140
"`PostgreSqlJSONB`_ #- `@Znbiz`_"
126141
msgstr ""
127142

128-
#: ../../../CHANGELOG.rst:70
143+
#: ../../../CHANGELOG.rst:80
129144
msgid "Fix resource.schema == None in plugin `ApiSpecPlugin`_ #- `@Znbiz`_"
130145
msgstr ""
131146

132-
#: ../../../CHANGELOG.rst:71
147+
#: ../../../CHANGELOG.rst:81
133148
msgid "Fix sorting in plugin `PostgreSqlJSONB`_ #- `@Znbiz`_"
134149
msgstr ""
135150

136-
#: ../../../CHANGELOG.rst:72
151+
#: ../../../CHANGELOG.rst:82
137152
msgid ""
138153
"Improved model fields check for options(load_only) in `PermissionPlugin`_"
139154
" #- `@Znbiz`_"
140155
msgstr ""
141156

142-
#: ../../../CHANGELOG.rst:73
157+
#: ../../../CHANGELOG.rst:83
143158
msgid ""
144159
"Implement disable_global_decorators, minor refactor and upgrade events, "
145160
"update docs in plugin `EventPlugin`_ #- `@mahenzon`_"
146161
msgstr ""
147162

148-
#: ../../../CHANGELOG.rst:75
163+
#: ../../../CHANGELOG.rst:85
149164
msgid ""
150165
"typo permission_for_path -> permission_for_patch and create "
151166
"get_decorators_for_resource in plugin `PermissionPlugin`_ #- `@mahenzon`_"
152167
msgstr ""
153168

154-
#: ../../../CHANGELOG.rst:77
169+
#: ../../../CHANGELOG.rst:87
155170
msgid "Create status util #- `@mahenzon`_"
156171
msgstr ""
157172

158-
#: ../../../CHANGELOG.rst:78
173+
#: ../../../CHANGELOG.rst:88
159174
msgid ""
160175
"Refactor api spec params for get in plugin `ApiSpecPlugin`_ #- "
161176
"`@mahenzon`_"
162177
msgstr ""
163178

164-
#: ../../../CHANGELOG.rst:79
179+
#: ../../../CHANGELOG.rst:89
165180
msgid "Fix permission plugin initialization #- `@mahenzon`_"
166181
msgstr ""
167182

168-
#: ../../../CHANGELOG.rst:80
183+
#: ../../../CHANGELOG.rst:90
169184
msgid "Constant splitter for filters, sorts and includes #- `@mahenzon`_"
170185
msgstr ""
171186

172-
#: ../../../CHANGELOG.rst:81
187+
#: ../../../CHANGELOG.rst:91
173188
msgid "Configure setup, update .gitignore #- `@mahenzon`_"
174189
msgstr ""
175190

176-
#: ../../../CHANGELOG.rst:84
191+
#: ../../../CHANGELOG.rst:94
177192
msgid "**0.1.0**"
178193
msgstr ""
179194

180-
#: ../../../CHANGELOG.rst:89
195+
#: ../../../CHANGELOG.rst:99
181196
msgid "Created plugin `PermissionPlugin`_ for flask-rest-jsonapi #- `@Znbiz`_"
182197
msgstr ""
183198

184-
#: ../../../CHANGELOG.rst:90
199+
#: ../../../CHANGELOG.rst:100
185200
msgid "Created plugin `ApiSpecPlugin`_ for flask-rest-jsonapi #- `@Znbiz`_"
186201
msgstr ""
187202

188-
#: ../../../CHANGELOG.rst:91
203+
#: ../../../CHANGELOG.rst:101
189204
msgid "Created plugin `EventPlugin`_ for flask-rest-jsonapi #- `@Znbiz`_"
190205
msgstr ""
191206

192-
#: ../../../CHANGELOG.rst:92
207+
#: ../../../CHANGELOG.rst:102
193208
msgid "Created plugin `PostgreSqlJSONB`_ for flask-rest-jsonapi #- `@Znbiz`_"
194209
msgstr ""
195210

196-
#: ../../../CHANGELOG.rst:93
211+
#: ../../../CHANGELOG.rst:103
197212
msgid "Created plugin `RestfulPlugin`_ for ApiSpec #- `@Znbiz`_"
198213
msgstr ""
214+

‎docs/locale/ru/LC_MESSAGES/quickstart_events.po‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: Combo JSONAPI 1.1\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2021-06-07 13:33+0300\n"
12+
"POT-Creation-Date: 2021-09-01 21:25+0300\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,7 +24,9 @@ msgstr "Пример EventPlugin"
2424

2525
#: ../../quickstart_events.rst:6
2626
msgid "EventPlugin example for Flask-COMBO-JSONAPI API with ComboJSONAPI:"
27-
msgstr "Пример использования плагина EventPlugin в Flask-COMBO-JSONAPI API из ComboJSONAPI"
27+
msgstr ""
28+
"Пример использования плагина EventPlugin в Flask-COMBO-JSONAPI API из "
29+
"ComboJSONAPI"
2830

2931
#: ../../quickstart_events.rst:13
3032
msgid ""
@@ -34,7 +36,6 @@ msgstr ""
3436
"В этом примере используется Flask-SQLAlchemy.Так что для запуска примера "
3537
"будет необходимо установить эту библиотеку"
3638

37-
3839
#: ../../quickstart_events.rst:15
3940
msgid "$ pip install flask_sqlalchemy"
4041
msgstr ""
@@ -67,12 +68,12 @@ msgid "Create user object"
6768
msgstr "Создание объекта пользователя"
6869

6970
#: ../../quickstart_events.rst:35 ../../quickstart_events.rst:50
70-
#: ../../quickstart_events.rst:65 ../../quickstart_events.rst:83
71+
#: ../../quickstart_events.rst:65 ../../quickstart_events.rst:82
7172
msgid "Request:"
7273
msgstr "Запрос:"
7374

7475
#: ../../quickstart_events.rst:40 ../../quickstart_events.rst:55
75-
#: ../../quickstart_events.rst:70 ../../quickstart_events.rst:88
76+
#: ../../quickstart_events.rst:70 ../../quickstart_events.rst:87
7677
msgid "Response:"
7778
msgstr "Ответ:"
7879

@@ -84,11 +85,12 @@ msgstr "Выполнить GET запрос на кастомный :code:`event
8485
msgid "Post custom event info"
8586
msgstr "Выполнить POST запрос на кастомный :code:`event_post_`"
8687

87-
#: ../../quickstart_events.rst:79
88+
#: ../../quickstart_events.rst:78
8889
msgid "Update user's avatar"
8990
msgstr "Обновить аватар пользователя"
9091

91-
#: ../../quickstart_events.rst:81
92-
msgid "Upload file using code:`multipart/form-data`"
92+
#: ../../quickstart_events.rst:80
93+
#, fuzzy
94+
msgid "Upload file using :code:`multipart/form-data`"
9395
msgstr "Загрузить файл используя code:`multipart/form-data`"
9496

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from setuptools import setup, find_packages
44

5-
__version__ = "1.1.1"
5+
__version__ = "1.1.2"
66

77

88
requirements_filepath = os.path.join(os.path.dirname(__name__), "requirements.txt")

0 commit comments

Comments
 (0)