Skip to content

Commit

Permalink
Change riptideio to pymodbus-dev. (pymodbus-dev#1292)
Browse files Browse the repository at this point in the history
Change riptideio to pymodbus-dev.
  • Loading branch information
janiversen authored and alexrudd2 committed Feb 21, 2023
1 parent 1d67e0d commit f3127ff
Show file tree
Hide file tree
Showing 19 changed files with 56 additions and 60 deletions.
6 changes: 2 additions & 4 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<!--
Please use the Pymodbus gitter channel at https://gitter.im/pymodbus_dev/Lobby or Stack Overflow(tag [pymodbus](https://stackoverflow.com/questions/tagged/pymodbus) for
support questions.
Before opening a new issue, make sure you do the following:
* check that your issue isn't already filed: https://github.com/riptideio/pymodbus/issues
* check the discussions forum https://github.com/riptideio/pymodbus/discussions
* check that your issue isn't already filed: https://github.com/pymodbus-dev/pymodbus/issues
* check the discussions forum https://github.com/pymodbus-dev/pymodbus/discussions
* prepare a short, runnable example that reproduce the issue with the latest development version of Pymodbus
-->

Expand Down
40 changes: 20 additions & 20 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ version 3.1.1

Thanks to:

Alex
Alexandre CUER
Dries
jan iversen
Alex,
Alexandre CUER,
Dries,
jan iversen,
peufeu2


Expand Down Expand Up @@ -46,13 +46,13 @@ version 3.1.0

Thanks to:

Alex
banana-sun
Chris Hung
dhoomakethu
jan iversen
Matthias Straka
Pavel Kostromitinov
Alex,
banana-sun,
Chris Hung,
dhoomakethu,
jan iversen,
Matthias Straka,
Pavel Kostromitinov,

version 3.0.2
----------------------------------------------------------
Expand Down Expand Up @@ -86,15 +86,15 @@ version 3.0.2

Thanks to:

Alex
Alexandre CUER
Blaise Thompson
dhoomakethu
Gao Fang
jan Iversen
Joe Burmeister
Sebastian Machuca
Thijs W
Alex,
Alexandre CUER,
Blaise Thompson,
dhoomakethu,
Gao Fang,
jan Iversen,
Joe Burmeister,
Sebastian Machuca,
Thijs W,
WouterTuinstra

version 3.0.1
Expand Down
28 changes: 13 additions & 15 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
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 riptideio (a company) was done to allow a 100% openness in the spirit of FOSS.
The move from a company organization to pymodbus-dev was done to allow a 100% openness in the spirit of FOSS.

.. image:: https://github.com/riptideio/pymodbus/actions/workflows/ci.yml/badge.svg?branch=dev
:target: https://github.com/riptideio/pymodbus/actions/workflows/ci.yml
.. image:: https://badges.gitter.im/Join%20Chat.svg
:target: https://gitter.im/pymodbus_dev/Lobby
.. 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
.. image:: https://readthedocs.org/projects/pymodbus/badge/?version=latest
:target: https://pymodbus.readthedocs.io/en/latest/?badge=latest
:alt: Documentation Status
Expand All @@ -22,12 +20,12 @@ The move from riptideio (a company) was done to allow a 100% openness in the spi
Supported versions
------------------------------------------------------------

Version `2.5.3 <https://github.com/riptideio/pymodbus/releases/tag/v2.5.3>`_ is the last 2.x release (Supports python 2.7.x - 3.7).
Version `2.5.3 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v2.5.3>`_ is the last 2.x release (Supports python 2.7.x - 3.7).

Version `3.1.1 <https://github.com/riptideio/pymodbus/releases/tag/v3.1.1>`_ is the current release (Supports Python >=3.8).
Version `3.1.1 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.1.1>`_ is the current release (Supports Python >=3.8).

.. important::
All API changes after 3.0.0 are documented in `API_changes.rst <https://github.com/riptideio/pymodbus/blob/dev/API_changes.rst>`_
All API changes after 3.0.0 are documented in `API_changes.rst <https://github.com/pymodbus-dev/pymodbus/blob/dev/API_changes.rst>`_


------------------------------------------------------------
Expand Down Expand Up @@ -91,7 +89,7 @@ base operating system will allow (*allow* in this case means how many Virtual IP

For more information please browse the project documentation:

https://riptideio.github.io/pymodbus/
https://pymodbus-dev.github.io/pymodbus/
or
https://readthedocs.org/docs/pymodbus/en/latest/index.html

Expand Down Expand Up @@ -124,10 +122,10 @@ Examples Directory structure
├── v2.5.3 -> Examples not updated to version 3.0.0.
├── contrib -> Examples contributed by contributors.

Also, if you have a question, please `create a post in discussions q&a topic <https://github.com/riptideio/pymodbus/discussions/new?category=q-a>`_,
Also, if you have a question, please `create a post in discussions q&a topic <https://github.com/pymodbus-dev/pymodbus/discussions/new?category=q-a>`_,
so that others can benefit from the results.

If you think, that something in the code is broken/not running well, please `open an issue <https://github.com/riptideio/pymodbus/issues/new>`_, read the Template-text first and then post your issue with your setup information.
If you think, that something in the code is broken/not running well, please `open an issue <https://github.com/pymodbus-dev/pymodbus/issues/new>`_, read the Template-text first and then post your issue with your setup information.

------------------------------------------------------------
Pymodbus REPL (Read Evaluate Print Loop)
Expand All @@ -143,7 +141,7 @@ Pymodbus REPL comes with many handy features such as payload decoder
to directly retrieve the values in desired format and supports all
the diagnostic function codes directly .

For more info on REPL Client refer `Pymodbus REPL Client <https://github.com/riptideio/pymodbus/tree/dev/pymodbus/repl>`_
For more info on REPL Client refer `Pymodbus REPL Client <https://github.com/pymodbus-dev/pymodbus/tree/dev/pymodbus/repl>`_

.. image:: https://asciinema.org/a/y1xOk7lm59U1bRBE2N1pDIj2o.png
:target: https://asciinema.org/a/y1xOk7lm59U1bRBE2N1pDIj2o
Expand All @@ -154,7 +152,7 @@ Pymodbus REPL Server

Pymodbus also comes with a REPL server to quickly run an asynchronous server with additional capabilities out of the box like simulating errors, delay, mangled messages etc.

For more info on REPL Server refer `Pymodbus REPL Server <https://github.com/riptideio/pymodbus/tree/dev/pymodbus/repl>`_
For more info on REPL Server refer `Pymodbus REPL Server <https://github.com/pymodbus-dev/pymodbus/tree/dev/pymodbus/repl>`_

.. image:: https://img.youtube.com/vi/OutaVz0JkWg/maxresdefault.jpg
:target: https://youtu.be/OutaVz0JkWg
Expand Down Expand Up @@ -194,7 +192,7 @@ Or to install a specific release:

Otherwise you can pull the trunk source and install from there::

git clone git://github.com/riptideio/pymodbus.git
git clone git://github.com/pymodbus-dev/pymodbus.git
cd pymodbus
pip install -r requirements.txt

Expand Down Expand Up @@ -370,7 +368,7 @@ Contributing
Just fork the repo and raise your PR against `dev` branch.

Here are some of the items waiting to be done:
https://github.com/riptideio/pymodbus/blob/dev/doc/TODO
https://github.com/pymodbus-dev/pymodbus/blob/dev/doc/TODO

------------------------------------------------------------
License Information
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
# sys.path.extend([examples, example_common, example_contrib, example_gui])
# sys.path.insert(0, os.path.abspath("../"))

github_doc_root = "https://github.com/riptideio/pymodbus/tree/master/doc/" # pylint: disable=invalid-name
github_doc_root = "https://github.com/pymodbus-dev/pymodbus/tree/master/doc/" # pylint: disable=invalid-name
# -- General configuration ------------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
Expand Down
2 changes: 1 addition & 1 deletion examples/server_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def setup_server(args):
info_name={
"VendorName": "Pymodbus",
"ProductCode": "PM",
"VendorUrl": "https://github.com/riptideio/pymodbus/",
"VendorUrl": "https://github.com/pymodbus-dev/pymodbus/",
"ProductName": "Pymodbus Server",
"ModelName": "Pymodbus Server",
"MajorMinorRevision": version.short(),
Expand Down
2 changes: 1 addition & 1 deletion examples/v2.5.3/callback_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def run_callback_server():
info_name={
"VendorName": "pymodbus",
"ProductCode": "PM",
"VendorUrl": "https://github.com/riptideio/pymodbus/",
"VendorUrl": "https://github.com/pymodbus-dev/pymodbus/",
"ProductName": "pymodbus Server",
"ModelName": "pymodbus Server",
"MajorMinorRevision": version.short(),
Expand Down
2 changes: 1 addition & 1 deletion examples/v2.5.3/custom_datablock.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def run_custom_db_server():
info_name={
"VendorName": "pymodbus",
"ProductCode": "PM",
"VendorUrl": "https://github.com/riptideio/pymodbus/",
"VendorUrl": "https://github.com/pymodbus-dev/pymodbus/",
"ProductName": "pymodbus Server",
"ModelName": "pymodbus Server",
"MajorMinorRevision": version.short(),
Expand Down
2 changes: 1 addition & 1 deletion examples/v2.5.3/custom_synchronous_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def run_server():
info_name={
"VendorName": "Pymodbus",
"ProductCode": "PM",
"VendorUrl": "https://github.com/riptideio/pymodbus/",
"VendorUrl": "https://github.com/pymodbus-dev/pymodbus/",
"ProductName": "Pymodbus Server",
"ModelName": "Pymodbus Server",
"MajorMinorRevision": version.short(),
Expand Down
2 changes: 1 addition & 1 deletion examples/v2.5.3/dbstore_update_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ async def run_dbstore_update_server():
info_name={
"VendorName": "pymodbus",
"ProductCode": "PM",
"VendorUrl": "https://github.com/riptideio/pymodbus/",
"VendorUrl": "https://github.com/pymodbus-dev/pymodbus/",
"ProductName": "pymodbus Server",
"ModelName": "pymodbus Server",
"MajorMinorRevision": version.short(),
Expand Down
2 changes: 1 addition & 1 deletion examples/v2.5.3/deviceinfo_showcase_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def run_server():
info_name={
"VendorName": "Pymodbus",
"ProductCode": "PM",
"VendorUrl": "https://github.com/riptideio/pymodbus/",
"VendorUrl": "https://github.com/pymodbus-dev/pymodbus/",
"ProductName": "Pymodbus Server",
"ModelName": "Pymodbus Server",
"MajorMinorRevision": version.short(),
Expand Down
2 changes: 1 addition & 1 deletion examples/v2.5.3/modbus_mapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
info_name={
"VendorName": "Pymodbus",
"ProductCode": "PM",
"VendorUrl": "https://github.com/riptideio/pymodbus/",
"VendorUrl": "https://github.com/pymodbus-dev/pymodbus/",
"ProductName": "Pymodbus Server",
"ModelName": "Pymodbus Server",
"MajorMinorRevision": version.short(),
Expand Down
2 changes: 1 addition & 1 deletion examples/v2.5.3/tornado_twisted/asynchronous_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def run_async_server():
"ModelName": "Pymodbus Server",
"MajorMinorRevision": version.short(),
"ProductCode": "PM",
"VendorUrl": "https://github.com/riptideio/pymodbus/",
"VendorUrl": "https://github.com/pymodbus-dev/pymodbus/",
"ProductName": "Pymodbus Server",
}
)
Expand Down
2 changes: 1 addition & 1 deletion pymodbus/repl/client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Commands:
# Or using a Docker run command instead
✗ docker run -it riptideio/pymodbus pymodbus.console --help
✗ docker run -it pymodbus-dev/pymodbus pymodbus.console --help
```
TCP Options

Expand Down
2 changes: 1 addition & 1 deletion pymodbus/repl/server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Invoke REPL server with `pymodbus.server run` command.
If using the docker image, you can run all the same commands, prepending the `docker run` command. For example:

```shell
docker run -it riptideio/pymodbus pymodbus.server --help
docker run -it pymodbus-dev/pymodbus pymodbus.server --help
```

```shell
Expand Down
2 changes: 1 addition & 1 deletion pymodbus/server/reactive/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ def create_identity(
cls,
vendor="Pymodbus",
product_code="PM",
vendor_url="https://github.com/riptideio/pymodbus/",
vendor_url="https://github.com/pymodbus-dev/pymodbus/",
product_name="Pymodbus Server",
model_name="Reactive Server",
version=pymodbus_version.short(),
Expand Down
2 changes: 1 addition & 1 deletion pymodbus/server/simulator/OLD.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ def create_identity(
cls,
vendor="Pymodbus",
product_code="PM",
vendor_url="https://github.com/riptideio/pymodbus/",
vendor_url="https://github.com/pymodbus-dev/pymodbus/",
product_name="Pymodbus Server",
model_name="Reactive Server",
version=pymodbus_version.short(),
Expand Down
8 changes: 4 additions & 4 deletions pymodbus/server/simulator/setup.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"identity": {
"VendorName": "pymodbus",
"ProductCode": "PM",
"VendorUrl": "https://github.com/riptideio/pymodbus/",
"VendorUrl": "https://github.com/pymodbus-dev/pymodbus/",
"ProductName": "pymodbus Server",
"ModelName": "pymodbus Server",
"MajorMinorRevision": "3.1.0"
Expand All @@ -31,7 +31,7 @@
"identity": {
"VendorName": "pymodbus",
"ProductCode": "PM",
"VendorUrl": "https://github.com/riptideio/pymodbus/",
"VendorUrl": "https://github.com/pymodbus-dev/pymodbus/",
"ProductName": "pymodbus Server",
"ModelName": "pymodbus Server",
"MajorMinorRevision": "3.1.0"
Expand All @@ -51,7 +51,7 @@
"identity": {
"VendorName": "pymodbus",
"ProductCode": "PM",
"VendorUrl": "https://github.com/riptideio/pymodbus/",
"VendorUrl": "https://github.com/pymodbus-dev/pymodbus/",
"ProductName": "pymodbus Server",
"ModelName": "pymodbus Server",
"MajorMinorRevision": "3.1.0"
Expand All @@ -66,7 +66,7 @@
"identity": {
"VendorName": "pymodbus",
"ProductCode": "PM",
"VendorUrl": "https://github.com/riptideio/pymodbus/",
"VendorUrl": "https://github.com/pymodbus-dev/pymodbus/",
"ProductName": "pymodbus Server",
"ModelName": "pymodbus Server",
"MajorMinorRevision": "3.1.0"
Expand Down
2 changes: 1 addition & 1 deletion pymodbus/server/simulator/web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</fieldset>
</form>
<p>Powered by:
<a href="https://github.com/riptideio/pymodbus"><b>pymodbus</b></a> an open source project, patches are welcome.
<a href="https://github.com/pymodbus-dev/pymodbus"><b>pymodbus</b></a> an open source project, patches are welcome.
</p>
</div>
<div class="main">
Expand Down
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ platforms = 'Linux', 'Mac OS X', 'Win'
description = A fully featured modbus protocol stack in python
keywords = modbus, asyncio, scada, client, server, simulator
long_description = file: README.rst
url = https://github.com/riptideio/pymodbus/
url = https://github.com/pymodbus-dev/pymodbus/
classifiers =
Development Status :: 4 - Beta
Environment :: Console
Expand All @@ -27,8 +27,8 @@ classifiers =
Topic :: System :: Networking
Topic :: Utilities
project_urls =
Source Code = https://github.com/riptideio/pymodbus
Bug Reports = https://github.com/riptideio/pymodbus/issues
Source Code = https://github.com/pymodbus-dev/pymodbus
Bug Reports = https://github.com/pymodbus-dev/pymodbus/issues
Docs: Dev = https://pymodbus.readthedocs.io/en/latest/?badge=latest
Discord = https://discord.gg/vcP8qAz2

Expand Down

0 comments on commit f3127ff

Please sign in to comment.