moved from poetry to regular setup.py

* added first github action

* moved from poetry to regular setup.py

* updated workflows

* added workflow_dispatch

* next try

* next try

.github/workflows/main.yml

@@ -0,0 +1,35 @@
+name: Main
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.7] # , 3.8, 3.9
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install .
+    - name: Run simple example
+      run: python examples/simple/main.py
+    - name: Publish package
+      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/publish.yml

@@ -0,0 +1,22 @@
+name: Publish new release on PyPI
+
+on:
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.8'
+    - name: Build
+      run: python setup.py sdist
+    - name: Publish
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}

.gitignore

@@ -1,9 +1,6 @@
 # Project
 **/results/**/*.csv
 
-# Poetry
-poetry.lock
-
 # IDE
 .idea
 

leaf/examples/smart_city_traffic/city.py → examples/smart_city_traffic/city.py

@@ -3,11 +3,11 @@
 import networkx as nx
 import simpy
 
-from leaf.examples.smart_city_traffic.infrastructure import Cloud, FogNode, TrafficLight, LinkWanUp, LinkEthernet, \
+from examples.smart_city_traffic.infrastructure import Cloud, FogNode, TrafficLight, LinkWanUp, LinkEthernet, \
     LinkWifiBetweenTrafficLights, LinkWanDown, LinkWifiTaxiToTrafficLight, Taxi
-from leaf.examples.smart_city_traffic.mobility import Location
-from leaf.examples.smart_city_traffic.orchestrator import CityOrchestrator
-from leaf.examples.smart_city_traffic.settings import *
+from examples.smart_city_traffic.mobility import Location
+from examples.smart_city_traffic.orchestrator import CityOrchestrator
+from examples.smart_city_traffic.settings import *
 from leaf.infrastructure import Infrastructure
 
 

leaf/examples/smart_city_traffic/infrastructure.py → examples/smart_city_traffic/infrastructure.py

@@ -3,7 +3,7 @@
 import simpy
 
 from leaf.application import Application, SourceTask, ProcessingTask, SinkTask
-from leaf.examples.smart_city_traffic.settings import *
+from examples.smart_city_traffic.settings import *
 from leaf.infrastructure import Link, Node
 from leaf.power import PowerModelLink, PowerModelNode, PowerModelNodeShared, PowerMeasurement
 

leaf/examples/smart_city_traffic/main.py → examples/smart_city_traffic/main.py

@@ -4,11 +4,11 @@
 import simpy
 from tqdm import tqdm
 
-from leaf.examples.smart_city_traffic.city import City
-from leaf.examples.smart_city_traffic.infrastructure import Cloud, FogNode, Taxi, LinkWanDown, LinkWanUp, \
+from examples.smart_city_traffic.city import City
+from examples.smart_city_traffic.infrastructure import Cloud, FogNode, Taxi, LinkWanDown, LinkWanUp, \
     LinkWifiTaxiToTrafficLight, LinkWifiBetweenTrafficLights, TrafficLight
-from leaf.examples.smart_city_traffic.mobility import MobilityManager
-from leaf.examples.smart_city_traffic.settings import SIMULATION_TIME, FOG_DCS, POWER_MEASUREMENT_INTERVAL, \
+from examples.smart_city_traffic.mobility import MobilityManager
+from examples.smart_city_traffic.settings import SIMULATION_TIME, FOG_DCS, POWER_MEASUREMENT_INTERVAL, \
     FOG_IDLE_SHUTDOWN
 from leaf.infrastructure import Infrastructure
 from leaf.power import PowerMeter

leaf/examples/smart_city_traffic/mobility.py → examples/smart_city_traffic/mobility.py

@@ -4,8 +4,8 @@
 import networkx as nx
 import simpy
 
-from leaf.examples.smart_city_traffic.infrastructure import TrafficLight, Taxi
-from leaf.examples.smart_city_traffic.settings import UPDATE_MOBILITY_INTERVAL, MAX_CARS_PER_MINUTE, RNG, \
+from examples.smart_city_traffic.infrastructure import TrafficLight, Taxi
+from examples.smart_city_traffic.settings import UPDATE_MOBILITY_INTERVAL, MAX_CARS_PER_MINUTE, RNG, \
     TAXI_COUNT_DISTRIBUTION, TAXI_SPEED_DISTRIBUTION
 
 

leaf/examples/smart_city_traffic/orchestrator.py → examples/smart_city_traffic/orchestrator.py

@@ -1,8 +1,8 @@
 import math
 
 from leaf.application import Application, ProcessingTask
-from leaf.examples.smart_city_traffic.infrastructure import FogNode, Cloud
-from leaf.examples.smart_city_traffic.settings import FOG_UTILIZATION_THRESHOLD, FOG_DCS, FOG_IDLE_SHUTDOWN
+from examples.smart_city_traffic.infrastructure import FogNode, Cloud
+from examples.smart_city_traffic.settings import FOG_UTILIZATION_THRESHOLD, FOG_DCS, FOG_IDLE_SHUTDOWN
 from leaf.infrastructure import Infrastructure, Node
 from leaf.orchestrator import Orchestrator
 

setup.py

@@ -0,0 +1,55 @@
+import os
+from setuptools import setup
+
+here = os.path.abspath(os.path.dirname(__file__))
+with open(os.path.join(here, "README.md"), encoding="utf-8") as f:
+    long_description = "\n" + f.read()
+
+if __name__ == "__main__":
+    setup(
+        name='leafsim',
+        use_scm_version=True,
+        author="Philipp Wiesner",
+        author_email="[email protected]",
+        description="Simulator for modeling energy consumption in cloud, fog, and edge computing environments",
+        long_description=long_description,
+        keywords=["simulation", "modeling", "fog computing", "energy consumption", "edge computing"],
+        url="https://github.com/dos-group/leaf",
+        project_urls={
+            "Bug Tracker": "https://github.com/dos-group/leaf/issues",
+            "Documentation": "https://leaf.readthedocs.io/",
+        },
+        packages=["leaf"],
+        license="MIT",
+        python_requires=">=3.6",
+        setup_requires=['setuptools_scm'],
+        install_requires=[
+            'networkx~=2.5',
+            'numpy~=1.20',
+            'pandas~=1.2',
+            'simpy~=4.0',
+            'tqdm~=4.0',
+        ],
+        extras_require={
+            "docs": ["sphinx", "alabaster"]
+        },
+        classifiers=[
+            "Development Status :: 3 - Alpha",
+            "Intended Audience :: Education",
+            "Intended Audience :: Science/Research",
+            "License :: OSI Approved :: MIT License",
+            "Operating System :: OS Independent",
+            "Programming Language :: Python",
+            "Programming Language :: Python :: 3",
+            "Programming Language :: Python :: 3.6",
+            "Programming Language :: Python :: 3.7",
+            "Programming Language :: Python :: 3.8",
+            "Programming Language :: Python :: 3.9",
+            "Topic :: Education",
+            "Topic :: Scientific/Engineering",
+            "Topic :: Scientific/Engineering :: Information Analysis",
+            "Topic :: Software Development :: Libraries :: Python Modules",
+            "Topic :: System :: Distributed Computing",
+            "Typing :: Typed",
+        ],
+    )