FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge branch 'master' of https://github.com/datajoint/datajoint-python · mspacek/datajoint-python@0132f94 · GitHub

Repository navigation

Commit 0132f94

Browse files
2 parents f6c581b + 471bb93 commit 0132f94

7 files changed

Lines changed: 24 additions & 15 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ dist/
1313
MANIFEST
1414
.vagrant/
1515
dj_local_conf.json
16+
build/

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ env:
55
python:
66
- "3.4"
77
- "3.5"
8+
- "3.6"
89
services: mysql
910
before_install:
1011
- sudo apt-get -qq update

‎Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ all:
55
@echo 'make wheel Creates Wheel distribution '
66
@echo 'make pypi Package and upload to PyPI '
77
@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 '
99

1010

1111
sdist:
12-
python setup.py sdist >/dev/null 2>&1
12+
python3 setup.py sdist >/dev/null 2>&1
1313

1414
wheel:
15-
python setup.py bdist_wheel >/dev/null 2>&1
15+
python3 setup.py bdist_wheel >/dev/null 2>&1
1616

17-
pypi:purge sdist wheel
17+
pypi:clean sdist wheel
1818
twine upload dist/*
1919

20-
pypitest: purge sdist wheel
20+
pypitest: clean sdist wheel
2121
twine upload -r pypitest dist/*
2222

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
2525

2626

2727

‎datajoint/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
import logging
1616
import os
17+
from .version import __version__
1718

1819
__author__ = "Dimitri Yatsenko, Edgar Y. Walker, and Fabian Sinz at Baylor College of Medicine"
19-
__version__ = "0.4.7"
2020
__date__ = "January 24, 2017"
2121
__all__ = ['__author__', '__version__',
2222
'config', 'conn', 'kill', 'BaseRelation',

‎datajoint/version.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__version__ = "0.4.9"

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
numpy
22
scipy
3-
pymysql
3+
pymysql>=0.7.2
44
pyparsing
55
networkx
66
matplotlib

‎setup.py‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11
#!/usr/bin/env python
22
from setuptools import setup, find_packages
33
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')
48

59
here = path.abspath(path.dirname(__file__))
610

7-
# with open(path.join(here, 'VERSION')) as version_file:
8-
# version = version_file.read().strip()
911
long_description = "An object-relational mapping and relational algebra to facilitate data definition and data manipulation in MySQL databases."
1012

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()
1119

1220
setup(
1321
name='datajoint',
14-
version='0.1.0.dev5',
22+
version=__version__,
1523
description="An ORM with closed relational algebra",
1624
long_description=long_description,
1725
author='Dimitri Yatsenko',
@@ -20,12 +28,10 @@
2028
url='https://github.com/datajoint/datajoint-python',
2129
keywords='database organization',
2230
packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
23-
install_requires=['numpy', 'pyparsing', 'networkx', 'matplotlib', 'pymysql>=0.7.2'],
31+
install_requires=requirements,
2432
classifiers=[
2533
'Development Status :: 4 - Beta',
2634
'Intended Audience :: Science/Research',
2735
'Programming Language :: Python :: 3 :: Only',
28-
'License :: OSI Approved :: LGPL License',
29-
'Topic :: Database :: Front-Ends',
3036
],
3137
)

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL