Skip to content

Commit e8b8f08

Browse files
committed
� Conflicts: � flask_mongoengine/json.py � tests/test_json_app.py
2 parents 5f20261 + 2245a86 commit e8b8f08

Some content is hidden

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

98 files changed

+2903
-3078
lines changed

.codeclimate.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
version: "2"
2+
checks:
3+
file-lines:
4+
enabled: false
5+
method-count:
6+
enabled: false
7+
method-lines:
8+
enabled: false
9+
complex-logic:
10+
config:
11+
threshold: 10
12+
method-complexity:
13+
config:
14+
threshold: 10
15+
exclude_patterns:
16+
- "tests/"
17+
- "example_app/"

.editorconfig

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# http://editorconfig.org
2+
# https://editorconfig-specification.readthedocs.io/en/latest/
3+
4+
root = true
5+
6+
[*]
7+
charset = utf-8
8+
end_of_line = lf
9+
insert_final_newline = true
10+
trim_trailing_whitespace = true
11+
12+
[*.{py,ini,sh}]
13+
indent_style = space
14+
indent_size = 4
15+
16+
[*.{html,css,scss,json,yml,tpl,js,jsx}]
17+
indent_style = space
18+
indent_size = 2
19+
20+
[*.md]
21+
indent_style = space
22+
indent_size = 4
23+
tab_width = 4
24+
25+
[*.rst]
26+
indent_style = space
27+
indent_size = 3
28+
29+
[Makefile]
30+
indent_style = tab

.github/workflows/coverage.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Send Coverage to different analitic engines
1+
name: Send Coverage to different analytic engines
22
# Only for last versions of python and mongo
33

44
on:
@@ -17,34 +17,34 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
mongodb-version: [4.2]
20+
mongodb-version: [5.0]
2121
include:
2222
- name: "coverage"
23-
python: "3.8"
24-
tox_env: "py38"
23+
python: "3.10"
2524

2625
steps:
27-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v3
2827
- name: Set up Python ${{ matrix.python }}
29-
uses: actions/setup-python@v1
28+
uses: actions/setup-python@v4
3029
with:
3130
python-version: ${{ matrix.python }}
3231
- name: Install dependencies
3332
run: |
3433
python -m pip install --upgrade pip
35-
pip install tox virtualenv
34+
pip install nox virtualenv
3635
- name: Start MongoDB
37-
uses: supercharge/mongodb-github-action@1.3.0
36+
uses: supercharge/mongodb-github-action@1.7.0
3837
with:
3938
mongodb-version: ${{ matrix.mongodb-version }}
4039
- name: Test build
41-
run: "tox -e ${{ matrix.tox_env }} -- --cov-report=xml --cov-report=html"
40+
run: "nox -s latest --python ${{ matrix.python }} -- --cov-report=xml --cov-report=html"
4241
- name: Send coverage report to codecov
43-
uses: codecov/codecov-action@v1
42+
uses: codecov/codecov-action@v3
4443
with:
4544
file: ./coverage.xml
4645
- name: Send coverage report to codeclimate
47-
uses: paambaati/codeclimate-action@v2.6.0
46+
uses: paambaati/codeclimate-action@v3.0.0
47+
continue-on-error: true
4848
with:
4949
coverageCommand: echo "Ignore rerun"
5050
coverageLocations: ${{github.workspace}}/coverage.xml:coverage.py
File renamed without changes.

.github/workflows/labeler-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v3
1212
- name: Run Labeler
13-
uses: crazy-max/ghaction-github-labeler@v2
13+
uses: crazy-max/ghaction-github-labeler@v4
1414
with:
1515
yaml_file: .github/labels.yml
1616
dry_run: true

.github/workflows/labeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v3
1313
- name: Run Labeler
14-
uses: crazy-max/ghaction-github-labeler@v2
14+
uses: crazy-max/ghaction-github-labeler@v4
1515
with:
1616
yaml_file: .github/labels.yml
1717
env:

.github/workflows/linting.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Linting Tests
2-
# Only for last versions of python
2+
# Only for least supported python version
33

44
on:
55
push:
@@ -19,18 +19,17 @@ jobs:
1919
matrix:
2020
include:
2121
- name: "linting"
22-
python: "3.8"
23-
tox_env: "lint"
22+
python: "3.7"
2423

2524
steps:
26-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v3
2726
- name: Set up Python ${{ matrix.python }}
28-
uses: actions/setup-python@v1
27+
uses: actions/setup-python@v4
2928
with:
3029
python-version: ${{ matrix.python }}
3130
- name: Install dependencies
3231
run: |
3332
python -m pip install --upgrade pip
34-
pip install tox virtualenv
33+
pip install nox virtualenv
3534
- name: Test build
36-
run: "tox -e ${{ matrix.tox_env }}"
35+
run: "nox -s lint"

.github/workflows/main.yml

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

.github/workflows/tests.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: CI Tests
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags:
8+
- "*"
9+
pull_request:
10+
branches:
11+
- "*"
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
mongodb-version: ["3.6", "4.0", "4.2", "4.4", "5.0"]
20+
python: ["3.7", "3.8", "3.9", "3.10", "pypy3.7"]
21+
22+
steps:
23+
- uses: actions/checkout@v3
24+
- name: Set up Python ${{ matrix.python }}
25+
uses: actions/setup-python@v4
26+
with:
27+
python-version: ${{ matrix.python }}
28+
- name: Install dependencies
29+
run: |
30+
python -m pip install --upgrade pip
31+
pip install nox virtualenv
32+
- name: Start MongoDB
33+
uses: supercharge/mongodb-github-action@1.7.0
34+
with:
35+
mongodb-version: ${{ matrix.mongodb-version }}
36+
- name: Test build
37+
run: "nox -s ci_cd_tests --python ${{ matrix.python }}"

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ venv/
1414
.project
1515
.pydevproject
1616
.tox
17+
.nox
1718
.eggs
1819
.idea
1920
.vscode
2021
htmlcov/
2122
coverage.xml
23+
_version.py

0 commit comments

Comments
 (0)