Skip to content

Commit ae046db

Browse files
authored
Merge pull request #184 from timkpaine/tkp/cleanup
remove js files for now, remove docker, consolidate bumpversion config, update makefile for javascript
2 parents 74106cd + d946e99 commit ae046db

File tree

22 files changed

+82
-645
lines changed

22 files changed

+82
-645
lines changed

.bumpversion.cfg

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

.github/workflows/build.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@ jobs:
2929
with:
3030
python-version: ${{ matrix.python-version }}
3131

32-
- name: Use Node.js ${{ matrix.node-version }}
33-
uses: actions/setup-node@v3
34-
with:
35-
node-version: ${{ matrix.node-version }}
36-
37-
- name: Install yarn
38-
run: npm install -g yarn
39-
4032
- name: Install system dependencies
4133
run: |
4234
sudo apt-get install libboost-dev
@@ -52,16 +44,11 @@ jobs:
5244
run: |
5345
python -m pip install -U cpplint numpy pip pyarrow pyEX setuptools tqdm twine wheel
5446
python -m pip install -e .[dev]
55-
cd js; yarn
5647
5748
- name: Lint Python
5849
run: |
5950
make lintpy
6051
61-
- name: Lint JS
62-
run: |
63-
make lintjs
64-
6552
- name: Lint C++
6653
run: |
6754
make lintcpp

Makefile

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ build: buildext ## build the package
2626
debug: ## build debug build of the package
2727
DEBUG=1 $(PYTHON) setup.py build
2828

29-
js: ## build the js assets
30-
cd js; yarn build
31-
3229
install: ## install the package
3330
$(PYTHON) -m pip install .
3431

@@ -41,9 +38,6 @@ testpycpp: ## Make unit tests
4138
# AAT_USE_CPP=1 $(PYTHON) -m pytest -vvv ./aat/tests --cov=aat --junitxml=python_junit.xml --cov-report=xml --cov-branch --capture=no
4239
AAT_USE_CPP=1 $(PYTHON) -m pytest -vs ./aat/tests
4340

44-
testjs: ## Make js tests
45-
cd js; yarn test
46-
4741
testruns: testrunscsv testrunsiex ## Run a few examples as a live end-to-end test
4842

4943
testrunscsv:
@@ -57,28 +51,22 @@ testrunsiex:
5751
TESTING=1 $(PYTHON) -m aat.strategy.sample.iex.momentum
5852
TESTING=1 $(PYTHON) -m aat.strategy.sample.iex.golden_death
5953

60-
lint: lintpy lintjs lintcpp ## run all linters
54+
lint: lintpy lintcpp ## run all linters
6155

6256
lintpy: ## run python linter
6357
$(PYTHON) -m flake8 aat setup.py
6458

65-
lintjs: ## run js linter
66-
cd js; yarn lint
67-
6859
lintcpp: ## run cpp linter
6960
cpplint --linelength=120 --recursive aat/cpp/{src,include}
7061

71-
fix: fixpy fixjs fixcpp ## run all fixers
62+
fix: fixpy fixcpp ## run all fixers
7263

7364
fixpy: ## run autopep8 fix
7465
$(PYTHON) -m black aat/ setup.py
7566

7667
fixcpp: ## run clang-format
7768
clang-format -i -style=file `find ./aat/cpp/{src,include} -name "*.*pp"`
7869

79-
fixjs: ## run clang-format
80-
cd js; yarn fix
81-
8270
annotate: ## MyPy type annotation check
8371
$(PYTHON) -m mypy aat
8472

@@ -92,14 +80,13 @@ docs: ## Build the sphinx docs
9280
make -C docs html
9381
open ./docs/_build/html/index.html
9482

95-
dist: js ## create dists
83+
dist: ## create dists
9684
rm -rf dist build
9785
python setup.py sdist bdist_wheel
9886
python -m twine check dist/*
9987

10088
publish: dist ## dist to pypi and npm
10189
python -m twine upload dist/* --skip-existing
102-
cd js; npm publish || echo "can't publish - might already exist"
10390

10491
clean: ## clean the repository
10592
find . -name "__pycache__" | xargs rm -rf
@@ -117,5 +104,5 @@ help:
117104
print-%:
118105
@echo '$*=$($*)'
119106

120-
.PHONY: run buildext build js install tests lint fix docs dist clean help fixcpp
107+
.PHONY: run buildext build install tests lint fix docs dist clean help fixcpp
121108

aat/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@
1414
)
1515
from .engine import TradingEngine # noqa: F401
1616
from .strategy import * # noqa: F401, F403
17+
18+
__version__ = "0.1.0"

aat/_version.py

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

docker/manylinux2010/Dockerfile

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

docker/manylinux2014/Dockerfile

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

0 commit comments

Comments
 (0)