Merge pull request #75 from gramaziokohler/neutral_lang

master to main/roscore

Author: beverlylytle

.github/workflows/build.yml

@@ -3,10 +3,10 @@ name: build
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   build-cpython:

CHANGELOG.rst

@@ -12,7 +12,8 @@ Unreleased
 
 **Changed**
 
-* Changed behavior: Advertising services automatically reconnect when websockets is reconnected
+* Changed behavior: Advertising services automatically reconnect when websockets is reconnected.
+* References to ROS master change to ROS.
 
 **Added**
 

CONTRIBUTING.rst

@@ -22,7 +22,7 @@ We love pull requests from everyone! Here's a quick guide to improve the code:
 
     invoke test
 
-5. Start making your changes to the **master** branch (or branch off of it).
+5. Start making your changes to the **main** branch (or branch off of it).
 6. Make sure all tests still pass:
 
 ::

README.rst

@@ -107,6 +107,15 @@ command prompt to ease recurring operations:
 
 For more details, check the *Contributor's Guide* available as part of `the documentation <https://roslibpy.readthedocs.io/>`_.
 
+The default branch was recently renamed to `main`. If you've already cloned this repository,
+you'll need to update your local repository structure with the following lines:
+
+::
+
+    git branch -m master main
+    git fetch origin
+    git branch -u origin/main main
+
 
 Releasing this project
 ----------------------

docs/examples.rst

@@ -7,7 +7,7 @@ you have ROS and `rosbridge` running (see :ref:`ros-setup`).
 
 These examples assume ROS is running on the same computer where you run the examples.
 If that is not the case, change the ``host`` argument from ``'localhost'``
-to the *IP Address* of your ROS master.
+to the *IP Address* of your ROS instance.
 
 First connection
 ----------------
@@ -139,7 +139,7 @@ Now open a second command prompt and start the listener:
 .. note::
 
     It is not relevant where the files are located. They can be in different
-    folders or even in different computers as long as the ROS master is the same.
+    folders or even in different computers as long as the ROS instance is the same.
 
 
 Using services

docs/examples/02_check_latency.rst

@@ -9,7 +9,7 @@ This example shows how to check roundtrip message latency on your system.
 The output on the console should look similar to the following::
 
     $ python 02_check_latency.py
-    2020-04-09 07:45:49,909     INFO: Connection to ROS MASTER ready.
+    2020-04-09 07:45:49,909     INFO: Connection to ROS ready.
     2020-04-09 07:45:50,431     INFO: Age of message:      2ms
     2020-04-09 07:45:50,932     INFO: Age of message:      2ms
     2020-04-09 07:45:51,431     INFO: Age of message:      1ms

src/roslibpy/comm/comm_autobahn.py

@@ -27,7 +27,7 @@ def onConnect(self, response):
         LOGGER.debug('Server connected: %s', response.peer)
 
     def onOpen(self):
-        LOGGER.info('Connection to ROS MASTER ready.')
+        LOGGER.info('Connection to ROS ready.')
         self._manual_disconnect = False
         self.factory.ready(self)
 

src/roslibpy/comm/comm_cli.py

@@ -71,7 +71,7 @@ def on_open(self, task):
             self.factory.client_connection_failed(self, err_code, err_desc)
             return
 
-        LOGGER.info('Connection to ROS MASTER ready.')
+        LOGGER.info('Connection to ROS ready.')
         self._manual_disconnect = False
         self.factory.ready(self)
         self.factory.manager.call_in_thread(self.start_listening)

src/roslibpy/ros.py

@@ -53,7 +53,7 @@ def is_connected(self):
         return self.factory.is_connected
 
     def connect(self):
-        """Connect to ROS master."""
+        """Connect to ROS."""
         # Don't try to reconnect if already connected.
         if self.is_connected or self.is_connecting:
             return
@@ -67,7 +67,7 @@ def _unset_connecting_flag(*args):
         self.factory.connect()
 
     def close(self):
-        """Disconnect from ROS master."""
+        """Disconnect from ROS."""
         if self.is_connected:
             def _wrapper_callback(proto):
                 self.emit('closing')
@@ -175,7 +175,7 @@ def _wrapper_callback(proto):
         self.factory.on_ready(_wrapper_callback)
 
     def send_on_ready(self, message):
-        """Send message to the ROS Master once the connection is established.
+        """Send message to ROS once the connection is established.
 
         If a connection to ROS is already available, the message is sent immediately.
 
@@ -224,7 +224,7 @@ def get_call_results(result_placeholder):
         return get_call_results
 
     def call_sync_service(self, message, timeout):
-        """Send a blocking service request to the ROS Master once the connection is established,
+        """Send a blocking service request to ROS once the connection is established,
         waiting for the result to be return.
 
         If a connection to ROS is already available, the request is sent immediately.
@@ -240,7 +240,7 @@ def call_sync_service(self, message, timeout):
         return self.blocking_call_from_thread(get_call_results, timeout)
 
     def call_async_service(self, message, callback, errback):
-        """Send a service request to the ROS Master once the connection is established.
+        """Send a service request to ROS once the connection is established.
 
         If a connection to ROS is already available, the request is sent immediately.