Skip to content

Commit

Permalink
Merge branch '1.0.x' into 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
remram44 committed Apr 20, 2020
2 parents 44ef769 + 1f02705 commit 0e390ad
Show file tree
Hide file tree
Showing 7 changed files with 115 additions and 120 deletions.
110 changes: 110 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
name: Test

on:
- push
- pull_request

jobs:
test:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
mode: [tests]
python:
- "2.7"
- "3.5"
include:
- os: ubuntu-latest
mode: coverage
python: "3.8"
- os: ubuntu-latest
mode: checks
python: "3.8"
runs-on: ${{ matrix.os }}
env:
TEST_MODE: ${{ matrix.mode }}
REPROZIP_USAGE_STATS: "off"
REPROZIP_PARAMETERS: https://stats.reprozip.org/parameters/travis/
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python }}
- name: Install dependencies
run: |
if [ -z "${XDG_CACHE_HOME-}" ]; then
mkdir -p ~/.cache/reprozip
else
mkdir -p "$XDG_CACHE_HOME/reprozip"
fi
case "$TEST_MODE"
in
tests|coverage)
if [ "$TEST_MODE" = "coverage" ]; then
export CFLAGS="-fprofile-arcs -ftest-coverage"
fi
sudo apt-get update -qq
sudo apt-get install -qq libc6-dev-i386 gcc-multilib libsqlite3-dev
if [ $TEST_MODE = "coverage" ]; then
pip install 'coverage<5' codecov
pip install -e ./reprozip -e ./reprounzip -e ./reprounzip-docker -e ./reprounzip-vagrant -e ./reprounzip-vistrails -e ./reprounzip-qt -e ./reprozip-jupyter
else
pip install ./reprozip ./reprounzip ./reprounzip-docker ./reprounzip-vagrant ./reprounzip-vistrails ./reprounzip-qt -e ./reprozip-jupyter
fi
;;
checks)
pip install flake8 readme_renderer
;;
*)
exit 1
;;
esac
- name: Test
run: |
export LANG=C
export LC_ALL=C
case "$TEST_MODE"
in
tests|coverage)
export PYTHONUNBUFFERED=1
if [ "$TEST_MODE" = "coverage" ]; then
export COVER="coverage run --append --source=$PWD/reprozip/reprozip,$PWD/reprounzip/reprounzip,$PWD/reprounzip-docker/reprounzip,$PWD/reprounzip-vagrant/reprounzip,$PWD/reprounzip-vistrails/reprounzip --branch"
fi
python tests --run-docker
;;
checks)
flake8 --ignore=E731,W504
find scripts -name '*.py' -exec flake8 {} +
diff -q reprozip/reprozip/common.py reprounzip/reprounzip/common.py
diff -q reprozip/reprozip/utils.py reprounzip/reprounzip/utils.py
find reprozip reprounzip reprozip-* reprounzip-* .travis -name '*.py' -or -name '*.sh' -or -name '*.h' -or -name '*.c' | (set +x; while read i; do
T=$(file -b --mime "$i")
if ! ( echo "$T" | grep -q ascii || echo "$T" | grep -q empty ) ; then
echo "$i is not ASCII"
exit 1
fi
done)
find reprozip reprounzip reprozip-* reprounzip-* -name '*.py' -exec sh -c "grep 'logging\\.\\(debug\\|warning\\|critical\\|error\\|info\\)' \"\$@\" && exit 1; exit 0" {} +
for pkg in reprozip reprounzip reprozip-* reprounzip-*; do
(cd $pkg && python setup.py check -r -s)
done
;;
*)
exit 1
;;
esac
- name: Upload coverage
if: matrix.mode == 'coverage'
run: |
# Python
if [ -f .coverage ]; then mv .coverage .coverage.orig; fi # FIXME: useless?
coverage combine
codecov
# C
# Find the coverage file (in distutils's build directory)
OBJDIR=$(dirname "$(find . -name pytracer.gcno | head -n 1)")
(cd reprozip/native && gcov -o ../../$OBJDIR *.c)
curl -s -o - https://codecov.io/bash | bash -
26 changes: 0 additions & 26 deletions .travis.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .travis/finish.sh

This file was deleted.

36 changes: 0 additions & 36 deletions .travis/install.sh

This file was deleted.

34 changes: 0 additions & 34 deletions .travis/test.sh

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Build Status](https://travis-ci.org/VIDA-NYU/reprozip.svg?branch=master)](https://travis-ci.org/VIDA-NYU/reprozip)
[![Coverage Status](https://codecov.io/github/VIDA-NYU/reprozip/coverage.svg?branch=master)](https://codecov.io/github/VIDA-NYU/reprozip?branch=master)
[![Documentation Status](https://readthedocs.org/projects/reprozip/badge/?version=latest)](https://docs.reprozip.org/en/latest/)
[![Build Status](https://github.com/VIDA-NYU/reprozip/workflows/Test/badge.svg)](https://github.com/VIDA-NYU/reprozip/actions)
[![Coverage Status](https://codecov.io/github/VIDA-NYU/reprozip/coverage.svg?branch=1.0.x)](https://codecov.io/github/VIDA-NYU/reprozip?branch=1.0.x)
[![Documentation Status](https://readthedocs.org/projects/reprozip/badge/?version=1.0.x)](https://docs.reprozip.org/en/1.0.x/)
[![Matrix](https://img.shields.io/badge/chat-matrix.org-blue.svg)](https://riot.im/app/#/room/#reprozip:matrix.org)
[![Say Thanks!](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/remram44)
[![status](https://img.shields.io/badge/JOSS-10.21105%2Fjoss.00107-green.svg)](http://joss.theoj.org/papers/b578b171263c73f64dfb9d040ca80fe0)
Expand Down
4 changes: 2 additions & 2 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Besides Python and pip, each component or plugin to be used may have additional
| *reprounzip-vistrails* | None [#vis2]_ |
+------------------------+-------------------------------------------------+

You will need Xcode installed, which you can get from the Mac App Store, and the Command Line Developer Tools; instrucions on installing the latter may depend on your Mac OS X version (some information on StackOverflow `here <https://stackoverflow.com/questions/9329243/xcode-install-command-line-tools?answertab=active#tab-top>`__).
You will need Xcode installed, which you can get from the Mac App Store, and the Command Line Developer Tools; instrucions on installing the latter may depend on your Mac OS X version (some information on StackOverflow `here <https://stackoverflow.com/questions/9329243/how-to-install-xcode-command-line-tools/9329325#9329325>`__).

.. seealso:: :ref:`Why does reprounzip-vagrant installation fail with error "unknown argument: -mno-fused-madd" on Mac OS X? <compiler_mac>`

Expand Down Expand Up @@ -175,7 +175,7 @@ Besides Python and pip, each component or plugin to be used may have additional
.. [#bug3] ``reprozip`` and ``reprounzip graph`` will not work before 2.7.3 due to `Python bug 13676 <https://bugs.python.org/issue13676>`__ related to sqlite3. Python 2.6 is ancient and unsupported.
.. [#pycrypto3] A working C compiler is required to build PyCrypto. For installation without building from source, please see `this page <https://stackoverflow.com/questions/11405549/how-do-i-install-pycrypto-on-windows>`__.
.. [#vis3] `VisTrails v2.2.3+ <https://www.vistrails.org/>`__ is required to run the workflow generated by the plugin.
.. [#windowshome] Windows Professional Edition is required for Docker, it will not work on Windows Home Edition; `see FAQ <https://docs.docker.com/docker-for-windows/faqs/#why-is-windows-10-home-not-supported>`__.
.. [#windowshome] Windows Professional Edition is required for Docker, it will not work on Windows Home Edition; `see FAQ <https://docs.docker.com/docker-for-windows/faqs/#why-is-windows-10-home-not-supported#can-i-install-docker-desktop-on-windows-10-home>`__.
Installing *reprounzip*
-----------------------
Expand Down

0 comments on commit 0e390ad

Please sign in to comment.