Qucs / qucs

Qucs Project official mirror
http://qucs.sourceforge.net/
GNU General Public License v2.0
1.16k stars 213 forks source link

Travis check03 #963

Closed oxmon-2500 closed 4 years ago

oxmon-2500 commented 4 years ago

python 3.6

guitorri commented 4 years ago

Nice. Thank you. Can I merge https://github.com/Qucs/qucs-test/pull/36? Then you can update the submodule to sync with the master branch of qucs-test.

oxmon-2500 commented 4 years ago

Hi, yes python migration is final. Pls merge it

On 2/13/20 11:59 AM, Guilherme Brondani Torri wrote:

Nice. Thank you. Can I merge Qucs/qucs-test#36 https://github.com/Qucs/qucs-test/pull/36? Then you can update the submodule to sync with the master branch of qucs-test.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/Qucs/qucs/pull/963?email_source=notifications&email_token=ADLP2UVZKXXGOBT3GN2X44TRCUR2ZA5CNFSM4KUOOCOKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOELUJ2SI#issuecomment-585669961, or unsubscribe https://github.com/notifications/unsubscribe-auth/ADLP2UTGG4OZX5A2Y4MMWX3RCUR2ZANCNFSM4KUOOCOA.

guitorri commented 4 years ago

Done. Please update the qucs-test submodule and push again to this PR.

in3otd commented 4 years ago

uh, why Travis didn't run here??

guitorri commented 4 years ago

Not sure why Travis didn't build.

@oxmon-2500, merging qucs develop branch into your PR is not what you want. You want to update qucs-test submodule on qucs develop branch and keep your fixes done on .travis.yml

Something like:

cd ~/git/qucs
git checkout develop
git pull origin develop #update develop
git checkout -b test-python3 # new branch
cd qucs-test
git pull origin master
cd ..
git add qucs-test
git commit -m "update qucs-test to python3"
git cherry-pick  3adb88e # fixes to .travis.yml
# push and force update your branch and this PR
git push -f [oxmon-remote-name] test-python3:travisCheck03
# or just push test-python3 to your fork and create another PR

Let me know if you wan't me to do this for you.

oxmon-2500 commented 4 years ago

Not sure why Travis didn't build.

@oxmon-2500, merging qucs develop branch into your PR is not what you want. You want to update qucs-test submodule on qucs develop branch and keep your fixes done on .travis.yml

Something like:

cd ~/git/qucs
git checkout develop
git pull origin develop #update develop
git checkout -b test-python3 # new branch
cd qucs-test
git pull origin master
cd ..
git add qucs-test
git commit -m "update qucs-test to python3"
git cherry-pick  3adb88e # fixes to .travis.yml
# push and force update your branch and this PR
git push -f [oxmon-remote-name] test-python3:travisCheck03
# or just push test-python3 to your fork and create another PR

Let me know if you wan't me to do this for you.

OK, I think it is better if you do this. My experience with git is growing but still far from perfect :-) I will analyse the above approach carefully and learn more

guitorri commented 4 years ago

Travis did not run because there was a typo in the .travis.yml file. If failed to parse. Your patches are now moved to #964.