Skip to content

Commit

Permalink
Remove tronweb2 code (#914)
Browse files Browse the repository at this point in the history
This isn't currently being used and is complicating the internal build
process
  • Loading branch information
nemacysts authored Jun 13, 2023
1 parent bbe228e commit 51c350a
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 62 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ tron.iml
docs/images/
*.dot
tronweb/js/cs/*.js
tronweb2/yarn.lock
yarn.lock
tronweb_tests/spec/*.js
tronweb_tests/lib/
Expand Down
5 changes: 0 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ repos:
entry: contrib/mock_patch_checker.py
language: script
files: ^tests/.*\.py$
- id: eslint
name: eslint
entry: ./node_modules/.bin/eslint --format=compact --quiet --fix
language: system
files: ^tronweb2/src/.*\.js$
- repo: http://github.com/psf/black
rev: 19.10b0
hooks:
Expand Down
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ recursive-include tests *.py *.yaml
recursive-include docs *.rst *.yaml *.1 *.8
recursive-include tronweb *
recursive-exclude tronweb *.coffee
recursive-include tronweb2/build *
10 changes: 1 addition & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ docker_%:
[ -d dist ] || mkdir -p dist
cd ./yelp_package/$* && docker build --build-arg PIP_INDEX_URL=${PIP_INDEX_URL} --build-arg NPM_CONFIG_REGISTRY=${NPM_CONFIG_REGISTRY} -t tron-builder-$* .

deb_%: clean docker_% coffee_% react_%
deb_%: clean docker_% coffee_%
@echo "Building deb for $*"
# backup these files so we can temp modify them
cp requirements.txt requirements.txt.old
Expand All @@ -59,14 +59,6 @@ coffee_%: docker_%
chown -R $(UID):$(GID) tronweb/js/cs/ \
'

react_%: docker_%
@echo "Building tronweb2"
$(DOCKER_RUN) tron-builder-$* /bin/bash -c ' \
YARN_REGISTRY=${NPM_CONFIG_REGISTRY} yarn --cwd tronweb2 && \
YARN_REGISTRY=${NPM_CONFIG_REGISTRY} yarn --cwd tronweb2 build && \
chown -R $(UID):$(GID) tronweb2/build/ tronweb2/node_modules \
'

test:
tox -e py36

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"Intended Audience :: System Administrators",
"Development Status :: 4 - Beta",
],
packages=find_packages(exclude=["tests.*", "tests", "example-cluster"],) + ["tronweb", "tronweb2"],
packages=find_packages(exclude=["tests.*", "tests", "example-cluster"],) + ["tronweb"],
scripts=glob.glob("bin/*") + glob.glob("tron/bin/*.py"),
include_package_data=True,
long_description="""
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ commands =
# current setup means that the necessary binaries won't be installed
# automatically, so we manually invoke yarn to install things
yarn install
yarn --cwd tronweb2 install
pre-commit install -f --install-hooks
pre-commit run --all-files
# tron has been around for a while, so we'll need to slowly add types or make an effort
Expand Down
44 changes: 0 additions & 44 deletions tronweb2/README.md

This file was deleted.

0 comments on commit 51c350a

Please sign in to comment.