Skip to content

Commit

Permalink
Merge branch 'master' into resolve-DOIs-securely
Browse files Browse the repository at this point in the history
  • Loading branch information
standage authored Feb 13, 2019
2 parents 05fd61a + 7f49568 commit ccbe7a8
Show file tree
Hide file tree
Showing 16 changed files with 113,279 additions and 24 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,4 @@ pylint_report.txt
pep8_report.txt
pep257_report.txt
.cache/
khmer/_oxli/*.cpp
.eggs
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
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 Expand Up @@ -135,7 +134,7 @@ clean: FORCE
rm -f $(EXTENSION_MODULE)
rm -f khmer/*.pyc scripts/*.pyc tests/*.pyc oxli/*.pyc \
sandbox/*.pyc khmer/__pycache__/* sandbox/__pycache__/* \
khmer/_oxli/*.cpp khmer/_oxli/*.so
khmer/_oxli/*.so
./setup.py clean --all || true
rm -f coverage-debug
rm -Rf .coverage coverage-gcovr.xml coverage.xml
Expand Down
3 changes: 1 addition & 2 deletions ci_scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ fi

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

pushd .
cd
mkdir -p download
cd download
wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh \
wget https://repo.continuum.io/miniconda/Miniconda3-4.5.11-MacOSX-x86_64.sh \
-O miniconda.sh
chmod +x miniconda.sh && ./miniconda.sh -b
cd ..
Expand Down
1 change: 0 additions & 1 deletion doc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
sphinxcontrib-autoprogram>=0.1.4
setuptools>=3.4.1
guzzle_sphinx_theme==0.7.11
Cython==0.25.2
Loading

0 comments on commit ccbe7a8

Please sign in to comment.