Skip to content

Commit da687ed

Browse files
insspbinsspb
authored
Merge branch 'master' into master
2 parents 658142d + b220fae commit da687ed

Some content is hidden

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

52 files changed

+1293
-809
lines changed

Diff for: ‎.github/labels.yml

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
- name: "topic: CI/CD"
2+
color: "54f449"
3+
description: "This issue/PR relates to CI/CD pipeline change"
4+
- name: "topic: code style"
5+
color: "54f449"
6+
description: "This issue/PR relates to code style."
7+
from_name: "code quality"
8+
- name: "topic: tests"
9+
color: "54f449"
10+
description: "This issue/PR relates to tests, QA, CI."
11+
- name: "topic: deprecated"
12+
color: "999999"
13+
description: "Feature or component marked as deprecated and will be removed"
14+
- name: "topic: documentation"
15+
color: "54f449"
16+
description: "This issue/PR relates to or includes documentation."
17+
from_name: "Documentation"
18+
- name: "type: breaking-change"
19+
color: "310372"
20+
description: "Marks an important and likely breaking old interface change."
21+
- name: "type: feature"
22+
color: "310372"
23+
description: "New feature implementation"
24+
- name: "type: enhancement"
25+
color: "310372"
26+
description: "Enhancement update for old feature"
27+
from_name: "enhancement"
28+
- name: "type: good first issue"
29+
color: "310372"
30+
description: "Good for newcomers"
31+
from_name: "Good first contrib"
32+
- name: "type: bug"
33+
color: "b71914"
34+
description: "Something isn't working"
35+
from_name: "bug"
36+
- name: "log:added"
37+
color: "ff935e"
38+
description: "Changelog mark label. Marks new added features."
39+
- name: "log:breaking-change"
40+
color: "ff935e"
41+
description: "Changelog mark label. Marks breaking changes."
42+
- name: "log:changed"
43+
color: "ff935e"
44+
description: "Changelog mark label. Marks old, but changed features."
45+
- name: "log:deprecated"
46+
color: "ff935e"
47+
description: "Changelog mark label. Marks deprecated features, that will be removed in next major release."
48+
- name: "log:fixed"
49+
color: "ff935e"
50+
description: "Changelog mark label. Marks fixed bug issues."
51+
- name: "log:removed"
52+
color: "ff935e"
53+
description: "Changelog mark label. Marks removed features."
54+
- name: "log:skip-changelog"
55+
color: "ff935e"
56+
description: "Should be excluded from the changelog."
57+
- name: "os: linux"
58+
color: "fbca04"
59+
description: "This issue/PR related to linux systems"
60+
- name: "os: mac"
61+
color: "fbca04"
62+
description: "This issue/PR related to mac systems"
63+
- name: "os: windows"
64+
color: "fbca04"
65+
description: "This issue/PR related to windows systems"
66+
- name: "question"
67+
color: "d876e3"
68+
description: "User questions, not related to issues"
69+
from_name: "question"
70+
- name: "decision: duplicate"
71+
color: "eeeeee"
72+
description: "This issue or pull request already exists"
73+
from_name: "duplicate"
74+
- name: "decision: wontfix"
75+
color: "eeeeee"
76+
description: "This will not be worked on"
77+
from_name: "wontfix"
78+
- name: "decision: wontmerge"
79+
color: "eeeeee"
80+
description: "PR Only: This pull request will not be merged (problem described in comments)"
81+
- name: "stage: waiting-for-contributor"
82+
color: "efc1ae"
83+
from_name: "awaiting response"
84+
description: "Waiting for answer from original contributor."
85+
- name: "stage: WIP"
86+
color: "efc1ae"
87+
description: "Work In Progress"
88+
- name: "stage: help wanted"
89+
color: "efc1ae"
90+
description: "Extra attention is needed"
91+
from_name: "Help wanted"

Diff for: ‎.github/release-drafter.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
categories:
2+
- title: 'Breaking Changes'
3+
labels:
4+
- 'log:breaking-change'
5+
- title: 'Added'
6+
labels:
7+
- 'log:added'
8+
- title: 'Changed'
9+
labels:
10+
- 'log:changed'
11+
- title: 'Fixed'
12+
labels:
13+
- 'log:fixed'
14+
- title: 'Deprecated'
15+
labels:
16+
- 'log:deprecated'
17+
- title: 'Removed'
18+
labels:
19+
- 'log:removed'
20+
exclude-labels:
21+
- 'log:skip-changelog'
22+
sort-by: 'title'
23+
template: |
24+
## Changes
25+
26+
$CHANGES
27+
28+
## This release is made by wonderful contributors:
29+
30+
$CONTRIBUTORS

Diff for: ‎.github/workflows/labeler-check.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Labels verification
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
labeler:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout
11+
uses: actions/checkout@v2
12+
- name: Run Labeler
13+
uses: crazy-max/ghaction-github-labeler@v2
14+
with:
15+
yaml_file: .github/labels.yml
16+
dry_run: true
17+
env:
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Diff for: ‎.github/workflows/labeler.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Labels verification
2+
3+
on:
4+
push:
5+
branches: [master]
6+
7+
jobs:
8+
labeler:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v2
13+
- name: Run Labeler
14+
uses: crazy-max/ghaction-github-labeler@v2
15+
with:
16+
yaml_file: .github/labels.yml
17+
env:
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Diff for: ‎.github/workflows/main.yml

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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: ${{ matrix.os }}
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
mongodb-version: [3.6, 4.0, 4.2]
20+
21+
include:
22+
- name: "linting"
23+
python: "3.8"
24+
os: ubuntu-latest
25+
tox_env: "lint"
26+
mongodb-version: 4.2
27+
28+
- name: "ubuntu-py36"
29+
python: "3.6"
30+
os: ubuntu-latest
31+
tox_env: "py36"
32+
- name: "ubuntu-py37"
33+
python: "3.7"
34+
os: ubuntu-latest
35+
tox_env: "py37"
36+
- name: "ubuntu-py38"
37+
python: "3.8"
38+
os: ubuntu-latest
39+
tox_env: "py38"
40+
- name: "ubuntu-pypy3"
41+
python: "pypy3"
42+
os: ubuntu-latest
43+
tox_env: "pypy3"
44+
45+
steps:
46+
- uses: actions/checkout@v2
47+
- name: Set up Python ${{ matrix.python }}
48+
uses: actions/setup-python@v1
49+
with:
50+
python-version: ${{ matrix.python }}
51+
- name: Install dependencies
52+
run: |
53+
python -m pip install --upgrade pip
54+
pip install tox virtualenv
55+
- name: Start MongoDB
56+
uses: supercharge/[email protected]
57+
with:
58+
mongodb-version: ${{ matrix.mongodb-version }}
59+
- name: Test build
60+
run: "tox -e ${{ matrix.tox_env }}"

Diff for: ‎.github/workflows/release-drafter.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Release Drafter
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
update_release_draft:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: release-drafter/release-drafter@v5
13+
env:
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Diff for: ‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ venv/
1515
.pydevproject
1616
.tox
1717
.eggs
18+
.idea
19+
.vscode

Diff for: ‎.pre-commit-config.yaml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v2.4.0
4+
hooks:
5+
- id: trailing-whitespace
6+
- id: end-of-file-fixer
7+
- id: check-yaml
8+
- id: check-added-large-files
9+
- repo: https://github.com/jumanjihouse/pre-commit-hooks
10+
rev: 1.11.2
11+
hooks:
12+
- id: markdownlint
13+
- repo: https://github.com/psf/black
14+
rev: stable
15+
hooks:
16+
- id: black
17+
language_version: python3.6
18+
exclude: ^docs/
19+
- repo: https://gitlab.com/pycqa/flake8
20+
rev: 3.7.9
21+
hooks:
22+
- id: flake8
23+
exclude: ^docs/|^examples/

Diff for: ‎.travis.yml

+36-42
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,55 @@
1-
# Use a container-based environment
2-
sudo: false
1+
dist: xenial
2+
os: linux
33

44
language: python
55

6-
python:
7-
- '2.7'
8-
- '3.3'
9-
- '3.4'
10-
- '3.5'
11-
- pypy
12-
- pypy3
13-
14-
env:
15-
- MONGOENGINE=0.8
16-
- MONGOENGINE=0.9
17-
- MONGOENGINE=0.10.0
18-
- MONGOENGINE=dev
6+
jobs:
7+
include:
8+
- language: python
9+
python: 3.6
10+
name: "linting"
11+
env: TOXENV=lint
12+
- language: python
13+
python: 3.6
14+
name: "Test on python 3.6"
15+
env: TOXENV=py36
16+
- language: python
17+
python: 3.7
18+
name: "Test on python 3.7"
19+
env: TOXENV=py37
20+
- language: python
21+
python: 3.8
22+
name: "Test on python 3.8"
23+
env: TOXENV=py38
24+
- language: python
25+
python: pypy3
26+
name: "Test on python pypy3"
27+
env: TOXENV=pypy3
1928

2029
services:
21-
- mongodb
22-
23-
addons:
24-
apt:
25-
sources:
26-
- mongodb-3.0-precise
27-
packages:
28-
- mongodb-org-server
29-
- mongodb-org-shell
30+
- mongodb
3031

3132
install:
32-
- travis_retry pip install --upgrade pip
33-
- travis_retry pip install coveralls
34-
- travis_retry pip install flake8
35-
- travis_retry pip install tox>=1.9
36-
- travis_retry pip install virtualenv
37-
- travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-me$MONGOENGINE | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
38-
39-
# Cache dependencies installed via pip
40-
cache: pip
33+
- travis_retry pip install --upgrade pip
34+
- travis_retry pip install coveralls
35+
- travis_retry pip install flake8
36+
- travis_retry pip install tox>=3.14
37+
- travis_retry pip install virtualenv
4138

4239
script:
43-
- tox -e $(echo py$TRAVIS_PYTHON_VERSION-me$MONGOENGINE | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
40+
- tox
4441

4542
after_success:
46-
- coveralls --verbose
43+
- coveralls --verbose
4744

4845
notifications:
4946
irc: irc.freenode.org#flask-mongoengine
5047

5148
# Only run builds on the master branch and GitHub releases (tagged as vX.Y.Z)
5249
branches:
5350
only:
54-
- master
55-
- /^v.*$/
51+
- master
52+
- /^v.*$/
5653

5754
# Whenever a new release is created via GitHub, publish it on PyPI.
5855
deploy:
@@ -65,11 +62,8 @@ deploy:
6562
distributions: "sdist bdist_wheel"
6663

6764
# only deploy on tagged commits (aka GitHub releases) and only for the
68-
# parent repo's builds running Python 2.7 along with dev MongoEngine (we run
69-
# Travis against many different Python and MongoEngine versions and we don't
70-
# want the deploy to occur multiple times).
65+
# parent repo's builds running Python 3.6
7166
on:
7267
tags: true
73-
condition: "$MONGOENGINE = dev"
74-
python: 2.7
68+
python: 3.6
7569
repo: MongoEngine/flask-mongoengine

Diff for: ‎AUTHORS

+6
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,18 @@ Thomas Steinacher
1212
Anthony Nemitz
1313
Nauman Ahmad
1414

15+
CURRENT MAINTAINER:
16+
17+
Andrey Shpak - https://github.com/insspb
1518

1619
CONTRIBUTORS
1720

1821
Dervived from the git logs, inevitably incomplete but all of whom and others
1922
have submitted patches, reported bugs and generally helped make MongoEngine
2023
that much better:
2124

25+
* Martin Hanzík - https://github.com/martinhanzik
26+
* Tony Narlock - https://github.com/tony
2227
* Dragos - https://github.com/cdragos
2328
* IamFive - https://github.com/IamFive
2429
* mickey06 - https://github.com/mickey06
@@ -36,3 +41,4 @@ that much better:
3641
* Stefan Wojcik - https://github.com/wojcikstefan
3742
* John Cass - https://github.com/jcass77
3843
* Aly Sivji - https://github.com/alysivji
44+
* Buğra İşgüzar - https://github.com/bisguzar

0 commit comments

Comments
 (0)