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

Dev3.7 async keyword changes #346

Merged
merged 9 commits into from
Oct 23, 2018
Merged

Dev3.7 async keyword changes #346

merged 9 commits into from
Oct 23, 2018

Conversation

dices
Copy link
Contributor

@dices dices commented Sep 28, 2018

Renamed pymodbus.server.async to pymodbus.server.asynchronous
Modified asyncio.async to use asyncio.ensure_future
Added missing prompt_toolkit dependency to requirements-docs.txt
Updated references in documentation
Updated examples

@dices
Copy link
Contributor Author

dices commented Oct 2, 2018

Just removed the python3.7 configuration from Travis while the 3.7 support is added to it

@NovapaX
Copy link

NovapaX commented Oct 3, 2018

I would love it if this could get merged into 3.7 branch
(and maybe merge latest release into dev 3.7 too?)

That way I could easily test this in my project.

@dhoomakethu
Copy link
Contributor

@NovapaX I can merge this in to 3.7 branch in some time, once I sync up the latest on master to dev3.7 branch.

…ev3.7

# Conflicts:
#	CHANGELOG.rst
#	doc/conf.py
#	pymodbus/framer/ascii_framer.py
#	pymodbus/framer/binary_framer.py
#	pymodbus/framer/rtu_framer.py
#	pymodbus/framer/socket_framer.py
#	pymodbus/repl/client.py
#	pymodbus/repl/completer.py
#	pymodbus/server/asynchronous.py
@dhoomakethu
Copy link
Contributor

@dices Thanks for fixing the merge conflicts. I will take some time over the weekend to review and merge this in to the dev3.7 branch. Appreciate your effort.

@dhoomakethu dhoomakethu merged commit e09fed7 into pymodbus-dev:dev3.7 Oct 23, 2018
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants