From c81d72139851c8619bed58740ecc577eb8866291 Mon Sep 17 00:00:00 2001 From: William Ledda Date: Tue, 7 Apr 2020 18:23:13 +0200 Subject: [PATCH] Fix packaging --- DHT_lcd1602.py => raspydht/DHT_lcd1602.py | 2 +- DHT_read.py => raspydht/DHT_read.py | 3 +-- LCD1602.py => raspydht/LCD1602.py | 0 __init__.py => raspydht/__init__.py | 0 DHT_plot_rt.py => rtplot/DHT_plot_rt.py | 2 +- DataSet.py => rtplot/DataSet.py | 0 rtplot/__init__.py | 1 + setup.py | 12 +++++++++++- 8 files changed, 15 insertions(+), 5 deletions(-) rename DHT_lcd1602.py => raspydht/DHT_lcd1602.py (98%) rename DHT_read.py => raspydht/DHT_read.py (99%) rename LCD1602.py => raspydht/LCD1602.py (100%) rename __init__.py => raspydht/__init__.py (100%) rename DHT_plot_rt.py => rtplot/DHT_plot_rt.py (98%) rename DataSet.py => rtplot/DataSet.py (100%) create mode 100644 rtplot/__init__.py diff --git a/DHT_lcd1602.py b/raspydht/DHT_lcd1602.py similarity index 98% rename from DHT_lcd1602.py rename to raspydht/DHT_lcd1602.py index d215fe4..77b0099 100644 --- a/DHT_lcd1602.py +++ b/raspydht/DHT_lcd1602.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -import LCD1602 +from . import LCD1602 import time import datetime as dt import threading diff --git a/DHT_read.py b/raspydht/DHT_read.py similarity index 99% rename from DHT_read.py rename to raspydht/DHT_read.py index 078ad83..5aed3e3 100755 --- a/DHT_read.py +++ b/raspydht/DHT_read.py @@ -5,8 +5,7 @@ import argparse import Adafruit_DHT import paho.mqtt.client as mqtt - -from DHT_lcd1602 import DHTLcd +from .DHT_lcd1602 import DHTLcd # Parse command line parameters. diff --git a/LCD1602.py b/raspydht/LCD1602.py similarity index 100% rename from LCD1602.py rename to raspydht/LCD1602.py diff --git a/__init__.py b/raspydht/__init__.py similarity index 100% rename from __init__.py rename to raspydht/__init__.py diff --git a/DHT_plot_rt.py b/rtplot/DHT_plot_rt.py similarity index 98% rename from DHT_plot_rt.py rename to rtplot/DHT_plot_rt.py index 72fb5be..d7097d9 100755 --- a/DHT_plot_rt.py +++ b/rtplot/DHT_plot_rt.py @@ -9,7 +9,7 @@ import matplotlib.animation as animation import Adafruit_DHT import datetime as dt -from DataSet import DataSet +from .DataSet import DataSet fig = plt.figure() tPlot = fig.add_subplot(2, 1, 1) diff --git a/DataSet.py b/rtplot/DataSet.py similarity index 100% rename from DataSet.py rename to rtplot/DataSet.py diff --git a/rtplot/__init__.py b/rtplot/__init__.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/rtplot/__init__.py @@ -0,0 +1 @@ + diff --git a/setup.py b/setup.py index 6c90d1c..4a794b0 100644 --- a/setup.py +++ b/setup.py @@ -2,11 +2,21 @@ setup( name='RasPyDHT', - version='0.1dev', + version='1.0-b2', + author='William Ledda', + author_email='villy80@hotmail.it', + description='Temperature and humidity monitor with RaspberryPi', + long_description='Monitoring of temperature and humidity with a DHT connected to a RaspberryPi board', + url='https://github.com/williamledda/RasPyDHT', packages=find_packages(), install_requires=[ 'Adafruit-DHT', 'paho-mqtt', 'smbus', ], + classifiers=[ + 'Programming Language :: Python :: 3', + 'Development Status :: 4 - Beta', + 'License :: OSI Approved :: GNU General Public License v2 (GPLv2)', + ], )