Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI Test] Cronjob overhaul and added sunpydev #172

Merged
merged 1 commit into from
May 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- run: *merge-check
- run: *apt-install
- run: *tox-install
- run: tox -e py37-build_docs
- run: tox -e build_docs
- store_artifacts:
path: docs/_build/html
- run:
Expand Down
249 changes: 202 additions & 47 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,64 +1,219 @@
# Compiled files
### Python: https://raw.githubusercontent.com/github/gitignore/master/Python.gitignore

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*.a
*.o
*$py.class

# C extensions
*.so
__pycache__

# Ignore .c files by default to avoid including generated code. If you want to
# add a non-generated .c extension, use `git add -f filename.c`.
*.c
# Distribution / packaging
.Python
pip-wheel-metadata/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Other generated files
*/version.py
*/cython_version.py
htmlcov
# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
MANIFEST
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/
junit/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# Sphinx
docs/api
docs/_build
# pyenv
.python-version

# Eclipse editor project files
.project
.pydevproject
.settings
# celery beat schedule file
celerybeat-schedule

# Pycharm editor project files
.idea
# SageMath parsed files
*.sage.py

# Floobits project files
.floo
.flooignore
# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Packages/installer info
*.egg
*.egg-info
.eggs/
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg
distribute-*.tar.gz
# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/

### https://raw.github.com/github/gitignore/master/Global/OSX.gitignore

.DS_Store
.AppleDouble
.LSOverride

# Icon must ends with two \r.
Icon


# Thumbnails
._*

# Files that might appear on external disk
.Spotlight-V100
.Trashes

### Linux: https://raw.githubusercontent.com/github/gitignore/master/Global/Linux.gitignore

# Other
.cache
.tox
.*.sw[op]
*~
.project
.pydevproject
.settings

# Mac OSX
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

### MacOS: https://raw.githubusercontent.com/github/gitignore/master/Global/macOS.gitignore

# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# changelog
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### Windows: https://raw.githubusercontent.com/github/gitignore/master/Global/Windows.gitignore

# Windows thumbnail cache files
Thumbs.db
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

### VScode: https://raw.githubusercontent.com/github/gitignore/master/Global/VisualStudioCode.gitignore
.vscode/*

### Extra Python Items and nccube Specific
.hypothesis
.pytest_cache
sunpydata.sqlite
sunpydata.sqlite-journal
ndcube/_compiler.c
ndcube/cython_version.py
ndcube/version.py
docs/_build
docs/generated
docs/api/
docs/whatsnew/latest_changelog.txt

### Pycharm(?)
.idea

# Release script
.github_cache
20 changes: 7 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ matrix:
name: "macOS 3.7 (py37-offline)"
env: TOX_ENV='py37-offline'

- name: "3.6 offline (py36-offline)"
env: TOX_ENV='py36-offline'

- name: "3.7 offline (py37-offline)"
env: TOX_ENV='py37-offline'

- name: "AstroPy dev (py37-astropydev)"
env: TOX_ENV='py37-astropydev'

- name: "SunPY dev (py37-sunpydev)"
env:
- TOX_ENV='py37-astropydev'
- TOX_ENV='py37-sunpydev'
addons:
apt:
packages:
Expand All @@ -41,18 +41,12 @@ matrix:
- libatlas-base-dev
env: TOX_ENV='py37-numpydev'

allow_failures:
- name: "3.7 online (py37-online)"
env:
- TOX_ENV='py37-online'
- TOX_ARG='-- -n=8'

before_install:
- git clone --depth 1 git://github.com/astropy/ci-helpers.git
# We do not want to create the test env
- echo "" > ci-helpers/travis/setup_dependencies_common.sh
- source ci-helpers/travis/setup_conda.sh
- pip install tox tox-conda
- pip install tox

script:
- tox -e $TOX_ENV $TOX_ARG
Expand All @@ -61,6 +55,6 @@ script:

after_failure:
# Send a nice matrix notification if the Astropy-dev job fails
- NOTIF_TEXT='Build '$TRAVIS_BUILD_NUMBER' (Astropy-dev) Failed:'$TRAVIS_BUILD_WEB_URL
- NOTIF_TEXT='Build '$TRAVIS_BUILD_NUMBER' (sunpy-dev) Failed:'$TRAVIS_BUILD_WEB_URL
- AVATAR_URL='https://s3-eu-west-1.amazonaws.com/cadair.com/Tessa-pride.png'
- if [[ -n "$NOTIFURL" && $TOX_ENV == *astropydev* ]]; then http --verify=no POST $NOTIFURL displayName="Travis Bot" avatarUrl="$AVATAR_URL" text="$NOTIF_TEXT"; fi
- if [[ -n "$NOTIFURL" && $TOX_ENV == *sunpydev* ]]; then http --verify=no POST $NOTIFURL displayName="Travis Bot" avatarUrl="$AVATAR_URL" text="$NOTIF_TEXT"; fi
12 changes: 7 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)

variables:
"System.PreferGit": true
Agent.Source.Git.ShallowFetchDepth: 1
CI_NAME: Azure Pipelines
CI_BUILD_ID: $(Build.BuildId)
CI_BUILD_URL: "https://dev.azure.com/sunpy/ndcube/_build/results?buildId=$(Build.BuildId)"
GIT_BRANCH: $[ coalesce(variables['System.PullRequest.SourceBranch'], variables['Build.SourceBranchName'], 'not-found') ]
GIT_COMMIT_SHA: $[ coalesce(variables['System.PullRequest.SourceCommitId'], variables['Build.SourceVersion'], 'not-found') ]

jobs:
- template: azure-templates.yml
Expand Down Expand Up @@ -36,6 +32,12 @@ jobs:

- template: azure-templates.yml
parameters:
name: Linux_36_Conda_offline
name: Linux_36_conda_offline
os: linux
tox: conda --

- template: azure-templates.yml
parameters:
name: Linux_37_sunpydev
os: linux
tox: py37-sunpydev --
14 changes: 7 additions & 7 deletions azure-templates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ jobs:
codecov --name ${{ format(parameters.name) }}
displayName: run codecov
condition: succeededOrFailed()

- task: PublishTestResults@2
condition: succeededOrFailed()
inputs:
testResultsFiles: '**/test-*.xml'
testRunTitle: 'Publish test results for ${{ format(parameters.name) }}'

- ${{ if contains(parameters.tox, 'online') }}:
- task: PublishCodeCoverageResults@1
condition: succeededOrFailed()
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'
reportDirectory: '$(System.DefaultWorkingDirectory)/**/htmlcov'
- task: PublishCodeCoverageResults@1
condition: succeededOrFailed()
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'
reportDirectory: '$(System.DefaultWorkingDirectory)/**/htmlcov'
Loading