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.

Sign up for GitHub

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

Prepare dev #1588

Merged
merged 2 commits into from
Jun 6, 2023
Merged

Prepare dev #1588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0288a52
Prepare dev.
janiversen Jun 5, 2023
f30ce9f
update examples doc.
janiversen Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MAKE_RELEASE.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Prepare/make release on dev.
* Checkout master locally
* git merge dev
* git push
* git branch -D master
* wait for CI to complete on all branches
* On github "prepare release"
* Create tag e.g. v3.4.0dev0
Expand All @@ -38,6 +39,5 @@ Prepare/make release on dev.
------------------------------------------------------------
Prepare release on dev for new commits.
------------------------------------------------------------
* git branch -D master
* Make pull request "prepare dev", with the following:
* Update pymodbus/__init__.py with version number (__version__ X.Y.Zpre)
4 changes: 2 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
================================
PyModbus - A Python Modbus Stack
================================
We are happy to announce that we have a new home: pymodbus-dev, which is pure 100% FOSS.
The move from a company organization to pymodbus-dev was done to allow a 100% openness in the spirit of FOSS.
We are constantly working the modernize pymodbus and add new features, and we look for people who want to help a bit.
There are challenges small and large not only programming but also documentation and testing.

.. image:: https://github.com/pymodbus-dev/pymodbus/actions/workflows/ci.yml/badge.svg?branch=dev
:target: https://github.com/pymodbus-dev/pymodbus/actions/workflows/ci.yml
Expand Down
8 changes: 6 additions & 2 deletions doc/source/examples.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ Examples

The examples can be downloaded from https://github.com/pymodbus-dev/pymodbus/tree/dev/examples

Examples version 3.x
--------------------
.. tip:: The examples needs to be run from within the examples directory, unless you modify them.
Most examples use helper.py and client_*.py or server_*.py. This is done to avoid maintaining the
same code in multiple files.

Examples:
---------

These examples are considered essential usage examples, and are guaranteed to work,
because they are tested automatilly with each dev branch commit using CI.
Expand Down
2 changes: 1 addition & 1 deletion pymodbus/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
from pymodbus.logging import pymodbus_apply_logging_config


__version__ = "3.3.1"
__version__ = "3.4.0alfa"
__version_full__ = f"[pymodbus, version {__version__}]"