Skip to content

Commit

Permalink
fixed MANIFEST.in updated docs
Browse files Browse the repository at this point in the history
  • Loading branch information
trombastic committed Jan 25, 2016
1 parent 2eb17af commit beb5aac
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ include LICENSE
include README.rst
include CHANGELOG.txt
recursive-include pyscada/templates *
recursive-include pyscada/static *
recursive-include pyscada/sql *
recursive-include pyscada/hmi/sql *
recursive-include pyscada/hmi/templates *
recursive-include pyscada/hmi/static *
recursive-include pyscada/modbus/sql *
recursive-include docs *
recursive-exclude * *.pyc
8 changes: 4 additions & 4 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ Debian 8
sudo apt-get update
sudo apt-get upgrade
sudo apt-get install mysql-server python-mysqldb python-pip libhdf5-8 libhdf5-dev python-dev nginx gunicorn
pip install cython
pip install numpy
pip install h5py
pip install git+https://github.com/trombastic/PyScada.git@dev/0.6.x
sudopip install cython
sudopip install numpy
sudo HDF5_DIR=/usr/lib/x86_64-linux-gnu/hdf5/serial/ sudo pip install h5py
sudo pip install git+https://github.com/trombastic/PyScada.git@dev/0.6.x



Expand Down
5 changes: 4 additions & 1 deletion docs/nginx_setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ nginx configuration

sudo wget https://raw.githubusercontent.com/trombastic/PyScada/dev/0.6.x/extras/nginx_sample.conf -O /etc/nginx/sites-available/pyscada.conf
sudo nano /etc/nginx/sites-available/pyscada.conf




after editing, enable the configuration and restart nginx, optionaly remove the default configuration

::

sudo ln -s /etc/nginx/sites-available/pyscada.conf /etc/nginx/sites-enabled/
sudo rm /etc/nginx/sites-enabled/default


Expand Down
2 changes: 1 addition & 1 deletion pyscada/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#__import__('pkg_resources').declare_namespace('pyscada')

__version__ = '0.6.17b34'
__version__ = '0.6.17b35'
__author__ = 'Martin Schröder'

default_app_config = 'pyscada.apps.PyScadaConfig'
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
'django>=1.6,<1.9',
'pymodbus>=1.2',
'numpy>=1.6.0',
'h5py>=2.1.1',
'h5py>=2.2.1',
'psutil>=2.1.1',
'pillow',
'python-daemon'
Expand Down

0 comments on commit beb5aac

Please sign in to comment.