Skip to content

Commit 9c73f08

Browse files
northernSagenorthernSage
committed
solve conflicts
2 parents 05be561 + f01e17d commit 9c73f08

28 files changed

+1141
-438
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**Environment (please complete the following information):**
27+
- OS: [e.g. macOS Catalina]
28+
- Python Version [e.g. 3.8.5]
29+
- pytest-flask version [e.g. 0.15.0]
30+
31+
**Additional context**
32+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: 'feature request'
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎.github/workflows/main.yml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: build
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
tox_env: [
14+
"py35",
15+
"py36",
16+
"py37",
17+
"py38",
18+
"pre",
19+
"linting",
20+
]
21+
22+
include:
23+
- tox_env: "py35"
24+
python: "3.5"
25+
- tox_env: "py36"
26+
python: "3.6"
27+
- tox_env: "py37"
28+
python: "3.7"
29+
- tox_env: "py38"
30+
python: "3.8"
31+
- tox_env: "pre"
32+
python: "3.7"
33+
- tox_env: "linting"
34+
python: "3.7"
35+
36+
steps:
37+
- uses: actions/checkout@v1
38+
- name: Set up Python
39+
uses: actions/setup-python@v1
40+
with:
41+
python-version: ${{ matrix.python }}
42+
- name: Install tox
43+
run: |
44+
python -m pip install --upgrade pip
45+
pip install tox
46+
- name: Test
47+
run: |
48+
tox -e ${{ matrix.tox_env }}
49+
50+
deploy:
51+
52+
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
53+
54+
runs-on: ubuntu-latest
55+
56+
needs: build
57+
58+
steps:
59+
- uses: actions/checkout@v1
60+
- name: Set up Python
61+
uses: actions/setup-python@v1
62+
with:
63+
python-version: "3.7"
64+
- name: Install wheel
65+
run: |
66+
python -m pip install --upgrade pip
67+
pip install --upgrade wheel setuptools
68+
- name: Build package
69+
run: |
70+
python setup.py sdist bdist_wheel
71+
- name: Publish package to PyPI
72+
uses: pypa/gh-action-pypi-publish@master
73+
with:
74+
user: __token__
75+
password: ${{ secrets.pypi_token }}

‎.gitignore

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*.egg-info
44
build
55
sdist
6-
6+
.vscode
77
__pycache__/
88

99
# virtualenv
@@ -17,6 +17,10 @@ htmlcov/
1717
.tox/
1818
.coverage
1919
.coverage.*
20-
.cache
20+
.pytest_cache/
21+
.eggs/
2122
coverage.xml
2223
tests/junit.xml
24+
25+
pytest_flask/_version.py
26+
.vscode

‎.pre-commit-config.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v3.2.0
4+
hooks:
5+
- id: check-byte-order-marker
6+
- id: trailing-whitespace
7+
- id: end-of-file-fixer
8+
- id: fix-encoding-pragma
9+
args: [--remove]
10+
- id: check-yaml
11+
- repo: https://github.com/asottile/reorder_python_imports
12+
rev: v2.3.5
13+
hooks:
14+
- id: reorder-python-imports
15+
args: ['--application-directories=.:src', --py3-plus]
16+
- repo: https://github.com/python/black
17+
rev: 20.8b1
18+
hooks:
19+
- id: black
20+
- repo: https://gitlab.com/pycqa/flake8
21+
rev: 3.8.3
22+
hooks:
23+
- id: flake8
24+
additional_dependencies: [flake8-bugbear]
25+
- repo: local
26+
hooks:
27+
- id: rst
28+
name: rst
29+
entry: rst-lint --encoding utf-8
30+
files: ^(HOWTORELEASE.rst|README.rst)$
31+
language: python
32+
additional_dependencies: [pygments, restructuredtext_lint]

‎.travis.yml

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

‎CODE_OF_CONDUCT.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at [email protected]. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

0 commit comments

Comments
 (0)