Skip to content

Commit 6cf1580

Browse files
authored
Merge pull request #68 from CellProfiler/release/1.0.9
1.0.9 release
2 parents b8bea8f + 2cf8788 commit 6cf1580

File tree

2 files changed

+45
-119
lines changed

2 files changed

+45
-119
lines changed

.travis.yml

Lines changed: 13 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,15 @@
1-
language: java
2-
env:
3-
- PYTHON_VERSION="2.7"
4-
- PYTHON_VERSION="3.5"
5-
before_install:
6-
# Get the tag if it wasn't provided. Travis doesn't provide this if it isn't a tagged build.
7-
- if [ -z $TRAVIS_TAG ]; then TRAVIS_TAG=`git tag --contains` ; fi
8-
- echo $TRAVIS_TAG
9-
# Move out of git directory to build root.
10-
- cd ../..
11-
- pwd
1+
language: python
2+
python:
3+
- "2.7"
4+
- "3.5"
5+
sudo: false
6+
notifications:
7+
email: false
128
install:
13-
# Download and configure conda.
14-
- wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
15-
- bash miniconda.sh -b -p $HOME/miniconda
16-
- export PATH="$HOME/miniconda/bin:$PATH"
17-
- conda config --set always_yes yes
18-
- conda config --set show_channel_urls True
19-
- source activate root
20-
# Install basic conda dependencies.
21-
- touch $HOME/miniconda/conda-meta/pinned
22-
- echo "conda-build ==1.16.0" >> $HOME/miniconda/conda-meta/pinned
23-
- conda update --all
24-
- conda install conda-build
25-
# Setup environment for testing and install all dependencies and our package.
26-
- cd $TRAVIS_REPO_SLUG
27-
- conda create --use-local -n testenv python=$PYTHON_VERSION
28-
- source activate testenv
29-
- conda install numpy
30-
- python setup.py install
31-
# Install sphinx to build documentation.
32-
- conda install sphinx
33-
# Install coverage and coveralls to generate and submit test coverage results for coveralls.io.
34-
- echo "coverage 3.*" >> $HOME/miniconda/envs/testenv/conda-meta/pinned
35-
- conda install nose
36-
- conda install coverage
37-
- pip install coveralls
38-
# Clean up downloads as there are quite a few and they waste space/memory.
39-
- conda clean -tipsy
40-
- rm -rfv $HOME/.cache/pip
9+
- pip install --upgrade pip wheel
10+
- pip install --upgrade numpy
11+
- pip install sphinx
12+
- pip install .
4113
script:
42-
# Run tests.
43-
- python nosetests.py
44-
# Build docs.
45-
- cd docs
46-
- make html
47-
- cd ..
48-
#after_success:
49-
# Submit results to coveralls.io.
50-
#- coveralls
51-
# Use container format for TravisCI for quicker startup and builds.
52-
sudo: false
14+
- nosetests
15+
- cd docs && make html

setup.py

Lines changed: 32 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,34 @@
1-
from __future__ import absolute_import, print_function
2-
3-
import os.path
4-
import re
5-
import subprocess
6-
from setuptools import setup, find_packages
7-
8-
def get_version():
9-
"""Get version from git or file system.
10-
11-
If this is a git repository, try to get the version number by
12-
running ``git describe``, then store it in
13-
bioformats/_version.py. Otherwise, try to load the version number
14-
from that file. If both methods fail, quietly return None.
15-
16-
"""
17-
git_version = None
18-
if os.path.exists(os.path.join(os.path.dirname(__file__), '.git')):
19-
import subprocess
20-
try:
21-
git_version = subprocess.check_output(['git', 'describe']).strip()
22-
except:
23-
pass
24-
25-
version_file = os.path.join(os.path.dirname(__file__), 'bioformats',
26-
'_version.py')
27-
if os.path.exists(version_file):
28-
with open(version_file) as f:
29-
cached_version_line = f.read().strip()
30-
try:
31-
# From http://stackoverflow.com/a/3619714/17498
32-
cached_version = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]",
33-
cached_version_line, re.M).group(1)
34-
except:
35-
raise RuntimeError("Unable to find version in %s" % version_file)
36-
else:
37-
cached_version = None
38-
39-
if git_version and git_version != cached_version:
40-
with open(version_file, 'w') as f:
41-
print('__version__ = "%s"' % git_version, file=f)
42-
43-
return git_version or cached_version
44-
45-
setup(
46-
name="python-bioformats",
47-
version=get_version().decode("utf-8"),
1+
import setuptools
2+
3+
setuptools.setup(
4+
classifiers=[
5+
"Development Status :: 5 - Production/Stable",
6+
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
7+
"Programming Language :: Python :: 2",
8+
"Programming Language :: Python :: 3",
9+
"Programming Language :: Java",
10+
"Topic :: Scientific/Engineering :: Bio-Informatics",
11+
"Topic :: Multimedia :: Graphics :: Graphics Conversion"
12+
],
4813
description="Read and write life sciences file formats",
49-
long_description='''Python-bioformats is a Python wrapper for Bio-Formats, a standalone
50-
Java library for reading and writing life sciences image file
51-
formats. Bio-Formats is capable of parsing both pixels and
52-
metadata for a large number of formats, as well as writing to
53-
several formats. Python-bioformats uses the python-javabridge to
54-
start a Java virtual machine from Python and interact with
55-
it. Python-bioformats was developed for and is used by the cell
56-
image analysis software CellProfiler (cellprofiler.org).''',
14+
install_requires=[
15+
"javabridge>=1.0"
16+
],
17+
license="GPL License",
18+
long_description="""Python-bioformats is a Python wrapper for Bio-Formats, a standalone Java library for reading
19+
and writing life sciences image file formats. Bio-Formats is capable of parsing both pixels and metadata for a
20+
large number of formats, as well as writing to several formats. Python-bioformats uses the python-javabridge to
21+
start a Java virtual machine from Python and interact with it. Python-bioformats was developed for and is used by
22+
the cell image analysis software CellProfiler (cellprofiler.org).""",
23+
name="python-bioformats",
24+
package_data={
25+
"bioformats": [
26+
"jars/*.jar"
27+
]
28+
},
29+
packages=[
30+
"bioformats"
31+
],
5732
url="http://github.com/CellProfiler/python-bioformats/",
58-
packages=['bioformats'],
59-
classifiers=['Development Status :: 5 - Production/Stable',
60-
'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
61-
'Programming Language :: Python :: 2',
62-
'Programming Language :: Python :: 3',
63-
'Programming Language :: Java',
64-
'Topic :: Scientific/Engineering :: Bio-Informatics',
65-
'Topic :: Multimedia :: Graphics :: Graphics Conversion'
66-
],
67-
license='GPL License',
68-
package_data={'bioformats': ['jars/*.jar']},
69-
install_requires=['javabridge>=1.0']
70-
)
71-
33+
version="1.0.9"
34+
)

0 commit comments

Comments
 (0)