Skip to content

Commit

Permalink
Merge pull request #15 from AMYPAD/devel
Browse files Browse the repository at this point in the history
  • Loading branch information
casperdcl authored Jan 12, 2021
2 parents f819d19 + 2040980 commit 2980ffb
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Test
on: [push, pull_request]
jobs:
check:
if: github.event_name != 'push' || github.ref != 'refs/heads/devel'
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down Expand Up @@ -37,6 +38,7 @@ jobs:
- if: startsWith(matrix.python, '3')
run: pre-commit run -a --show-diff-on-failure
test:
if: github.event_name != 'pull_request' || github.head_ref != 'devel'
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -58,6 +60,7 @@ jobs:
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
matlab:
if: github.event_name != 'pull_request' || github.head_ref != 'devel'
runs-on: [self-hosted, python, cuda, matlab]
name: Test matlab & cuda
steps:
Expand Down
6 changes: 5 additions & 1 deletion miutil/mlab/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@
import re
import sys
from ast import literal_eval
from functools import lru_cache
from os import getenv, path
from subprocess import STDOUT, CalledProcessError, check_output
from textwrap import dedent

try:
from functools import lru_cache
except ImportError:
from backports.functools_lru_cache import lru_cache

from ..fdio import tmpdir

__all__ = ["get_engine"]
Expand Down
4 changes: 2 additions & 2 deletions miutil/mlab/beautify.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<mfile> : Path to `*.m` file
"""
import logging
from functools import lru_cache, wraps
from functools import wraps
from os import path
from zipfile import ZipFile

from argopt import argopt
from tqdm.contrib import tmap

from ..web import get_file
from . import get_engine
from . import get_engine, lru_cache

log = logging.getLogger(__name__)
MBEAUTIFIER_REV = "9c3c82387ec3c0fb29e707ebd060e8e2ca9ea6f2"
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,5 @@ profile=black
known_first_party=miutil,tests

[tool:pytest]
timeout=10
timeout=15
addopts=-v --tb=short -rxs -W=error --log-level=debug -n=auto --durations=0 --cov=miutil --cov-report=term-missing --cov-report=xml

0 comments on commit 2980ffb

Please sign in to comment.