ska-sa / tango-simlib

Generic data-driven device simulator generation for PyTango
BSD 3-Clause "New" or "Revised" License
6 stars 2 forks source link

4. Applied Futurize stage 2 across the entire repo. #108

Closed amakhaba closed 4 years ago

amakhaba commented 4 years ago

This PR does the following (Apply Futurize stage 2):

Definition of Done Checklist

JIRA: MT-738

mmphego commented 4 years ago

@amakhaba please update branch by merging master into it and fixing up the conflicts.

Please also change the target branch from user/amakhaba/MT-738/Auto-code-format to master as branch user/amakhaba/MT-738/Auto-code-format is already in master and doesn't exists anymore.

See: How to modify a pull request on GitHub to change target branch to merge into?

ajoubertza commented 4 years ago

I'm afraid this PR is a bit of mess now - it shows all the changes from earlier PRs as well, including the black autoformatting. Also a heap of conflicts. Any ideas?

mmphego commented 4 years ago

I'm afraid this PR is a bit of mess now - it shows all the changes from earlier PRs as well, including the black autoformatting. Also a heap of conflicts. Any ideas?

Seems like there are 2 options (IMHO):

  1. Close PR, branch off master, cherry-pick or create new commits and then new PR.
  2. Merge master into current branch, change target branch to master and fix conflicts

But @amakhaba and @tockards can decide.

ajoubertza commented 4 years ago

Option 3: Make a new branch from master and just copy the files from this branch to that one. Make that a new commit.

Loses the commit history, but clean result and much easier.

amakhaba commented 4 years ago

@ajoubertza and @mmphego option 3 sounds like a better one. Can i finish up with the merge conflicts that i am addressing now and then we can plot a way forward

amakhaba commented 4 years ago

@ajoubertza @lanceWilliams @tockards @mmphego I will be closing this PR as it has become to difficult to review please checkout : user/amakhaba/MT-738/Applied-futurize-stage-2 and review for further modifications. For Review please Look at PR - 110