Skip to content

Commit

Permalink
Merge pull request #184 from timkpaine/tkp/cleanup
Browse files Browse the repository at this point in the history
remove js files for now, remove docker, consolidate bumpversion config, update makefile for javascript
  • Loading branch information
timkpaine committed Jul 4, 2022
2 parents 74106cd + d946e99 commit ae046db
Show file tree
Hide file tree
Showing 22 changed files with 82 additions and 645 deletions.
19 changes: 0 additions & 19 deletions .bumpversion.cfg

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/build.yml
Expand Up @@ -29,14 +29,6 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Install yarn
run: npm install -g yarn

- name: Install system dependencies
run: |
sudo apt-get install libboost-dev
Expand All @@ -52,16 +44,11 @@ jobs:
run: |
python -m pip install -U cpplint numpy pip pyarrow pyEX setuptools tqdm twine wheel
python -m pip install -e .[dev]
cd js; yarn
- name: Lint Python
run: |
make lintpy
- name: Lint JS
run: |
make lintjs
- name: Lint C++
run: |
make lintcpp
Expand Down
21 changes: 4 additions & 17 deletions Makefile
Expand Up @@ -26,9 +26,6 @@ build: buildext ## build the package
debug: ## build debug build of the package
DEBUG=1 $(PYTHON) setup.py build

js: ## build the js assets
cd js; yarn build

install: ## install the package
$(PYTHON) -m pip install .

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

testjs: ## Make js tests
cd js; yarn test

testruns: testrunscsv testrunsiex ## Run a few examples as a live end-to-end test

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

lint: lintpy lintjs lintcpp ## run all linters
lint: lintpy lintcpp ## run all linters

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

lintjs: ## run js linter
cd js; yarn lint

lintcpp: ## run cpp linter
cpplint --linelength=120 --recursive aat/cpp/{src,include}

fix: fixpy fixjs fixcpp ## run all fixers
fix: fixpy fixcpp ## run all fixers

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

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

fixjs: ## run clang-format
cd js; yarn fix

annotate: ## MyPy type annotation check
$(PYTHON) -m mypy aat

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

dist: js ## create dists
dist: ## create dists
rm -rf dist build
python setup.py sdist bdist_wheel
python -m twine check dist/*

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

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

.PHONY: run buildext build js install tests lint fix docs dist clean help fixcpp
.PHONY: run buildext build install tests lint fix docs dist clean help fixcpp

2 changes: 2 additions & 0 deletions aat/__init__.py
Expand Up @@ -14,3 +14,5 @@
)
from .engine import TradingEngine # noqa: F401
from .strategy import * # noqa: F401, F403

__version__ = "0.1.0"
21 changes: 0 additions & 21 deletions aat/_version.py

This file was deleted.

14 changes: 0 additions & 14 deletions docker/manylinux2010/Dockerfile

This file was deleted.

14 changes: 0 additions & 14 deletions docker/manylinux2014/Dockerfile

This file was deleted.

0 comments on commit ae046db

Please sign in to comment.