Skip to content

Commit

Permalink
Merge branch 'master' into create-build-logs-webapge
Browse files Browse the repository at this point in the history
  • Loading branch information
KVGarg authored May 11, 2021
2 parents 77d038d + 3a9f06c commit 7d2b0e6
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 14 deletions.
3 changes: 2 additions & 1 deletion .ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ EXPORTED_DATA="static/tasks.yaml static/instances.yaml static/$META_REVIEW_DATA"

ISSUES_JSON="issues.json"

python manage.py fetch_deployed_data --allow-failure _site $EXPORTED_DATA
python manage.py fetch_deployed_data _site $EXPORTED_DATA \
--repo-name community --hoster github

if [[ -n "$GCI_TOKEN" ]]; then
python manage.py fetch_gci_task_data private
Expand Down
23 changes: 13 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
language: python
python: 3.6.3

cache:
pip: true
cache: false

stages:
- test
- moban
- name: deploy
if: type != pull_request

.moban: &moban
python: 3.6
stage: moban
install: pip install moban~=0.5.0 gitfs2 pypifs
script:
- moban
- git diff --exit-code

env:
global:
- ENCRYPTION_LABEL: "defac9b1fa56"
Expand All @@ -25,13 +32,9 @@ jobs:
# A proper build with the tokens available
- stage: deploy
after_success: ./.ci/deploy.sh
- python: 3.6
stage: moban
env:
before_install: false
install: pip install moban
script: .ci/check_moban.sh
after_success: false
- *moban
allow_failures:
- *moban

before_install:
- printf '%s\n'
Expand All @@ -43,7 +46,7 @@ script:
- ./.ci/build.sh
- rm -rf private/
- pytest
- coala --non-interactive -V
- coala --flush-cache --non-interactive -V

notifications:
email: false
Expand Down
Binary file modified docs/_static/images/header.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.6
3.7
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ addopts =
--color=yes
--doctest-glob=*.rst
--doctest-modules
--doctest-ignore-import-error
--doctest-ignore-import-errors
--error-for-skips
--cov
--instafail
Expand Down
2 changes: 1 addition & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ codecov~=2.0.5
moban~=0.5.0 ; python_version > '3.0'
packaging~=16.8
pytest~=3.6.4
pytest-cov~=2.4
pytest-cov==2.4
pytest-django~=3.3.3
pytest-env~=0.6.0
pytest-error-for-skips~=1.0
Expand Down

0 comments on commit 7d2b0e6

Please sign in to comment.