s_ranjbar/summer_course_2024
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New update of WINDOWS_INSTALL.md

Browse Source
This commit is contained in:
Pilar 2022-05-10 13:20:21 -04:00
parent 6b10fdf9c0
commit 4299656f59
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
WINDOWS_INSTALL.md
View File

@ -120,15 +120,16 @@ Restart the computer and come back to step 1 of this section.
5. Go to the Terminal (a tab in the bottom) to finish this process. You should see 5. Go to the Terminal (a tab in the bottom) to finish this process. You should see
_PS C:\Users\Pilar\PycharmProjects\hub>_ preceded either by _(base)_ or _(hub)_. If non of those are there, _PS C:\Users\Pilar\PycharmProjects\hub>_ preceded either by _(base)_ or _(hub)_. If non of those are there,
gbe sure that you have Miniconda installed and included in the path as explained in be sure that you have Miniconda installed and included in the path as explained in
[previous chapter Get Miniconda](WINDOWS_INSTALL.md#Get Miniconda). If not, do it, restart Pycharm, and come back to this point. [previous chapter Get Miniconda](WINDOWS_INSTALL.md#Get Miniconda). If not, do it, restart Pycharm, and come back to this point.
If the environment you are working in is _(base)_, type 'conda activate hub', click enter, and the environment should change to _(hub)_. If the environment you are working in is _(base)_, type 'conda activate ' and the project's name, in this case 'conda activate hub'.
If this didn't work, contact Guillermo (guillermo.gutierrezmorote@concordia.ca) or Koa (kekoa.wells@concordia.ca) for some help. Click enter, and the environment should change to _(hub)_. If this didn't work, contact Guillermo
(guillermo.gutierrezmorote@concordia.ca) or Koa (kekoa.wells@concordia.ca) for some help.
![configure interpreter 4](docs/img_windows_install/img_29.png) ![configure interpreter 4](docs/img_windows_install/img_29.png)
Once you are in _(hub)_, 'type pip install -r .\requirements.txt' and wait until all requirements are installed. In the 6. Once you are in _(hub)_, type 'pip install -r .\requirements.txt' and wait until all requirements are installed. In the
bottom-right corner you should be able to see a bar showing the progress. bottom-right corner you should be able to see a bar showing the progress.
## Create Your Own Branch of the Hub ## Create Your Own Branch of the Hub
@ -217,7 +218,9 @@ section above, but using the URL link that you just copied for your gitlab proje
![pycharm add hub](docs/img_windows_install/img_7.png) ![pycharm add hub](docs/img_windows_install/img_7.png)
6. Still in the **Settings** window, configure your Python interpreter (yes, again, you have to do this step for each new project) 6. Still in the **Settings** window, configure your Python interpreter (yes, again, you have to do this step for each new project)
by following the steps explained before in [chapter Configure Python Interpreter](WINDOWS_INSTALL.md#Configure Python Interpreter) by following steps 1 to 5 explained in [chapter Configure Python Interpreter](WINDOWS_INSTALL.md#Configure Python Interpreter).
Then, to install the requirements, type 'cd..' and enter. Then 'pip install -r .\hub\requirements.txt' and wait until all requirements are installed. In the
bottom-right corner you should be able to see a bar showing the progress. Finally, type 'cd ' and your project's name.
7. Now, add your first file to your project and click on install requirements to automatically download all the dependencies (in blue at top-right corner). 7. Now, add your first file to your project and click on install requirements to automatically download all the dependencies (in blue at top-right corner).
@ -226,7 +229,7 @@ by following the steps explained before in [chapter Configure Python Interpreter
If the blue message doesn't appear, click on the **Terminal** tab (bottom-left), type _pip install -r .\requirements.txt_ If the blue message doesn't appear, click on the **Terminal** tab (bottom-left), type _pip install -r .\requirements.txt_
and press enter. and press enter.
4. When all the dependencies are satisfied, you are all set to start importing your first city model. 8. When all the dependencies are satisfied, you are all set to start importing your first city model.
Add the following code to your main.py Add the following code to your main.py
@ -237,7 +240,7 @@ from imports.geometry_factory import GeometryFactory
city = GeometryFactory('citygml', 'myfile.gml').city city = GeometryFactory('citygml', 'myfile.gml').city
``` ```
5. Always remember to push your own project changes as the last thing you do before ending your working day! 9. Always remember to push your own project changes as the last thing you do before ending your working day!
First, commit your changes by clicking on the green check in the top-right corner of Pycharm. Add a comment that explains briefly your changes. First, commit your changes by clicking on the green check in the top-right corner of Pycharm. Add a comment that explains briefly your changes.
Then, pull by clicking on the blue arrow to be sure that there are no conflicts between your version (local) and the remote one (gitlab). Then, pull by clicking on the blue arrow to be sure that there are no conflicts between your version (local) and the remote one (gitlab).
Once the conflicts are solved and the merge in local is done, push the changes by clicking on the green arrow. Once the conflicts are solved and the merge in local is done, push the changes by clicking on the green arrow.