Skip to content

Commit d9cc7b3

Browse files
authored
Merge pull request #2 from signals-dev/dev
Merge dev to master for prerelease of 0.1.0-dev0
2 parents b9ca27c + e39ad7a commit d9cc7b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+607
-704
lines changed

.editorconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ insert_final_newline = true
1010
charset = utf-8
1111
end_of_line = lf
1212

13+
[*.yml]
14+
indent_size = 2
15+
1316
[*.py]
14-
max_line_length = 79
17+
max_line_length = 99
1518

1619
[*.bat]
1720
indent_style = tab

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
- MTV version:
1+
- Sintel version:
22
- Python version:
3-
- Node version:
43
- Operating System:
54

65
### Description
Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,39 @@ jobs:
1414
runs-on: ${{ matrix.os }}
1515
strategy:
1616
matrix:
17-
os: [ubuntu-latest, macos-latest]
17+
os: [ubuntu-latest, ubuntu-18.04]
1818
python-version: [3.6]
19+
mongodb-version: [3.6]
1920

2021
steps:
2122
- uses: actions/checkout@v2
2223
- name: Set up Python ${{ matrix.python-version }}
2324
uses: actions/setup-python@v1
2425
with:
2526
python-version: ${{ matrix.python-version }}
27+
28+
- name: Start MongoDB
29+
uses: supercharge/[email protected]
30+
with:
31+
mongodb-version: ${{ matrix.mongodb-version }}
2632
- name: Install Package
33+
run: |
34+
python -m pip install --upgrade pip
35+
pip install .
36+
- name: Install test dependencies
37+
run: |
38+
python -m pip install --upgrade pip
39+
pip install .[test]
40+
- name: Test with pytest
41+
run: |
42+
make test
43+
- name: Install development dependencies
2744
run: |
2845
python -m pip install --upgrade pip
2946
pip install .[dev]
3047
- name: Lint with flake8
3148
run: |
3249
make lint
33-
- name: Test with py.test (Flask)
50+
- name: Test with pytest
3451
run: |
35-
make test-server
52+
make test

.gitignore

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22
.DS_Store
33
tempCodeRunnerFile.ts
44
tempCodeRunnerFile.py
5+
6+
# App specific
7+
client/public/data/
8+
db-instance/
9+
mtv/data/raw
10+
mtv/db/data
511
mtv.tar*
612
.vscode/
7-
orion-stock/
8-
stock-data/
913

1014
# Byte-compiled / optimized / DLL files
1115
__pycache__/
@@ -34,25 +38,6 @@ wheels/
3438
.installed.cfg
3539
*.egg
3640

37-
# Client
38-
node_modules/
39-
!/client/public/dist/
40-
/client/public/dist/*
41-
# The following two files are only used in prod mode
42-
!/client/public/dist/*.min.css
43-
!/client/public/dist/*.min.js
44-
/client/public/themes/
45-
npm-debug.log
46-
package-lock.json
47-
coverage/
48-
logs/
49-
50-
# Data
51-
client/public/data/
52-
db-instance/
53-
mtv/data/raw
54-
mtv/db/data
55-
5641
# PyInstaller
5742
# Usually these files are written by a python script from a template
5843
# before PyInstaller builds the exe, so as to inject date/other infos into it.
@@ -90,13 +75,6 @@ instance/
9075
# Scrapy stuff:
9176
.scrapy
9277

93-
# Sphinx documentation
94-
docs/_build/
95-
docs/api/
96-
97-
# Restful API documentation
98-
apidoc/
99-
10078
# PyBuilder
10179
target/
10280

@@ -132,7 +110,8 @@ ENV/
132110

133111
# mypy
134112
.mypy_cache/
135-
mtv-client/coverage
136-
mtv-client/node_modules
137113

138114
.idea/*
115+
116+
# App specific - do not ignore
117+
!apidocs/ui3/static/lib

.prettierrc.js

Lines changed: 0 additions & 15 deletions
This file was deleted.

.travis.yml

Lines changed: 4 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,12 @@
1-
# Config file for automatic testing at travis-ci.org
1+
dist: bionic
22
language: python
33
python:
44
- 3.6
5-
# - 3.5
6-
# - 3.4
7-
8-
env:
9-
matrix:
10-
# - NODE=8.15.0
11-
- NODE=10.15.0
12-
13-
matrix:
14-
fast_finish: true
15-
16-
services:
17-
- mongodb
185

196
# Command to install dependencies
20-
install:
21-
- pip install -U tox-travis
22-
- nvm install ${NODE}
23-
- node --version
24-
- npm install --quiet -g gulp-cli
7+
install: pip install -U tox-travis codecov
258

26-
# Command before to run tests
27-
before_script:
28-
- cd client && npm install
9+
after_success: codecov
2910

3011
# Command to run tests
31-
script:
32-
- cd $TRAVIS_BUILD_DIR
33-
- tox # test back-end
34-
- npm -C client run test:karma # test front-end
35-
36-
after_script:
37-
- npm -C client run test:karma:coverage # test front-end coverage
38-
- npm install -g lcov-result-merger@~1.2.0
39-
- lcov-result-merger 'client/coverage/**/lcov.info' | client/node_modules/coveralls/bin/coveralls.js
40-
# deploy:
41-
# # Automatically build and deploy documentation to GitHub Pages
42-
# - provider: pages
43-
# skip-cleanup: true
44-
# github-token: "$GITHUB_TOKEN"
45-
# keep-history: true
46-
# local-dir: docs/_build/html
47-
# target-branch: gh-pages
48-
# on:
49-
# branch: master
50-
# python: 3.6
51-
# condition: $NODE = 10.15.0
12+
script: tox

AUTHORS.rst

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)