Skip to content

Commit

Permalink
Merge pull request #117 from untzag/single_source
Browse files Browse the repository at this point in the history
[MRG] single source
  • Loading branch information
betatim committed Oct 11, 2017
2 parents a6870af + c0c03df commit cf525b4
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 5 deletions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
include LICENSE
include VERSION
1 change: 1 addition & 0 deletions VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.0.3
7 changes: 4 additions & 3 deletions osfclient/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
"""Client library for the Open Science Framework"""


from .api import OSF
from .__version__ import *

__all__ = ['OSF']

# update `setup.py` as well
__version__ = '0.0.3'
__all__ = ['OSF']
12 changes: 12 additions & 0 deletions osfclient/__version__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"""Read version from file."""


import os


here = os.path.abspath(os.path.dirname(__file__))
__all__ = ['__version__']


with open(os.path.join(os.path.dirname(here), 'VERSION')) as version_file:
__version__ = version_file.read().strip()
26 changes: 24 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,31 @@
# Always prefer setuptools over distutils


import os
from setuptools import setup, find_packages


here = os.path.abspath(os.path.dirname(__file__))


with open(os.path.join(here, 'VERSION')) as f:
__version__ = f.read().strip()


with open(os.path.join(here, 'requirements.txt')) as f:
required = f.read().splitlines()


extra_files = []
extra_files.append(os.path.join(here, 'LICENSE'))
extra_files.append(os.path.join(here, 'requirements.txt'))
extra_files.append(os.path.join(here, 'VERSION'))


setup(
name='osfclient',
# update `osfclient/__init__.py` as well
version='0.0.3',
version=__version__,

description='An OSF command-line library',
long_description='An OSF command-line client and library.',
Expand Down Expand Up @@ -39,12 +59,14 @@
# You can just specify the packages manually here if your project is
# simple. Or you can use find_packages().
packages=find_packages(),
incude_package_data=True,
package_data={'': extra_files},

# List run-time dependencies here. These will be installed by pip when
# your project is installed. For an analysis of "install_requires" vs pip's
# requirements files see:
# https://packaging.python.org/en/latest/requirements.html
install_requires=['requests', 'tqdm', 'six'],
install_requires=required,

# To provide executable scripts, use entry points in preference to the
# "scripts" keyword. Entry points provide cross-platform support and allow
Expand Down

0 comments on commit cf525b4

Please sign in to comment.