Skip to content

Commit

Permalink
Merge e104fae into 86426b4
Browse files Browse the repository at this point in the history
  • Loading branch information
jingpengw committed Jul 15, 2019
2 parents 86426b4 + e104fae commit a928298
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 10 deletions.
8 changes: 1 addition & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,8 @@ python:
- '3.7-dev'

install:
- pip install --upgrade pip
# fix fpzip problem
# - pip install numpy==1.16
# fix neuroglancer problem
- pip install tornado==5.0
- pip install fpzip
- pip install -r requirements.txt
- pip install -e .
- python setup.py install

before_script:
- pip install coveralls
Expand Down
2 changes: 1 addition & 1 deletion chunkflow/flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def generate_task_cmd(offset, shape):
@click.option('--visibility-timeout', type=int, default=None,
help='visibility timeout of sqs queue; default is using the timeout of the queue.')
@generator
def fetch_task_cmd(queue_name, offset, shape, visibility_timeout):
def fetch_task_cmd(queue_name, visibility_timeout):
"""[generator] Fetch task from queue."""
task = initialize_task()
queue = SQSQueue(queue_name, visibility_timeout=visibility_timeout)
Expand Down
Empty file.
11 changes: 11 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
numpy>=1.16
cloud-volume>=0.47.0
click
scikit-image>=0.14.2
six>=1.12.0
boto3
h5py
tifffile
neuroglancer
tinybrain
zmesh
15 changes: 13 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
from setuptools import setup, find_packages

version = '0.3.0'
version = '0.3.1'

with open("README.md", "r") as fh:
long_description = fh.read()

# This is a fix for numpy to work with setuptools
# https://github.com/numpy/numpy/blob/master/setup.py
# This is a bit hackish: we are setting a global variable so that the main
# numpy __init__ can detect if it is being loaded by the setup routine, to
# avoid attempting to load components that aren't built yet. While ugly, it's
# a lot more robust than what was previously being used.
import builtins
builtins.__NUMPY_SETUP__ = True


setup(
name='chunkflow',
description='Large Scale 3d Convolution Net Inference',
Expand All @@ -18,12 +28,13 @@
url='https://github.com/seung-lab/chunkflow',
install_requires=[
'click',
'numpy',
'numpy>=1.16',
'cloud-volume',
'scikit-image',
'boto3',
'h5py',
'tifffile',
'tornado==5.0',
'neuroglancer',
'tinybrain',
'zmesh'
Expand Down

0 comments on commit a928298

Please sign in to comment.