Skip to content

Commit

Permalink
Merge pull request #25 from vidartf/lab3
Browse files Browse the repository at this point in the history
Updates for lab 3 + health
  • Loading branch information
vidartf committed Jan 5, 2021
2 parents c8358d4 + dfcd833 commit fa97531
Show file tree
Hide file tree
Showing 20 changed files with 216 additions and 200 deletions.
51 changes: 51 additions & 0 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: JS Tests

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
run:
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]

defaults:
run:
shell: bash -l {0}

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 50

- name: Setup mamba
uses: conda-incubator/setup-miniconda@v2
with:
mamba-version: "*"
channels: conda-forge

- name: Create the conda environment
run: mamba install -q python=3.9 pip>17

- name: Install dependencies
run: |
python --version
node --version
python -m pip install --upgrade -e ".[test]"
- name: Run tests
run: |
cd js
npm run test:ci
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
63 changes: 63 additions & 0 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Python Tests

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
run:
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python_version: [3.7, 3.8, 3.9]

defaults:
run:
shell: pwsh

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 50

- name: Setup mamba
uses: conda-incubator/setup-miniconda@v2
with:
mamba-version: "*"
channels: conda-forge

- name: Create the conda environment
run: mamba install -q python=${{ matrix.python_version }} pip>17 pytest-cov numpy

- name: Windows binary dep upgrade
if: matrix.os == 'windows-latest'
run: mamba install -q pywin32

- name: Install dependencies
run: |
python --version
node --version
python -m pip --version
python -m pip install codecov
python -m pip install --upgrade ".[test]"
- name: Run tests
run: |
cd ${{ runner.temp }}
py.test -l --cov-report xml:coverage.xml --cov=ipyscales --pyargs ipyscales
py.test -l --cov-report xml:coverage-nbval.xml --cov=ipyscales ${{ github.workspace }}/examples
cd ${{ github.workspace }}
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
files: ${{ runner.temp }}/coverage.xml,${{ runner.temp }}/coverage-nbval.xml
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ var/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
Expand Down Expand Up @@ -62,6 +63,7 @@ instance/
# Sphinx documentation
docs/_build/
docs/source/_static/embed-bundle.js
docs/source/_static/embed-bundle.js.LICENSE.txt
docs/source/_static/embed-bundle.js.map

# PyBuilder
Expand Down Expand Up @@ -146,7 +148,7 @@ $RECYCLE.BIN/

**/node_modules/
ipyscales/nbextension/static/index.*
js/lab-dist/*.tgz
js/lab-dist/**/*
js/package-lock.json
js/yarn.lock

Expand Down
75 changes: 0 additions & 75 deletions .travis.yml

This file was deleted.

3 changes: 2 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
include LICENSE.txt
include README.md
include pyproject.toml
include MANIFEST.in

include setupbase.py
include pytest.ini
include .coveragerc

Expand All @@ -29,3 +29,4 @@ global-exclude *.pyc
global-exclude *.pyo
global-exclude .git
global-exclude .ipynb_checkpoints
global-exclude *.tsbuildinfo
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

# ipyscales

[![Build Status](https://travis-ci.org/vidartf/ipyscales.svg?branch=master)](https://travis-ci.org/vidartf/ipyscales)
[![codecov](https://codecov.io/gh/vidartf/ipyscales/branch/master/graph/badge.svg)](https://codecov.io/gh/vidartf/ipyscales)
[![Documentation Status](https://readthedocs.org/projects/ipyscales/badge/?version=latest)](http://ipyscales.readthedocs.io/en/latest/?badge=latest)

Expand Down
62 changes: 0 additions & 62 deletions appveyor.yml

This file was deleted.

4 changes: 4 additions & 0 deletions js/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ tests/
# Ignore any build output from python:
dist/*.tar.gz
dist/*.wheel

# Ignore dev noise
coverage/
lab-dist/

0 comments on commit fa97531

Please sign in to comment.