| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
7 files changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,3 +13,4 @@ dist/ | |||
| 13 | 13 | MANIFEST | |
| 14 | 14 | .vagrant/ | |
| 15 | 15 | dj_local_conf.json | |
| 16 | + build/ | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,6 +5,7 @@ env: | |||
| 5 | 5 | python: | |
| 6 | 6 | - "3.4" | |
| 7 | 7 | - "3.5" | |
| 8 | + - "3.6" | ||
| 8 | 9 | services: mysql | |
| 9 | 10 | before_install: | |
| 10 | 11 | - sudo apt-get -qq update | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,23 +5,23 @@ all: | |||
| 5 | 5 | @echo 'make wheel Creates Wheel distribution ' | |
| 6 | 6 | @echo 'make pypi Package and upload to PyPI ' | |
| 7 | 7 | @echo 'make pypitest Package and upload to PyPI test server' | |
| 8 | - @echo 'make purge Remove all build related directories ' | ||
| 8 | + @echo 'make clean Remove all build related directories ' | ||
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | 11 | sdist: | |
| 12 | - python setup.py sdist >/dev/null 2>&1 | ||
| 12 | + python3 setup.py sdist >/dev/null 2>&1 | ||
| 13 | 13 | ||
| 14 | 14 | wheel: | |
| 15 | - python setup.py bdist_wheel >/dev/null 2>&1 | ||
| 15 | + python3 setup.py bdist_wheel >/dev/null 2>&1 | ||
| 16 | 16 | ||
| 17 | - pypi:purge sdist wheel | ||
| 17 | + pypi:clean sdist wheel | ||
| 18 | 18 | twine upload dist/* | |
| 19 | 19 | ||
| 20 | - pypitest: purge sdist wheel | ||
| 20 | + pypitest: clean sdist wheel | ||
| 21 | 21 | twine upload -r pypitest dist/* | |
| 22 | 22 | ||
| 23 | - purge: | ||
| 24 | - rm -rf dist && rm -rf build && rm -rf datajoint.egg-info | ||
| 23 | + clean: | ||
| 24 | + rm -rf dist && rm -rf build && rm -rf *.egg-info | ||
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | 27 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,9 +14,9 @@ | |||
| 14 | 14 | ||
| 15 | 15 | import logging | |
| 16 | 16 | import os | |
| 17 | + from .version import __version__ | ||
| 17 | 18 | ||
| 18 | 19 | __author__ = "Dimitri Yatsenko, Edgar Y. Walker, and Fabian Sinz at Baylor College of Medicine" | |
| 19 | - __version__ = "0.4.7" | ||
| 20 | 20 | __date__ = "January 24, 2017" | |
| 21 | 21 | __all__ = ['__author__', '__version__', | |
| 22 | 22 | 'config', 'conn', 'kill', 'BaseRelation', | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1 @@ | |||
| 1 | + __version__ = "0.4.9" | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,6 +1,6 @@ | |||
| 1 | 1 | numpy | |
| 2 | 2 | scipy | |
| 3 | - pymysql | ||
| 3 | + pymysql>=0.7.2 | ||
| 4 | 4 | pyparsing | |
| 5 | 5 | networkx | |
| 6 | 6 | matplotlib | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,17 +1,25 @@ | |||
| 1 | 1 | #!/usr/bin/env python | |
| 2 | 2 | from setuptools import setup, find_packages | |
| 3 | 3 | from os import path | |
| 4 | + import sys | ||
| 5 | + | ||
| 6 | + if sys.version_info < (3,4): | ||
| 7 | + sys.exit('DataJoint is only supported on Python 3.4 or higher') | ||
| 4 | 8 | ||
| 5 | 9 | here = path.abspath(path.dirname(__file__)) | |
| 6 | 10 | ||
| 7 | - # with open(path.join(here, 'VERSION')) as version_file: | ||
| 8 | - # version = version_file.read().strip() | ||
| 9 | 11 | long_description = "An object-relational mapping and relational algebra to facilitate data definition and data manipulation in MySQL databases." | |
| 10 | 12 | ||
| 13 | + # read in version number | ||
| 14 | + with open(path.join(here, 'datajoint', 'version.py')) as f: | ||
| 15 | + exec(f.read()) | ||
| 16 | + | ||
| 17 | + with open(path.join(here, 'requirements.txt')) as f: | ||
| 18 | + requirements = f.read().split() | ||
| 11 | 19 | ||
| 12 | 20 | setup( | |
| 13 | 21 | name='datajoint', | |
| 14 | - version='0.1.0.dev5', | ||
| 22 | + version=__version__, | ||
| 15 | 23 | description="An ORM with closed relational algebra", | |
| 16 | 24 | long_description=long_description, | |
| 17 | 25 | author='Dimitri Yatsenko', | |
@@ -20,12 +28,10 @@ | |||
| 20 | 28 | url='https://github.com/datajoint/datajoint-python', | |
| 21 | 29 | keywords='database organization', | |
| 22 | 30 | packages=find_packages(exclude=['contrib', 'docs', 'tests*']), | |
| 23 | - install_requires=['numpy', 'pyparsing', 'networkx', 'matplotlib', 'pymysql>=0.7.2'], | ||
| 31 | + install_requires=requirements, | ||
| 24 | 32 | classifiers=[ | |
| 25 | 33 | 'Development Status :: 4 - Beta', | |
| 26 | 34 | 'Intended Audience :: Science/Research', | |
| 27 | 35 | 'Programming Language :: Python :: 3 :: Only', | |
| 28 | - 'License :: OSI Approved :: LGPL License', | ||
| 29 | - 'Topic :: Database :: Front-Ends', | ||
| 30 | 36 | ], | |
| 31 | 37 | ) | |
| Back | FazBrowse Home | New Git URL |
0 commit comments