Skip to content

Commit

Permalink
Troubleshoot OS X Cython/Homebrew issues
Browse files Browse the repository at this point in the history
  • Loading branch information
standage committed Jan 3, 2019
1 parent e94c0d9 commit 38fc897
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 7 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -100,7 +100,6 @@ after_success:
- make format
- make diff_pylint_report
- make cppcheck
- make pydocstyle
# only upload one coverage report to codecov as it merges all reports
# from all builds into one.
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip install codecov; fi
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Expand Up @@ -45,8 +45,7 @@ PYSOURCES=$(filter-out khmer/_version.py, \
$(wildcard khmer/*.py scripts/*.py oxli/*.py) )
SOURCES=$(PYSOURCES) $(CPPSOURCES) $(CYSOURCES) setup.py

DEVPKGS=pep8==1.6.2 diff_cover autopep8 pylint coverage gcovr pytest \
'pytest-runner>=2.0,<3dev' pydocstyle pyenchant
DEVPKGS=pep8==1.6.2 diff_cover autopep8 pylint coverage gcovr pytest pydocstyle

GCOVRURL=git+https://github.com/nschum/gcovr.git@never-executed-branches

Expand Down
1 change: 0 additions & 1 deletion ci_scripts/install.sh
Expand Up @@ -7,7 +7,6 @@ fi

brew update;
brew install astyle;
brew install enchant;
brew install cppcheck;

pushd .
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Expand Up @@ -278,9 +278,8 @@ def build_dir():
"packages": ['khmer', 'khmer.tests', 'oxli', 'khmer._oxli'],
"package_data": {'khmer/_oxli': ['*.pxd']},
"package_dir": {'khmer.tests': 'tests'},
"install_requires": ['screed >= 1.0', 'bz2file', 'Cython>=0.25.2'],
"setup_requires": ["pytest-runner>=2.0,<3dev", "setuptools>=18.0",
"Cython>=0.25.2"],
"install_requires": ['screed>=1.0', 'bz2file'],
"setup_requires": ['setuptools>=18.0'],
"extras_require": {':python_version=="2.6"': ['argparse>=1.2.1'],
'docs': ['sphinx', 'sphinxcontrib-autoprogram'],
'tests': ['pytest>=2.9'],
Expand Down

0 comments on commit 38fc897

Please sign in to comment.