Giter VIP home page Giter VIP logo

Comments (6)

dbrattli avatar dbrattli commented on August 16, 2024

Should not be too difficult. Look at the other schedulers. You basically need to figure out how to schedule timeouts with PyQT. I see there's a QTimer that could work. Please reach out if you need any help, or if you want med to look at some code.

from rxpy.

jdreaver avatar jdreaver commented on August 16, 2024

Hey @dbrattli, I have implemented a Qt mainloop scheduler in my fork of RxPY (see my latest commits). However, I can't open a pull request against the develop branch because it is behind master by 14 commits right now. I think master needs to be merged into develop. What should I do?

from rxpy.

dbrattli avatar dbrattli commented on August 16, 2024

Shouln't be a problem. Just merge master into develop to get up-to-date:

> git checkout develop
> git merge master

Now resolve conflicts, if any and retry the pull request. You may also use git rebase instead. Isn't that so @leinz?

from rxpy.

leinz avatar leinz commented on August 16, 2024

@dbrattli You can use rebase or merge, but it will make unnecessary noise when pulling in these two commits.

@jdreaver You only have two commits, so the cleanest tool to get them into your develop branch is by using cherry-pick. First sync your develop branch with the upstream repository and then cherry-pick your commits into the develop branch:

> git remote add upstream [email protected]:ReactiveX/RxPY.git
> git fetch upstream
> git checkout develop
> git merge upstream/develop
> git cherry-pick aa66978
> git cherry-pick 1d88af9
> git push origin develop   (assuming your remote name is origin)

Then you create the pull request from your updated develop branch. Hopefully you can cherry-pick without any conflicts.

If you later want to remove the commits from the master branch:

> git checkout master
> git reset --hard HEAD~2
> git push -f origin master

from rxpy.

jdreaver avatar jdreaver commented on August 16, 2024

Oh, I am silly. I didn't think to simply put the commits on my fork's develop branch. For some reason I just assumed that this repo's develop branch would be more up-to-date with master. Thanks for the info, I'll open the pull request!

from rxpy.

lock avatar lock commented on August 16, 2024

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

from rxpy.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.