Skip to content

Commit 5353546

Browse files
authored
Merge pull request #12 from vroncevic/dev
[flask_func_struct] updated docs & FHW actions
2 parents 3eb93f9 + 0207d0a commit 5353546

38 files changed

+3176
-4098
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Changes/Fixes # .
2+
3+
Changes proposed in this pull requests
4+
5+
-
6+
7+
-
8+
9+
-
10+
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: TOC Generator flask_func_struct
2+
on:
3+
push:
4+
paths:
5+
- '**.md'
6+
jobs:
7+
generateTOC:
8+
name: TOC Generator
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: technote-space/toc-generator@v2
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Triage flask_func_struct
2+
on:
3+
issues:
4+
types: [opened]
5+
jobs:
6+
commentOnNewIssues:
7+
name: Comment On New Issues
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: Comment On New Issues
12+
uses: actions/github@v1.0.0
13+
env:
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
with:
16+
args: comment "[flask_func_struct] should be supported for Python 2.7, 3.5, 3.6, 3.7, 3.8"

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
__pycache__/
22
*.py[cod]
33
*$py.class
4-
.idea

CODE_OF_CONDUCT.md

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md)
4+
5+
## Our Pledge
6+
7+
We as members, contributors, and leaders pledge to make participation in our
8+
community a harassment-free experience for everyone, regardless of age, body
9+
size, visible or invisible disability, ethnicity, sex characteristics, gender
10+
identity and expression, level of experience, education, socio-economic status,
11+
nationality, personal appearance, race, religion, or sexual identity
12+
and orientation.
13+
14+
We pledge to act and interact in ways that contribute to an open, welcoming,
15+
diverse, inclusive, and healthy community.
16+
17+
## Our Standards
18+
19+
Examples of behavior that contributes to a positive environment for our
20+
community include:
21+
22+
- Demonstrating empathy and kindness toward other people
23+
- Being respectful of differing opinions, viewpoints, and experiences
24+
- Giving and gracefully accepting constructive feedback
25+
- Accepting responsibility and apologizing to those affected by our mistakes,
26+
and learning from the experience
27+
- Focusing on what is best not just for us as individuals, but for the
28+
overall community
29+
30+
Examples of unacceptable behavior include:
31+
32+
- The use of sexualized language or imagery, and sexual attention or
33+
advances of any kind
34+
- Trolling, insulting or derogatory comments, and personal or political attacks
35+
- Public or private harassment
36+
- Publishing others' private information, such as a physical or email
37+
address, without their explicit permission
38+
- Other conduct which could reasonably be considered inappropriate in a
39+
professional setting
40+
41+
## Enforcement Responsibilities
42+
43+
Community leaders are responsible for clarifying and enforcing our standards of
44+
acceptable behavior and will take appropriate and fair corrective action in
45+
response to any behavior that they deem inappropriate, threatening, offensive,
46+
or harmful.
47+
48+
Community leaders have the right and responsibility to remove, edit, or reject
49+
comments, commits, code, wiki edits, issues, and other contributions that are
50+
not aligned to this Code of Conduct, and will communicate reasons for moderation
51+
decisions when appropriate.
52+
53+
## Scope
54+
55+
This Code of Conduct applies within all community spaces, and also applies when
56+
an individual is officially representing the community in public spaces.
57+
Examples of representing our community include using an official e-mail address,
58+
posting via an official social media account, or acting as an appointed
59+
representative at an online or offline event.
60+
61+
## Enforcement
62+
63+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
64+
reported to the community leaders responsible for enforcement at
65+
.
66+
All complaints will be reviewed and investigated promptly and fairly.
67+
68+
All community leaders are obligated to respect the privacy and security of the
69+
reporter of any incident.
70+
71+
## Enforcement Guidelines
72+
73+
Community leaders will follow these Community Impact Guidelines in determining
74+
the consequences for any action they deem in violation of this Code of Conduct:
75+
76+
### 1. Correction
77+
78+
**Community Impact**: Use of inappropriate language or other behavior deemed
79+
unprofessional or unwelcome in the community.
80+
81+
**Consequence**: A private, written warning from community leaders, providing
82+
clarity around the nature of the violation and an explanation of why the
83+
behavior was inappropriate. A public apology may be requested.
84+
85+
### 2. Warning
86+
87+
**Community Impact**: A violation through a single incident or series
88+
of actions.
89+
90+
**Consequence**: A warning with consequences for continued behavior. No
91+
interaction with the people involved, including unsolicited interaction with
92+
those enforcing the Code of Conduct, for a specified period of time. This
93+
includes avoiding interactions in community spaces as well as external channels
94+
like social media. Violating these terms may lead to a temporary or
95+
permanent ban.
96+
97+
### 3. Temporary Ban
98+
99+
**Community Impact**: A serious violation of community standards, including
100+
sustained inappropriate behavior.
101+
102+
**Consequence**: A temporary ban from any sort of interaction or public
103+
communication with the community for a specified period of time. No public or
104+
private interaction with the people involved, including unsolicited interaction
105+
with those enforcing the Code of Conduct, is allowed during this period.
106+
Violating these terms may lead to a permanent ban.
107+
108+
### 4. Permanent Ban
109+
110+
**Community Impact**: Demonstrating a pattern of violation of community
111+
standards, including sustained inappropriate behavior, harassment of an
112+
individual, or aggression toward or disparagement of classes of individuals.
113+
114+
**Consequence**: A permanent ban from any sort of public interaction within
115+
the community.
116+
117+
## Attribution
118+
119+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
120+
version 2.0, available at
121+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
122+
123+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
124+
enforcement ladder](https://github.com/mozilla/diversity).
125+
126+
[homepage]: https://www.contributor-covenant.org
127+
128+
For answers to common questions about this code of conduct, see the FAQ at
129+
https://www.contributor-covenant.org/faq. Translations are available at
130+
https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Contributing to flask_func_struct
2+
3+
The following is a set of guidelines for contributing to flask_func_struct and its package, which are hosted in the [flask_func_struct](https://github.com/vroncevic/flask_func_struct) on GitHub. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
4+
5+
## Code of Conduct
6+
7+
flask_func_struct project and everyone participating in it is governed by the [flask_func_struct Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [flask_func_struct](mailto:elektron.ronca@gmail.com).

Dockerfile

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,36 @@
1616
FROM debian:10
1717
RUN apt-get update
1818
RUN DEBIAN_FRONTEND=noninteractive \
19-
apt-get install -yq --no-install-recommends \
20-
tree \
21-
htop \
22-
python \
23-
python-pip \
24-
python-wheel
19+
apt-get install -yq --no-install-recommends \
20+
vim \
21+
nano \
22+
tree \
23+
htop \
24+
wget \
25+
unzip \
26+
ca-certificates \
27+
openssl \
28+
python \
29+
python-dev \
30+
python3 \
31+
python3-dev \
32+
libyaml-dev
2533

26-
RUN pip install --upgrade setuptools
34+
RUN wget https://bootstrap.pypa.io/pip/2.7/get-pip.py
35+
RUN python2 get-pip.py
36+
RUN python2 -m pip install --upgrade setuptools
37+
RUN python2 -m pip install --upgrade pip
38+
RUN python2 -m pip install --upgrade build
39+
RUN rm -f get-pip.py
40+
RUN wget https://bootstrap.pypa.io/get-pip.py
41+
RUN python3 get-pip.py
42+
RUN python3 -m pip install --upgrade setuptools
43+
RUN python3 -m pip install --upgrade pip
44+
RUN python3 -m pip install --upgrade build
45+
RUN rm -f get-pip.py
2746
COPY requirements.txt /
28-
RUN pip install -r requirements.txt
47+
RUN pip2 install -r requirements.txt
48+
RUN pip3 install -r requirements.txt
2949
RUN rm -f requirements.txt
3050
RUN mkdir /manage_commands/
3151
COPY manage_commands /manage_commands/

README.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
**flask_func_struct** is framework for managing Flask App.
66

7-
Developed in **[python](https://www.python.org/)** code: **100%**.
7+
Developed in **[python](https://www.python.org/)** code.
88

99
The README is used to introduce the modules and provide instructions on
1010
how to install the modules, any machine dependencies it may have and any
@@ -20,6 +20,7 @@ other information that should be provided before the modules are installed.
2020
- [Dependencies](#dependencies)
2121
- [Package structure](#package-structure)
2222
- [Docs](#docs)
23+
- [Contributing](#contributing)
2324
- [Copyright and licence](#copyright-and-licence)
2425

2526
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -29,7 +30,8 @@ other information that should be provided before the modules are installed.
2930
Navigate to **[release page](https://github.com/vroncevic/flask_func_struct/releases)** download and extract release archive.
3031

3132
To install modules type the following
32-
```
33+
34+
```bash
3335
tar xvzf flask_func_struct-x.y.z.tar.gz
3436
cd flask_func_struct-x.y.z/
3537
pip install -r requirements.txt
@@ -45,7 +47,8 @@ Or You can use docker to create image/container.
4547
### Dependencies
4648

4749
**flask_func_struct** requires other modules and libraries (Python 2.x/3.x)
48-
```
50+
51+
```bash
4952
* Flask
5053
* Flask-Migrate
5154
* Flask-Script
@@ -63,7 +66,8 @@ Or You can use docker to create image/container.
6366
### Package structure
6467

6568
Expected framework structure
66-
```
69+
70+
```bash
6771
app_server/
6872
├── configuration/
6973
│   ├── database/
@@ -148,6 +152,10 @@ app_server/
148152
* [flask_func_struct.readthedocs.io](https://flask_func_struct.readthedocs.io/en/latest/)
149153
* [www.python.org](https://www.python.org/)
150154

155+
### Contributing
156+
157+
[Contributing to config_flask](CONTRIBUTING.md)
158+
151159
### Copyright and licence
152160

153161
[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)

_config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
theme: jekyll-theme-slate
1+
theme: jekyll-theme-slate
2+
markdown: kramdown
3+
kramdown:
4+
parse_block_html: true
-919 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)