Skip to content

Commit 8bbb9a6

Browse files
committed
Fixed conflict
2 parents 6a4a694 + 8bf3391 commit 8bbb9a6

2 files changed

Lines changed: 11 additions & 26 deletions

File tree

django_installation/README.md

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,30 @@
1-
# Python & Django installation
1+
# Django installation
22

33
*This chapter is based on awesome tutorials by Geek Girls Carrots (http://django.carrots.pl/) and django-marcador (http://django-marcador.keimlink.de/).*
44

5-
## Python Installation
5+
## Virtual environment
66

7-
Django is written in Python. We need it to do anything in Django. Let's start with installing it!
7+
Before we will install Django, we will make you install something very handy and useful, that will help you with keeping everything tidy on your computer. It is possible to skip this step, but we think, that you should start with the best setup possible to save a lot of troubles in a future.
88

9-
### Windows
10-
11-
You can download Python for Windows from website https://www.python.org/download/releases/3.4.0/. After downloading ***.msi** file, you should execute it (double-click on it) and follow the instructions there. It is important to remember the path (the folder) where we installed the Python. It will be needed later.
12-
13-
### Linux
9+
That's why we want you to create a Virtual environment (also called `virtualenv`). It will isolate things you do from your computer, so you will have everything important in one place. Neat, right?
1410

15-
It is very probable, that you already have Python installed out of the box. To check if you have it installed (and which version it is), you type in a console:
11+
All you need to do is find a folder in which you want to create the `virtualenv`, for example your home directory. In Windows it could look like: `C:\Users\Ala\` (where Ala is the name of the user).
1612

17-
$ python --version
18-
Python 3.4.0
13+
### Windows
1914

20-
If you don't have Python instaled or you want different version, you can install it as follows.
15+
To create `virtualenv` you need to open command line `cmd` and type there `C:\Python\python -m venv blog`. It will look like this:
2116

22-
#### Ubuntu
17+
C:\Users\Ala> C:\Python34\python -m venv blog
2318

24-
You type in the console:
19+
where `C:\Python34\python` is folder in which you previously installed Python and `blog` is a name of your `virtualenv`. You can use any other name, but stick to lowercase and use no spaces. It is also good idea to keep the name short :).
2520

26-
sudo apt-get install python3.4
21+
### Linux
2722

23+
### OS X
2824

29-
#### Fedora
3025

31-
Yout type in the console:
3226

33-
sudo yum install python3.4
3427

35-
### OS X
3628

37-
You need to go to the website https://www.python.org/download/releases/3.4.0/ and install the appropriate package for you operating system.
3829

39-
----
4030

41-
If you have any doubts or something went wrong and you have no idea what to do next - please ask your coach! Sometimes things are not going smoothly and it's better to ask for help someone with more experience.

try_python/README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,3 @@ That's it. __You totally rock!__ It really wasn't so easy, so you should feel pr
456456
Grab yourself a cupcake and go to the next chapter :)
457457

458458
![Cupcake](images/cupcake.png)
459-
460-
461-
462-

0 commit comments

Comments
 (0)