Merge branch 'rename-project' into 'develop'

Rename pydtn to pydtnsim

See merge request discus/pydtn!19

.gitlab-ci.yml

@@ -7,16 +7,16 @@ pylint:
   stage: test
   script:
     - pip install pylint
-    - pylint pydtn examples
+    - pylint pydtnsim examples
 
 pycodestyle:
   stage: test
   script:
     - pip install pycodestyle
-    - pycodestyle pydtn examples
+    - pycodestyle pydtnsim examples
 
 pydocstyle:
   stage: test
   script:
     - pip install pydocstyle
-    - pydocstyle pydtn examples
+    - pydocstyle pydtnsim examples

README.md

-# pydtn
+# pydtnsim
 
-pydtn is a python module for simulating delay tolerant networks.
+pydtnsim is a python module for simulating delay tolerant networks.
 
 Table of Contents:
 * [Installation](#installation)
@@ -8,11 +8,11 @@ Table of Contents:
 
 ## Installation
 
-pydtn has been run with Python 3.4 and 3.6.
+pydtnsim has been run with Python 3.4 and 3.6.
 
-To install pydtn, simply:
+To install pydtnsim, simply:
 ```
-$ pip install git+https://git.cs.usask.ca/discus/pydtn.git
+$ pip install git+https://git.cs.usask.ca/discus/pydtnsim.git
 ```
 
 ## Usage
@@ -23,15 +23,15 @@ There are examples in the `examples/` directory.
 
 Clone the repository via ssh:
 ```
-$ git clone git@git.cs.usask.ca:discus/pydtn.git
+$ git clone git@git.cs.usask.ca:discus/pydtnsim.git
 ```
 or via https:
 ```
-$ git clone https://git.cs.usask.ca/discus/pydtn.git
+$ git clone https://git.cs.usask.ca/discus/pydtnsim.git
 ```
 
 Then install the package and it's dependencies:
 ```
-$ cd pydtn
+$ cd pydtnsim
 $ pip install --editable .
 ```

examples/random_node.py

@@ -5,7 +5,7 @@ __author__ = "Jarrod Pas <j.pas@usask.ca>"
 import sys
 from random import Random
 
-from pydtn import Network, Node, RandomTrace, RandomTraffic
+from pydtnsim import Network, Node, RandomTrace, RandomTraffic
 
 
 class RandomNode(Node):

examples/shed.py

@@ -9,9 +9,9 @@ from multiprocessing import Pool
 from os import path
 from pprint import pprint
 
-from pydtn import Network, RandomTraffic, Node, EpidemicNode, CSVTrace
-from pydtn.community import BubbleKCliqueNode, BubbleLouvainNode
-from pydtn.community import HCBFKCliqueNode, HCBFLouvainNode
+from pydtnsim import Network, RandomTraffic, Node, EpidemicNode, CSVTrace
+from pydtnsim.community import BubbleKCliqueNode, BubbleLouvainNode
+from pydtnsim.community import HCBFKCliqueNode, HCBFLouvainNode
 
 
 Simulation = namedtuple('Simulation', ['trace', 'node_type', 'seed'])

pydtn/__init__.py → pydtnsim/__init__.py

 """
-pydtn is a module for simulating delay tolerant networks.
+pydtnsim is a module for simulating delay tolerant networks.
 
 A simulation is made up from a Network which contains:
 - A group of nodes which are responsible for forwarding packets to each other.

pydtn/community.py → pydtnsim/community.py

 """
-pydtn community module.
+pydtnsim community module.
 
 Implements the following community detection schemes on epochs:
 - Louvain community detection
@@ -34,7 +34,7 @@ from functools import partial
 import networkx as nx
 from community import best_partition as louvain_partition
 
-from pydtn import Node
+from pydtnsim import Node
 
 
 class Community:

pydtn/shed.py → pydtnsim/shed.py

-"""pydtn module for SHED dataset specific tools."""
+"""pydtnsim module for SHED dataset specific tools."""
 
 __all__ = [
     'write_meta_file',
@@ -15,7 +15,7 @@ from collections import defaultdict
 from itertools import groupby, count
 from os import path
 
-from pydtn import Trace
+from pydtnsim import Trace
 
 
 def write_meta_file(meta_path, csv_path, duty_cycle_length=300):

setup.py

@@ -4,7 +4,7 @@ from distutils.core import setup
 from os import path
 
 def extract_version():
-      with open(path.join('pydtn', '__init__.py')) as f:
+      with open(path.join('pydtnsim', '__init__.py')) as f:
             for line in f:
                   if line.startswith('__version__'):
                         return line.split("'")[1]
@@ -14,9 +14,9 @@ def extract_requirements():
             return f.read().split('\n')
 
 if __name__ == "__main__":
-      setup(name='pydtn',
+      setup(name='pydtnsim',
             description='A delay tolerant network simulator.',
-            packages=['pydtn'],
+            packages=['pydtnsim'],
             version=extract_version(),
             install_requires=extract_requirements(),
       )