Skip to content

Commit c4c4cfc

Browse files
committed
Clean up after rebasing
1 parent d4ac2f9 commit c4c4cfc

File tree

8 files changed

+9
-12
lines changed

8 files changed

+9
-12
lines changed

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,3 @@ build/
2020

2121
# OS X
2222
.DS_Store
23-
24-
## Ros2 Incompleted Modules
25-
jupyros/ros2/turtle_sim.py
26-
notebooks/ROS2_Turtlesim.ipynb

.gitignore.swo

-12 KB
Binary file not shown.

.gitignore.swp

-12 KB
Binary file not shown.

jupyros/ros2/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
from .._version import __version__
1010

1111
#from ..ros1.ipy import *
12-
#from ..ros1.pubsub import *
13-
from ..ros2.ros_widgets import *
1412
#from ..ros1.ros3d import *
1513
#from ..ros1.server_extension import *
16-
from ..ros2.Publisher import *
17-
from ..ros2.Subscriber import *
18-
from ..ros2.turtle_sim import *
14+
#from ..ros1.turtle_sim import *
15+
16+
from ..ros2.publisher import *
17+
from ..ros2.ros_widgets import *
18+
from ..ros2.subscriber import *

jupyros/ros2/Publisher.py renamed to jupyros/ros2/publisher.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
Date: 19 July 2022
88
99
"""
10+
1011
from typing import TypeVar
1112
import threading
1213
import time
1314
import ipywidgets as widgets
14-
from . import add_widgets
15+
from .ros_widgets import add_widgets
1516
import functools
1617

1718
def rsetattr(obj, attr, val):
File renamed without changes.

notebooks/ROS_Actions_Clients.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
"name": "python",
118118
"nbconvert_exporter": "python",
119119
"pygments_lexer": "ipython3",
120-
"version": "3.8.10"
120+
"version": "3.9.13"
121121
}
122122
},
123123
"nbformat": 4,

notebooks/ROS_Joint_States.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
"name": "python",
231231
"nbconvert_exporter": "python",
232232
"pygments_lexer": "ipython3",
233-
"version": "3.8.10"
233+
"version": "3.9.13"
234234
}
235235
},
236236
"nbformat": 4,

0 commit comments

Comments
 (0)