Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed import from __future__ #58

Merged
merged 5 commits into from
Dec 23, 2019
Merged

Removed import from __future__ #58

merged 5 commits into from
Dec 23, 2019

Conversation

TarunTomar122
Copy link
Contributor

Fixes #56

Brief description of what is fixed or changed

Removed import from future as it was unnecessary for python 3

Other comments

@codecov
Copy link

codecov bot commented Dec 21, 2019

Codecov Report

Merging #58 into master will decrease coverage by 0.007%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##            master      #58       +/-   ##
============================================
- Coverage   98.177%   98.17%   -0.008%     
============================================
  Files           19       19               
  Lines         1262     1257        -5     
============================================
- Hits          1239     1234        -5     
  Misses          23       23
Impacted Files Coverage Δ
pydatastructs/utils/misc_util.py 95.652% <ø> (-0.182%) ⬇️
pydatastructs/linear_data_structures/arrays.py 100% <ø> (ø) ⬆️
...datastructs/miscellaneous_data_structures/stack.py 92.307% <ø> (-0.146%) ⬇️
pydatastructs/trees/binary_trees.py 96.437% <ø> (-0.01%) ⬇️
...datastructs/linear_data_structures/linked_lists.py 100% <ø> (ø) ⬆️

Impacted file tree graph

@czgdp1807
Copy link
Member

There are still some files which are still having imports __future__. Probably, you haven't updated your master branch locally.

@czgdp1807
Copy link
Member

Why closed?

@TarunTomar122
Copy link
Contributor Author

TarunTomar122 commented Dec 21, 2019 via email

@czgdp1807
Copy link
Member

Rather than making a new pull request, update this only by pushing changes here.

@czgdp1807 czgdp1807 reopened this Dec 21, 2019
@czgdp1807
Copy link
Member

You can merge master branch(after updating it by pulling the changes) into your branch and resume working on it.
If things don't work out well while pushing you can use --force to update the remote branch.

@TarunTomar122
Copy link
Contributor Author

How shall i update my forked branch with you master branch...Mine is still 2commits behind your master branch

@czgdp1807
Copy link
Member

czgdp1807 commented Dec 21, 2019

Follow the steps given below,

  1. git checkout master
  2. git pull origin master
  3. git checkout Test
  4. git merge master
  5. // make updates to Test
  6. git push origin_user Test

Here origin refers to the remote of our main repository and origin_user refers to the remote of your forked branch.

@TarunTomar122
Copy link
Contributor Author

And how can i update the same pull request??
shall i make a pull request from test to your master

@TarunTomar122
Copy link
Contributor Author

I think it's updated now plz take a look! i have made some Changes in Test Branches (i.e. removed Future imports from 5 Files)

@czgdp1807
Copy link
Member

Make changes to Test branch locally and push the changes via remote of your forked branch using a command something like,
git push <remote-of-your-forked-branch> <name-of-the-branch>
By doing so, this PR will be updated automatically.

@czgdp1807
Copy link
Member

Yes, it's updated.

@czgdp1807
Copy link
Member

I think you forgot to remove the line from https://github.com/codezonediitj/pydatastructs/blob/master/pydatastructs/trees/binary_trees.py
In fact, you can search for the line in the complete package by using Ctrl+Shift+E and remove them one by one from each of the file.

@TarunTomar122
Copy link
Contributor Author

I think I have removed the line from all the files and there is no more such lines left in my latest commit already!

Copy link
Contributor Author

@TarunTomar122 TarunTomar122 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed all such line...

@czgdp1807 czgdp1807 merged commit b313dc4 into codezonediitj:master Dec 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove imports from __future__
2 participants