Skip to content

Commit 6dc79e6

Browse files
toddbirchardtoddbirchard
committed
Merge.
2 parents 8aa1446 + 48d1ba8 commit 6dc79e6

File tree

7 files changed

+60
-26
lines changed

7 files changed

+60
-26
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,4 @@ __pycache__
136136
.idea
137137

138138
# Virtual environment
139-
.venv/
139+
.venv/

‎LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2020 Hackers and Slackers
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎Pipfile.lock

Lines changed: 17 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,27 @@
44
![Flask](https://img.shields.io/badge/Flask-v1.1.1-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
55
![GitHub Last Commit](https://img.shields.io/github/last-commit/google/skia.svg?style=flat-square&colorA=4c566a&colorB=a3be8c&logo=GitHub)
66
[![GitHub Issues](https://img.shields.io/github/issues/hackersandslackers/flask-jinja-tutorial.svg?style=flat-square&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-jinja-tutorial/issues)
7-
[![GitHub Stars](https://img.shields.io/github/stars/hackersandslackers/flask-jinja-tutorial.svg?style=flat-square8&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-jinja-tutorial/stargazers)
7+
[![GitHub Stars](https://img.shields.io/github/stars/hackersandslackers/flask-jinja-tutorial.svg?style=flat-square&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-jinja-tutorial/stargazers)
88
[![GitHub Forks](https://img.shields.io/github/forks/hackersandslackers/flask-jinja-tutorial.svg?style=flat-square&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-jinja-tutorial/network)
99

1010
![Flask Jinja Tutorial](https://storage.googleapis.com/hackersandslackers-cdn/2019/02/jinja@2x.jpg)
1111

1212
Source code for the accompanying tutorial found here: https://hackersandslackers.com/flask-jinja-templates/
1313

14-
## Getting Started
14+
## Installation
1515

16-
Installation is recommended with Poetry:
16+
**Installation via `requirements.txt`**:
1717

1818
```shell
1919
$ git clone https://github.com/hackersandslackers/flask-jinja-tutorial.git
2020
$ cd flask-jinja-tutorial
21-
$ poetry shell
22-
$ poetry install
23-
$ poetry run
21+
$ python3 -m venv myenv
22+
$ source myenv/bin/activate
23+
$ pip3 install -r requirements.txt
24+
$ flask run
2425
```
2526

26-
With Pipenv:
27+
**Installation via [Pipenv](https://pipenv-fork.readthedocs.io/en/latest/)**:
2728

2829
```shell
2930
$ git clone https://github.com/hackersandslackers/flask-jinja-tutorial.git
@@ -33,14 +34,15 @@ $ pipenv update
3334
$ flask run
3435
```
3536

36-
Alternatively, try installing via `setup.py`:
37+
**Installation via [Poetry](https://python-poetry.org/)**:
3738

3839
```shell
3940
$ git clone https://github.com/hackersandslackers/flask-jinja-tutorial.git
4041
$ cd flask-jinja-tutorial
41-
$ python3 setup.py install
42-
$ flask run
42+
$ poetry shell
43+
$ poetry update
44+
$ poetry run
4345
```
4446
-----
4547

46-
**Hackers and Slackers** tutorials are free of charge. If you found this tutorial helpful, a [small donation](https://www.buymeacoffee.com/hackersslackers) would be greatly appreciated to keep us in business. All proceeds go towards coffee, and all coffee goes towards more content.
48+
**Hackers and Slackers** tutorials are free of charge. If you found this tutorial helpful, a [small donation](https://www.buymeacoffee.com/hackersslackers) would be greatly appreciated to keep us in business. All proceeds go towards coffee, and all coffee goes towards more content.

‎poetry.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ keywords = [
1616

1717
[tool.poetry.dependencies]
1818
python = "^3.8"
19-
flask = "^1.1.1"
19+
flask = "*"
2020

2121
[tool.poetry.dev-dependencies]
2222
black = "^20.8b1"

‎requirements.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
click==7.1.2
2+
Flask==1.1.2
3+
itsdangerous==1.1.0
4+
Jinja2==2.11.2
5+
MarkupSafe==1.1.1
6+
Werkzeug==1.0.1

0 commit comments

Comments
 (0)