trompamusic / trompace-client

A python library to read from and write to the Trompa CE
Apache License 2.0
1 stars 0 forks source link

Added music composition mutations and tests #26

Closed pc2752 closed 4 years ago

alastair commented 4 years ago

This PR can delete work.py too, if this code is duplicated

pc2752 commented 4 years ago

I'm not sure why the conflicts are not showing up on my end again, but I've made the changes required.

pc2752 commented 4 years ago

git fetch origin and git pull just show "Already up-to-date", with no conflicts. But this page shows conflicts in 5 files.

alastair commented 4 years ago

what branch are you on when you're running those commands? your add_composition one? You'll have to merge master into the branch to fix these conflicts. Try this:

git checkout master
git fetch origin
git merge origin/master
git checkout add_composition
git merge master
alastair commented 4 years ago

great, thanks. Will get this merged today

alastair commented 4 years ago

I've made some changes to this, please take a look at them:

Can you please look at the tests for musiccomposition and update the following things:

thanks!

alastair commented 4 years ago

Looks good, but I see 3 failing tests:

looks like they're all to do with loading the expected text file