Skip to content

Commit ec91640

Browse files
committed
Prepare dev (#1588)
1 parent 7e15b16 commit ec91640

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

MAKE_RELEASE.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Prepare/make release on dev.
1919
* Checkout master locally
2020
* git merge dev
2121
* git push
22+
* git branch -D master
2223
* wait for CI to complete on all branches
2324
* On github "prepare release"
2425
* Create tag e.g. v3.4.0dev0
@@ -38,6 +39,5 @@ Prepare/make release on dev.
3839
------------------------------------------------------------
3940
Prepare release on dev for new commits.
4041
------------------------------------------------------------
41-
* git branch -D master
4242
* Make pull request "prepare dev", with the following:
4343
* Update pymodbus/__init__.py with version number (__version__ X.Y.Zpre)

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
================================
22
PyModbus - A Python Modbus Stack
33
================================
4-
We are happy to announce that we have a new home: pymodbus-dev, which is pure 100% FOSS.
5-
The move from a company organization to pymodbus-dev was done to allow a 100% openness in the spirit of FOSS.
4+
We are constantly working the modernize pymodbus and add new features, and we look for people who want to help a bit.
5+
There are challenges small and large not only programming but also documentation and testing.
66

77
.. image:: https://github.com/pymodbus-dev/pymodbus/actions/workflows/ci.yml/badge.svg?branch=dev
88
:target: https://github.com/pymodbus-dev/pymodbus/actions/workflows/ci.yml

doc/source/examples.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@ Examples
33

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

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

913
These examples are considered essential usage examples, and are guaranteed to work,
1014
because they are tested automatilly with each dev branch commit using CI.

pymodbus/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
from pymodbus.logging import pymodbus_apply_logging_config
1313

1414

15-
__version__ = "3.3.1"
15+
__version__ = "3.4.0alfa"
1616
__version_full__ = f"[pymodbus, version {__version__}]"

0 commit comments

Comments
 (0)