Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
26a72fb
add circleci config
Chilipp Sep 16, 2021
cd2e49d
compatibility fixes for xarray 0.18
Chilipp Sep 16, 2021
a6077c6
add sphinx_rtd_theme
Chilipp Sep 16, 2021
b1bf531
use latest orb version
Chilipp Sep 22, 2021
a859cb2
do not run setup_env
Chilipp Sep 22, 2021
9c1ca52
remove examples from the docs
Chilipp Sep 22, 2021
a082ddc
update orb version
Chilipp Sep 22, 2021
1f8ed3c
use [email protected]
Chilipp Sep 22, 2021
10e4c46
deploy docs to github pages
Chilipp Sep 22, 2021
60b0554
run deploy after install
Chilipp Sep 22, 2021
62a6606
add deployment and release parameters
Chilipp Sep 27, 2021
4a7c564
minor
Chilipp Sep 27, 2021
80a1bc0
config fixes
Chilipp Sep 27, 2021
6828e93
use [email protected]
Chilipp Sep 27, 2021
a9e82a9
minor ci fix
Chilipp Sep 28, 2021
d73dfb6
add MM_WEBHOOK via context
Chilipp Sep 28, 2021
e90f41e
use parallel tests for xarray
Chilipp Sep 28, 2021
74d98e0
minor test fixes
Chilipp Sep 28, 2021
4eb424f
restrict xarray version to 0.17
Chilipp Sep 28, 2021
6a19989
install extra packages
Chilipp Sep 28, 2021
89fbea1
do not test for xarray versions on windows
Chilipp Sep 28, 2021
6c61b42
specify python version and label for upload
Chilipp Sep 28, 2021
235df63
minor
Chilipp Sep 28, 2021
344cd7d
do not install psyplot-ci-orb dependencies
Chilipp Sep 28, 2021
f851859
use [email protected]
Chilipp Sep 28, 2021
aa6d372
use [email protected]
Chilipp Sep 28, 2021
a8de729
use [email protected]
Chilipp Sep 28, 2021
f4fd262
use [email protected]
Chilipp Sep 29, 2021
7da7504
minor
Chilipp Sep 29, 2021
8c2a994
[skip ci] update badges
Chilipp Sep 29, 2021
442ac96
[skip ci] Add CircleCI to changelog
Chilipp Sep 29, 2021
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
28 changes: 11 additions & 17 deletions appveyor.yml → .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
environment:

PYTHON_ARCH: "64"
PYTHON: "C:\\Miniconda36-x64"
PYTHON: "C:\\Miniconda38-x64"

matrix:
- PYTHON_VERSION: "3.7"
XARRAY_VERSION: "0.15"
BUILD_STR_END: cf
- PYTHON_VERSION: "3.7"
- PYTHON_VERSION: "3.8"
XARRAY_VERSION: "0.16"
BUILD_STR_END: cf

install:
# windows config (for installation)
- cmd: "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
- cmd: setlocal
- cmd: set CONDA_REPO_TOKEN=
- cmd: set ANACONDA_API_TOKEN=
# conda config
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda install conda-build anaconda-client
- IF NOT DEFINED BUILD_STR_END (conda config --add channels chilipp) ELSE (conda config --add channels conda-forge)
- pip install -i https://pypi.anaconda.org/psyplot/simple --no-deps psyplot-ci-orb
- conda config --add channels conda-forge
- conda config --add channels psyplot
- conda info -a
- conda list
Expand All @@ -30,20 +25,19 @@ install:
- cmd: 'SET PYTHONWARNINGS=ignore:mode:DeprecationWarning:docutils.io:245'
- cmd: "IF NOT DEFINED APPVEYOR_REPO_TAG_NAME (SET GIT_BRANCH=%APPVEYOR_REPO_BRANCH%)"
- cmd: "IF NOT DEFINED APPVEYOR_REPO_TAG_NAME (conda config --add channels psyplot/label/%APPVEYOR_REPO_BRANCH%)"
- cmd: "
IF NOT DEFINED BUILD_STR_END (
python ci\\setup_append.py ci\\conda-recipe xarray=%XARRAY_VERSION%
) ELSE (
python ci\\setup_append.py ci\\conda-recipe xarray=%XARRAY_VERSION% gdal=
)"

build: off

test_script:
- cmd: setlocal
- cmd: set CONDA_REPO_TOKEN=
- cmd: set ANACONDA_API_TOKEN=
- cmd: conda build ci/conda-recipe --python %PYTHON_VERSION%
- cmd: endlocal

deploy_script:
- cmd: "python ci\\deploy_anaconda.py"
- cmd: "
IF NOT DEFINED APPVEYOR_REPO_TAG_NAME (
deploy-conda-recipe -l %APPVEYOR_REPO_BRANCH% -py %PYTHON_VERSION% ci/conda-recipe
) ELSE (
deploy-conda-recipe -py %PYTHON_VERSION% ci/conda-recipe
)"
102 changes: 102 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
version: 2.1

orbs:
psyplot: psyplot/[email protected]
mattermost-plugin-notify: nathanaelhoun/[email protected]

executors:
default: psyplot/default
macos: psyplot/macos

parameters:
unit-test-executor:
description: Executor for the unit tests. Can be default or macos
type: string
default: default
deploy-release:
description: Deploy the comment as a new release to github and pypi
type: boolean
default: false

workflows:
build-and-test:
unless: << pipeline.parameters.deploy-release >>
jobs:
- psyplot/install-and-build:
name: install
exec_environment: << pipeline.parameters.unit-test-executor >>
setup_env: true
build_args: "--no-test"
env_packages: dask netcdf4 scipy
- psyplot/test-parallel:
name: test-xarray-latest
parallelism: 2
requires:
- install
- psyplot/test-parallel:
name: test-xarray-0.17
parallelism: 2
packages: xarray=0.17
requires:
- install
- mattermost-plugin-notify/approval-notification:
name: notify-deploy
context: mattermost
message: >-
Hello @all! A workflow on https://app.circleci.com/pipelines/github/psyplot/psyplot is awaiting your approval.
Please check the uploaded docs and builds prior to approval.
requires:
- test-xarray-latest
- test-xarray-0.17
- hold-for-deploy:
type: approval
requires:
- notify-deploy
- psyplot/deploy-pkg:
exec_environment: << pipeline.parameters.unit-test-executor >>
context: anaconda
requires:
- hold-for-deploy
- psyplot/deploy-docs:
fingerprint: "fc:e3:0f:d0:c6:5a:6a:a5:0e:7c:d6:47:37:48:dd:67"
requires:
- hold-for-deploy
filters:
branches:
only: main
- psyplot/trigger-release-workflow:
context: trigger-release
filters:
branches:
only: main
requires:
- psyplot/deploy-pkg
- psyplot/deploy-docs
publish-release:
when: << pipeline.parameters.deploy-release >>
jobs:
- psyplot/create-tag:
ssh-fingerprints: "fc:e3:0f:d0:c6:5a:6a:a5:0e:7c:d6:47:37:48:dd:67"
context: psyplot-admin
user-name: psyplot-admin
publish-release: true
publish-version-tag: true
- mattermost-plugin-notify/approval-notification:
name: notify-release
context: mattermost
message: >-
Hello @all! A new release has been created at https://github.com/psyplot/psyplot/releases.
Please review it carefully, publish it and approve the upload to pypi.
requires:
- psyplot/create-tag
- hold-for-pypi:
type: approval
requires:
- notify-release
- psyplot/deploy-pypi:
context: pypi
requires:
- hold-for-pypi
filters:
branches:
only: main
123 changes: 0 additions & 123 deletions .travis.yml

This file was deleted.

8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
v1.4.0
======

Changed
-------
- We use CicleCI now for a standardized CI/CD pipeline, see
`#32 <https://github.com/psyplot/psyplot/pull/32>`__

v1.3.2
======
Fixed
Expand Down
14 changes: 9 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ The psyplot interactive visualization framework
:widths: 10 90

* - docs
- |docs| |joss|
- |docs| |joss| |zenodo|
* - tests
- |travis| |appveyor| |requires| |codecov|
- |circleci| |appveyor| |requires| |codecov|
* - package
- |version| |conda| |github|
* - implementations
Expand All @@ -23,9 +23,9 @@ The psyplot interactive visualization framework
:alt: Documentation Status
:target: http://psyplot.readthedocs.io/en/latest/?badge=latest

.. |travis| image:: https://travis-ci.org/psyplot/psyplot.svg?branch=master
:alt: Travis
:target: https://travis-ci.org/psyplot/psyplot
.. |circleci| image:: https://circleci.com/gh/psyplot/psyplot/tree/master.svg?style=svg
:alt: CircleCI
:target: https://circleci.com/gh/psyplot/psyplot/tree/master

.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/4nt6qrw66iw65w33/branch/master?svg=true
:alt: AppVeyor
Expand Down Expand Up @@ -59,6 +59,10 @@ The psyplot interactive visualization framework
:alt: Journal of Open Source Software
:target: http://joss.theoj.org/papers/3535c28017003f0b5fb63b1b64118b60

.. |zenodo| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.593798.svg
:alt: Zenodo
:target: https://doi.org/10.5281/zenodo.593798

.. |github| image:: https://img.shields.io/github/release/psyplot/psyplot.svg
:target: https://github.com/psyplot/psyplot/releases/latest
:alt: Latest github release
Expand Down
27 changes: 0 additions & 27 deletions ci/deploy_anaconda.py

This file was deleted.

7 changes: 0 additions & 7 deletions ci/requirements.txt

This file was deleted.

25 changes: 0 additions & 25 deletions ci/setup_append.py

This file was deleted.

Loading