Documentation added for NJ_FET , Diode IV apps

[jithinbp]

Issues :

• Write md documentation for diode_IV app Write md documentation for diode_IV app #108
• Write md documentation for N-Channel FET app Write md documentation for N-Channel FET app  #109
• Create a /docs/ folder and move all documentation there Create a /docs/ folder and move all documentation there #107 . add screenshots Create screenshots for helpfiles in psl_res/HTML/screenshots #102

Rebasing has been tried , but unsuccessfully. After merging the previous PR, the HEAD should have been level with fossasia/pslab-desktop-apps/development, but that wasn't the case, even though git diff was 0.
This PR has commits belonging to previously merged PRs, but the list of files changed only pertain to the latest changes.

[viveksb007]

@jithinbp there are build errors because setuptools can't be imported.
I think there should be a command in travis to install python3-setuptools first.
Like apt-get install python3-setuptools. I ran into same error when installing locally.
About reflection of previous commits, when you sent PR previously commits in that PR were squashed into a single commit. So your original commits are unique although your​ change in codebase is done. So next time when you send a PR those commits come again.
To solve this I create a branch from master lets call it dev and do changes in it and send a PR suppose it has 4 commits. In remote master branch those 4 commits are squashed into 1 commit. Now my 4 commits are unique and would be reflected again in next PR. So delete current dev branch. Pull changes in master branch and from there create another branch which would have that single squashed commit and not you 4 unique commits.
Hopefully its clear now.

[jithinbp]

The build errors are because of pslab-python's makefile. They were present in the last two PRs also, after PSlab-python was added as a dependency. I'll take care of it

…

On 12 Jun 2017 2:03 p.m., "Vivek Singh" ***@***.***> wrote: @jithinbp <https://github.com/jithinbp> there are build errors because setuptools can't be imported. I think there should be a command in travis to install python3-setuptools first. Like apt-get install python3-setuptools. I ran into same error when installing locally. About reflection of previous commits, when you sent PR previously commits in that PR were squashed into a single commit. So your original commits are unique although your​ change in codebase is done. So next time when you send a PR those commits come again. To solve this I create a branch from master lets call it dev and do changes in it and send a PR suppose it has 4 commits. In remote master branch those 4 commits are squashed into 1 commit. Now my 4 commits are unique and would be reflected again in next PR. So delete current dev branch. Pull changes in master branch and from there create another branch which would have that single squashed commit and not you 4 unique commits. Hopefully its clear now. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#111 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AFzAwmA3LwAapJFVHtxPYrtcFyvtxHbiks5sDPfxgaJpZM4N2v-l> .

[jithinbp]

Thank you for your help with handling the unique commits. I'll try this approach. Does this also mean that I have to delete my branch and start over each time a squash+commit is used for merging a PR?

…

On 12 Jun 2017 2:03 p.m., "Vivek Singh" ***@***.***> wrote: @jithinbp <https://github.com/jithinbp> there are build errors because setuptools can't be imported. I think there should be a command in travis to install python3-setuptools first. Like apt-get install python3-setuptools. I ran into same error when installing locally. About reflection of previous commits, when you sent PR previously commits in that PR were squashed into a single commit. So your original commits are unique although your​ change in codebase is done. So next time when you send a PR those commits come again. To solve this I create a branch from master lets call it dev and do changes in it and send a PR suppose it has 4 commits. In remote master branch those 4 commits are squashed into 1 commit. Now my 4 commits are unique and would be reflected again in next PR. So delete current dev branch. Pull changes in master branch and from there create another branch which would have that single squashed commit and not you 4 unique commits. Hopefully its clear now. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#111 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AFzAwmA3LwAapJFVHtxPYrtcFyvtxHbiks5sDPfxgaJpZM4N2v-l> .

[viveksb007]

Yes, after each squash + commit on remote branch, you need to delete you current branch.
You pull squashed changes from remote branch to your local main branch. Create another branch and solve issue from there.
There might be some other way to handle this.

[jithinbp]

@viveksb007 I've been all over SO, but can't seem to find a better way than what you've mentioned. Can you approve the PR so that the current work can be merged? then I'll delete my branch and start afresh
thanks

[viveksb007]

It can't be merged yet, travis​ build has to be passed for us to merge the PR.
Mario has higher permission, he can merge it.

[CloudyPadmal]

So @viveksb007 to pull from master branch we need to merge these existing commits right?

[CloudyPadmal]

To resolve the issue with commits!

[jithinbp]

@viveksb007 I have the option to 'Squash and merge' , but I'd rather wait for Mario.
In the meantime, I have fixed pslab-python's makefile which is responsible for the broken build. Will rerun travis after the PR is merged

[viveksb007]

@CloudyPadmal yes first these existing commits needs to be merged. If they are squashed and merged, then all of them would be squashed to single commit and added to development branch in this case. Then you pull those changes from remote branch to a branch in which these commits aren't there. Then continue with another issue.

[jithinbp]

@viveksb007 Ideally, if I only add a small number of precise commits, Mario won't have to use 'squash and merge' , so I can continue working without destroying my branch each time. Can you approve PR 69 in pslab-python, so that I can check the travis build here?

[viveksb007]

Yes if there are small meaningful commits we can merge your​ branch with main remote branch then original commits are saved. Then we don't have to delete our branch because commits won't be duplicated.

[jithinbp]

@CloudyPadmal So the build failed again for all three python versions, despite pslab-python dependency install command running fine this time. desktop-apps couldn't find the PSL module

from PSL.commands_proto import applySIPrefix
ImportError: No module named 'PSL'

The makefile ran without a problem on my local machine, and the library is correctly detected.
In the travis build logs, the library is installed to /usr/lib/Python2.7/dist-packages/PSL/ for all python versions. There is no explicit mention of Python2.7 anywhere in the Makefile or Setup.py . Grep says there's one in docs/conf.py, but that should not be relevant here.

The other dependencies install to the following location

cp -f /builds/PyQt-x11-gpl-4.11.3/pyuic/uic/icon_cache.py /home/travis/virtualenv/python3.3.6/lib/python3.3/site-packages/PyQt4/uic/icon_cache.py

while this one tries to enforce debian style paths, and installs in the following way

copying build/lib.linux-x86_64-2.7/PSL/SENSORS/BMP180.py -> /usr/lib/python2.7/dist-packages/PSL/SENSORS

which probably breaks the virtualenv rules, because the referenced path is outside.
I'll try to amend the Makefile to play nice with the virtualenv.