nas/synology-api-python
1
0
Fork 0
mirror of https://github.com/ProtoThis/python-synology.git synced 2025-08-11 23:56:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Forced modified file

Browse Source 
Merge branch 'master' of https://github.com/StaticCube/python-synology

Conflicts:
	setup.py
This commit is contained in:
Ferry van Zeelst
2016-10-27 18:05:32 +00:00
parent 9fdd55382b 2c0f31e189
commit 7ebcd5108a
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
setup.py
View File

@ -12,12 +12,20 @@ from setuptools import setup
setup( setup(
name = 'python-synology', name = 'python-synology',
packages = ['SynologyDSM'], # this must be the same as the name above packages = ['SynologyDSM'], # this must be the same as the name above
<<<<<<< HEAD
version = '0.1.0', version = '0.1.0',
=======
version = '0.0.3',
>>>>>>> 2c0f31e189c5b27090666ab2d904d2d14d7dd75b
description = 'Python API for communication with Synology DSM', description = 'Python API for communication with Synology DSM',
author = 'FG van Zeelst (StaticCube)', author = 'FG van Zeelst (StaticCube)',
author_email = 'GitHub@StaticCube.com', author_email = 'GitHub@StaticCube.com',
url = 'https://github.com/StaticCube/python-synology/', url = 'https://github.com/StaticCube/python-synology/',
<<<<<<< HEAD
download_url = 'https://github.com/StaticCube/python-synology/tarball/0.1.0', download_url = 'https://github.com/StaticCube/python-synology/tarball/0.1.0',
=======
download_url = 'https://github.com/StaticCube/python-synology/tarball/0.0.3',
>>>>>>> 2c0f31e189c5b27090666ab2d904d2d14d7dd75b
keywords = ['synology-dsm', 'synology'], keywords = ['synology-dsm', 'synology'],
classifiers = [], classifiers = [],
install_requires=['requests>=1.0.0'] install_requires=['requests>=1.0.0']