Skip to content

Commit

Permalink
gui: do not build anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
yagebu committed Mar 24, 2018
1 parent 34257eb commit 22b2a65
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 57 deletions.
23 changes: 0 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ script: "tox -e $TRAVIS_BUILD"
python: 3.6

matrix:
allow_failures:
- env: TRAVIS_BUILD=deploy
fast_finish: true
include:
- env: TRAVIS_BUILD=coverage
Expand All @@ -17,27 +15,6 @@ matrix:
sudo: false
before_install: "nvm use stable"
script: "make && make lint"
- env: TRAVIS_BUILD=deploy
dist: trusty
sudo: required
before_install: |
sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils
. $HOME/.nvm/nvm.sh
nvm install stable
nvm use stable
make
after_success: "gui/bin/fava/cli || true"
- env: TRAVIS_BUILD=deploy
language: node
node_js: node
os: osx
before_install: |
brew update
brew outdated python || brew upgrade python
brew outdated mercurial || brew upgrade mercurial
make
install: "pip3 install tox"
after_success: "gui/bin/fava/cli || true"

cache:
directories:
Expand Down
9 changes: 1 addition & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ fava/static/gen/app.js: fava/static/css/* fava/static/javascript/* fava/static/p
clean: mostlyclean
rm -rf build dist
rm -rf fava/static/gen
make -C gui clean

mostlyclean:
rm -rf .tox
Expand All @@ -20,7 +19,6 @@ mostlyclean:
lint:
tox -e lint
cd fava/static; npm install; npm run lint
make -C gui lint

test:
tox
Expand All @@ -43,13 +41,8 @@ before-release: translations-push translations-fetch
#
# After the release, the version number should be bumped in:
# - fava/__init__.py (with '-dev')
# - gui/package.json
# - gui/src/main.js
#
# Also, fava.pythonanywhere.com should be updated and a draft for the next
# version should be created so that electron-builder will push artifacts (this
# should have the version from gui/package.json prefixed with a 'v' as the
# version)
# Also, fava.pythonanywhere.com should be updated.
release: fava/static/gen/app.js
python setup.py sdist bdist_wheel upload

Expand Down
14 changes: 0 additions & 14 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,10 @@ environment:

install:
- '%PYTHON%\python -m pip install -U setuptools pip wheel tox'
- ps: Install-Product node Current

build_script:
- 'cd %APPVEYOR_BUILD_FOLDER%\fava\static'
- 'npm install'
- 'npm run build'
- 'cd %APPVEYOR_BUILD_FOLDER%'
- '%PYTHON%\scripts\tox -e deploy'
- '%APPVEYOR_BUILD_FOLDER%\gui\bin\fava\cli || true'

test_script:
- '%PYTHON%\scripts\tox -e py36-dev'

cache:
- '%LOCALAPPDATA%\pip\cache'
- 'fava\static\node_modules'
- 'gui\node_modules'
- '.tox'

artifacts:
- path: 'gui\dist\*.exe'
12 changes: 0 additions & 12 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,6 @@ deps =
{[testenv]deps}
hg+https://bitbucket.org/blais/beancount#egg=beancount

[testenv:deploy]
deps =
pyinstaller
hg+https://bitbucket.org/blais/beancount#egg=beancount
changedir = {toxinidir}/gui
whitelist_externals = npm
passenv = APPDATA
commands =
pyinstaller --clean --distpath bin pyinstaller.spec
npm install
npm run dist

[testenv:coverage]
usedevelop = true
deps =
Expand Down

0 comments on commit 22b2a65

Please sign in to comment.