Skip to content

Commit 29e5023

Browse files
committed
Merge branch '0.14' into feat/tp-rework
2 parents 0e48151 + 90ccc1b commit 29e5023

File tree

246 files changed

+14636
-6808
lines changed

Some content is hidden

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

246 files changed

+14636
-6808
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ workflows:
4646
tags:
4747
only: /dev-v[0-9]+(\.[0-9]+)*/
4848
branches:
49-
only: /test\/.*/
49+
only: /test-cicd\/.*/
5050
- publish:
5151
context:
5252
- slack-notification

.circleci/config_continue.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ workflows:
188188
tags:
189189
only: /dev-v[0-9]+(\.[0-9]+)*/
190190
branches:
191-
only: /test\/.*/
191+
only: /test-cicd\/.*/
192192
- test-unit:
193193
requires:
194194
- test-dev-tag-as-not-passed
@@ -198,7 +198,7 @@ workflows:
198198
tags:
199199
only: /dev-v[0-9]+(\.[0-9]+)*/
200200
branches:
201-
only: /test\/.*/
201+
only: /test-cicd\/.*/
202202
matrix:
203203
parameters:
204204
cdi-version: placeholder
@@ -211,7 +211,7 @@ workflows:
211211
tags:
212212
only: /dev-v[0-9]+(\.[0-9]+)*/
213213
branches:
214-
only: /test\/.*/
214+
only: /test-cicd\/.*/
215215
- test-website-flask:
216216
requires:
217217
- test-dev-tag-as-not-passed
@@ -221,7 +221,7 @@ workflows:
221221
tags:
222222
only: /dev-v[0-9]+(\.[0-9]+)*/
223223
branches:
224-
only: /test\/.*/
224+
only: /test-cicd\/.*/
225225
- test-website-django:
226226
requires:
227227
- test-dev-tag-as-not-passed
@@ -231,7 +231,7 @@ workflows:
231231
tags:
232232
only: /dev-v[0-9]+(\.[0-9]+)*/
233233
branches:
234-
only: /test\/.*/
234+
only: /test-cicd\/.*/
235235
- test-website-django2x:
236236
requires:
237237
- test-dev-tag-as-not-passed
@@ -241,7 +241,7 @@ workflows:
241241
tags:
242242
only: /dev-v[0-9]+(\.[0-9]+)*/
243243
branches:
244-
only: /test\/.*/
244+
only: /test-cicd\/.*/
245245
- test-authreact-fastapi:
246246
requires:
247247
- test-dev-tag-as-not-passed
@@ -251,7 +251,7 @@ workflows:
251251
tags:
252252
only: /dev-v[0-9]+(\.[0-9]+)*/
253253
branches:
254-
only: /test\/.*/
254+
only: /test-cicd\/.*/
255255
matrix:
256256
parameters:
257257
fdi-version: placeholder
@@ -264,7 +264,7 @@ workflows:
264264
tags:
265265
only: /dev-v[0-9]+(\.[0-9]+)*/
266266
branches:
267-
only: /test\/.*/
267+
only: /test-cicd\/.*/
268268
matrix:
269269
parameters:
270270
fdi-version: placeholder
@@ -277,7 +277,7 @@ workflows:
277277
tags:
278278
only: /dev-v[0-9]+(\.[0-9]+)*/
279279
branches:
280-
only: /test\/.*/
280+
only: /test-cicd\/.*/
281281
matrix:
282282
parameters:
283283
fdi-version: placeholder
@@ -297,4 +297,4 @@ workflows:
297297
tags:
298298
only: /dev-v[0-9]+(\.[0-9]+)*/
299299
branches:
300-
only: /test\/.*/
300+
only: /test-cicd\/.*/

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
- If no such branch exists, then create one from the latest released branch.
3131
- [ ] If have added a new web framework, update the `supertokens_python/utils.py` file to include that in the `FRAMEWORKS` variable
3232
- [ ] If added a new recipe that has a User type with extra info, then be sure to change the User type in supertokens_python/types.py
33+
- [ ] Make sure that `syncio` / `asyncio` functions are consistent.
3334

3435
## Remaining TODOs for this PR
3536

0 commit comments

Comments
 (0)