Skip to content

Commit e44b6f3

Browse files
author
Sahil Kumar
authored
Merge pull request #33 from salarx/azure-testing
Azure testing
2 parents 0917125 + 46b030a commit e44b6f3

File tree

1 file changed

+49
-34
lines changed

1 file changed

+49
-34
lines changed

README.md

Lines changed: 49 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,95 @@
11
# FusionIIIT
22

3-
**FusionIIIT** is the automation of various functionalities, modules and tasks of/for PDPM Indian Institute of Information Technology, Design and Manufacturing, Jabalpur being developed in python3.6 and using django webframework version 1.11
3+
**FusionIIIT** is the automation of various functionalities, modules and tasks of/for **PDPM Indian Institute of Information Technology, Design and Manufacturing, Jabalpur** being developed in `python3.6` and using `Django` Webframework version `1.11`
44

55
## System Requirements
6-
Ubuntu 18.04 (or newer)
6+
7+
* **Ubuntu `18.04`** (or newer) *OR*
8+
* **WSL** for **Windows 10** \(Follow the guide below\) :
9+
[Windows Subsystem for Linux Installation Guide for Windows 10](https://docs.microsoft.com/en-us/windows/wsl/install-win10)
710

811
## Software Requirements
9-
* Python 3.6
10-
* PostgreSQL 10.10
12+
13+
* Python `3.6`
14+
* PostgreSQL `10.10`
1115
* Git
1216

1317
## How to get started
1418

15-
* Install the required packages using the following command :
16-
`sudo apt install PostgreSQL PostgreSQL-contrib python3.6-dev python-virtualenv build-essential git`
19+
* Install the required packages using the following command :
20+
`sudo apt install PostgreSQL PostgreSQL-contrib python3.6-dev python-virtualenv build-essential git`
1721

1822
### Downloading the Code
19-
* Go to (https://github.com/salarx/Fusion) and click on **Fork**
20-
* You will be redirected to *your* fork, `https://github.com/<yourname>/Fusion`
21-
* Open the terminal, enter into the directory where you want to clone the Fusion repository using `cd <path_of_choice>/`
23+
24+
* Go to (<https://github.com/salarx/Fusion)> and click on **Fork**
25+
* You will be redirected to *your* fork, `https://github.com/<your_user_name>/Fusion`
26+
* Open the terminal, change to the directory where you want to clone the **Fusion** repository
2227
* Clone your repository using `git clone https://github.com/<your_user_name>/Fusion`
2328
* Enter the cloned directory using `cd Fusion/`
2429

2530
### Run
26-
* Install virtualenv
27-
- on Ubuntu: `sudo apt install python-virtualenv`
28-
- on Windows Powershell `pip install virtualenv`
31+
32+
* Install *virtualenv*
33+
* on **Ubuntu**: `sudo apt install python-virtualenv`
34+
* on **Windows Powershell**: `pip install virtualenv`
2935
* Create a virtual environment
30-
- on Ubuntu: `virtualenv env -p python3.6`
31-
- on Windows Powershell: `virtualenv env`
32-
* Activate the env
33-
- on Ubuntu: `source env/bin/activate`
34-
- on Windows Powershell: `. .\env\scripts\activate`
36+
* on **Ubuntu**: `virtualenv env -p python3.6`
37+
* on **Windows Powershell**: `virtualenv env`
38+
* Activate the *env*
39+
* on **Ubuntu**: `source env/bin/activate`
40+
* on **Windows Powershell**: `. .\env\scripts\activate`
3541
* Install the requirements: `pip install -r requirements.txt`
3642
* Replace the files
37-
- on Ubuntu: `env/lib/python3.6/site-packages/notifications`
38-
- on Windows: `env/lib/site-packages/notifications`
39-
- with the files in `notif_package_mod` folder inside the current directory
40-
* Change directory to FusionIIIT `cd FusionIIIT`
41-
* Make migrations `python manage.py makemigrations`
43+
* on **Ubuntu**: `env/lib/python3.6/site-packages/notifications`
44+
* on **Windows**: `env/lib/site-packages/notifications`
45+
with the files in **notif_package_mod** folder inside the current directory
46+
* Change directory to **FusionIIIT** `cd FusionIIIT`
47+
* Make *migrations* `python manage.py makemigrations`
4248
* Migrate the changes to the database `$ python manage.py migrate`
4349
* Run the server `python manage.py runserver`
4450

4551
### Setting upstream
52+
4653
* `git remote add upstream https://github.com/salarx/Fusion`
47-
- Adds the remote repository (the repository you forked from) so that changes can be pulled from/pushed to it.
54+
* Adds the remote repository (the repository you forked from) so that changes can be pulled from/pushed to it
4855

4956
## Working with Code \(Method 1\)
5057

5158
### Checking out
59+
5260
* `git checkout -b <module-name>`
53-
- Creates a new branch `<module-name>` in your repository.
61+
* Creates a new branch `<module-name>` in your repository
5462
* `git checkout <module-name>`
55-
- Switches to the branch you just created.
63+
* Switches to the branch you just created
5664

5765
### Committing
66+
5867
* `git add .`
59-
- Adds the changes to the staging area
68+
* Adds the changes to the staging area
6069
* `git commit`
61-
- Commits the staged changes
70+
* Commits the staged changes
6271

6372
### Syncing
73+
6474
#### Pulling
75+
6576
* `git pull upstream master`
66-
- Pull the changes from the upstream master branch. Make sure you have no uncommited changes.
77+
* Pulls the changes from the *upstream* master branch
78+
6779
#### Pushing
80+
6881
* `git push -u origin <module-name>`
69-
- Push the changes to your repository \(First time only\). Using `git push` is sufficient later on.
70-
* Go to `https://github.com/<your_user_name>/Fusion/tree/<module-name>` and create pull request.
82+
* Pushes the changes to your repository **\(First time only\)**; using `git push` is sufficient later on
83+
* Go to `https://github.com/<your_user_name>/Fusion/tree/<module-name>` and create pull request
7184

7285
## Working with Code \(Alternative\)
73-
* **(Recommended)** Use [Visual Studio Code](https://code.visualstudio.com/) as a text editor. Go through the [Tutorial](https://code.visualstudio.com/docs/python/python-tutorial) for getting started with **Visual Studio Code for Python**.
74-
* Use the inbuilt **Source Control** feature for checking out, committing, pushing, pulling changes. You can also use [Github Desktop](https://desktop.github.com/) \(Windows/Mac only\).
75-
Refer to below link for best practices regarding commit messages
76-
- (https://gist.github.com/robertpainsi/b632364184e70900af4ab688decf6f53)
7786

87+
* **(Recommended)** Use [Visual Studio Code](https://code.visualstudio.com/) as a text editor. Go through the [Tutorial](https://code.visualstudio.com/docs/python/python-tutorial) for getting started with **Visual Studio Code for Python**.
88+
**Note** : Use the following guide if using **WSL** for Development
89+
(<https://code.visualstudio.com/docs/remote/wsl)>
90+
* Use the inbuilt **Source Control** feature for checking out, committing, pushing, pulling changes. You can also use [Github Desktop](https://desktop.github.com/) **_\(Windows/Mac only\)_**.
91+
* Refer to below link for best practices regarding commit messages :
92+
(<https://gist.github.com/robertpainsi/b632364184e70900af4ab688decf6f53)>
7893

7994
## Different modules included
8095

0 commit comments

Comments
 (0)