-
Notifications
You must be signed in to change notification settings - Fork 20
Unstructured scheme iris source #33
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
Merged
stephenworsley
merged 4 commits into
SciTools:unstructured_scheme
from
bjlittle:unstructured-scheme-iris-source
Mar 8, 2021
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,14 +5,20 @@ | |
| # - https://cirrus-ci.org/guide/windows/ | ||
| # - https://hub.docker.com/_/gcc/ | ||
| # - https://hub.docker.com/_/python/ | ||
| # - https://community.codecov.io/t/add-support-of-uploading-from-cirrus-ci-without-token/1028/14 | ||
|
|
||
| # | ||
| # Global defaults. | ||
| # | ||
| container: | ||
| image: python:3.8 | ||
| cpu: 2 | ||
| memory: 4G | ||
|
|
||
| env: | ||
| # Skip specific tasks by name. Set to a non-empty string to skip. | ||
| SKIP_LINT_TASK: "" | ||
| SKIP_TEST_TASK: "" | ||
| # Maximum cache period (in weeks) before forcing a new cache upload. | ||
| CACHE_PERIOD: "2" | ||
| # Increment the build number to force new conda cache upload. | ||
|
|
@@ -21,50 +27,38 @@ env: | |
| NOX_CACHE_BUILD: "0" | ||
| # Increment the build number to force new pip cache upload. | ||
| PIP_CACHE_BUILD: "0" | ||
| # Pip package to be upgraded/installed. | ||
| PIP_CACHE_PACKAGES: "pip setuptools wheel nox" | ||
| # Pip package to be installed. | ||
| PIP_CACHE_PACKAGES: "pip setuptools wheel nox pyyaml" | ||
| # Conda packages to be installed. | ||
| CONDA_CACHE_PACKAGES: "nox pip pyyaml" | ||
|
|
||
|
|
||
| # | ||
| # Linting | ||
| # | ||
| lint_task: | ||
| only_if: ${SKIP_LINT_TASK} == "" | ||
| auto_cancellation: true | ||
| name: "Lint: flake8" | ||
| name: "${CIRRUS_OS}: flake8 and black" | ||
| pip_cache: | ||
| folder: ~/.cache/pip | ||
| fingerprint_script: | ||
| - echo "${CIRRUS_OS} py${PYTHON_VERSION}" | ||
| - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${PIP_CACHE_BUILD} ${PIP_CACHE_PACKAGES}" | ||
| - echo "${CIRRUS_TASK_NAME} py${PYTHON_VERSION}" | ||
| - echo "${PIP_CACHE_PACKAGES}" | ||
| - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${PIP_CACHE_BUILD}" | ||
| lint_script: | ||
| - pip list | ||
| - python -m pip install --retries 3 --upgrade ${PIP_CACHE_PACKAGES} | ||
| - pip list | ||
| - nox --session lint | ||
|
|
||
|
|
||
| # | ||
| # Formatting | ||
| # | ||
| style_task: | ||
| auto_cancellation: true | ||
| name: "Format: black" | ||
| pip_cache: | ||
| folder: ~/.cache/pip | ||
| fingerprint_script: | ||
| - echo "${CIRRUS_OS} py${PYTHON_VERSION}" | ||
| - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${PIP_CACHE_BUILD} ${PIP_CACHE_PACKAGES}" | ||
| style_script: | ||
| - pip list | ||
| - python -m pip install --retries 3 --upgrade ${PIP_CACHE_PACKAGES} | ||
| - pip list | ||
| - nox --session style | ||
| - nox --session flake8 | ||
| - nox --session black | ||
|
|
||
|
|
||
| # | ||
| # Testing (Linux) | ||
| # | ||
| linux_task: | ||
| test_task: | ||
| only_if: ${SKIP_TEST_TASK} == "" | ||
| auto_cancellation: true | ||
| matrix: | ||
| env: | ||
|
|
@@ -73,105 +67,32 @@ linux_task: | |
| PY_VER: "3.7" | ||
| env: | ||
| PY_VER: "3.8" | ||
| COVERAGE: "pytest-cov codecov" | ||
| name: "Linux: py${PY_VER}" | ||
| COVERAGE: "true" | ||
| name: "${CIRRUS_OS}: py${PY_VER} tests" | ||
| container: | ||
| image: gcc:latest | ||
| env: | ||
| PATH: ${HOME}/miniconda/bin:${PATH} | ||
| CODECOV_TOKEN: "ENCRYPTED\ | ||
| [1ed538b97a8d005bdd5ab729de009ac38a2b53389edb0912\ | ||
| d2e76f5ce1e71c5f7bdea80a79492b57af54691c8936bdc7]" | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
| conda_cache: | ||
| folder: ${HOME}/miniconda | ||
| fingerprint_script: | ||
| - wget --quiet https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh | ||
| - echo "${CIRRUS_OS} $(sha256sum miniconda.sh)" | ||
| - echo "${CONDA_CACHE_PACKAGES}" | ||
| - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${CONDA_CACHE_BUILD}" | ||
| populate_script: | ||
| - bash miniconda.sh -b -p ${HOME}/miniconda | ||
| - conda config --set always_yes yes --set changeps1 no | ||
| - conda config --set show_channel_urls True | ||
| - conda config --add channels conda-forge | ||
| - conda update --quiet --name base conda | ||
| - conda install --quiet --name base nox pip | ||
| check_script: | ||
| - conda info --all | ||
| - conda list --name base | ||
| - conda list --name base --explicit | ||
| nox_cache: | ||
| folder: ${CIRRUS_WORKING_DIR}/.nox | ||
| fingerprint_script: | ||
| - echo "${CIRRUS_OS} tests ${PY_VER}" | ||
| - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${NOX_CACHE_BUILD}" | ||
| - cat ${CIRRUS_WORKING_DIR}/requirements/py$(echo ${PY_VER} | tr -d ".").yml | ||
| - if [ -n "${COVERAGE}" ]; then echo "${COVERAGE}"; fi | ||
| test_script: | ||
| - nox --session tests | ||
|
|
||
|
|
||
| # | ||
| # Testing (macOS) | ||
| # | ||
| osx_task: | ||
| auto_cancellation: true | ||
| matrix: | ||
| env: | ||
| PY_VER: "3.8" | ||
| name: "OSX: py${PY_VER}" | ||
| osx_instance: | ||
| image: catalina-xcode | ||
| env: | ||
| PATH: ${HOME}/miniconda/bin:${PATH} | ||
| conda_cache: | ||
| folder: ${HOME}/miniconda | ||
| fingerprint_script: | ||
| - wget --quiet https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh | ||
| - echo "${CIRRUS_OS} $(shasum -a 256 miniconda.sh)" | ||
| - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${CONDA_CACHE_BUILD}" | ||
| populate_script: | ||
| - bash miniconda.sh -b -p ${HOME}/miniconda | ||
| - conda config --set always_yes yes --set changeps1 no | ||
| - conda config --set show_channel_urls True | ||
| - conda config --add channels conda-forge | ||
| - conda update --quiet --name base conda | ||
| - conda install --quiet --name base nox pip | ||
| check_script: | ||
| - conda info --all | ||
| - conda list --name base | ||
| - conda list --name base --explicit | ||
| - conda install --quiet --name base ${CONDA_CACHE_PACKAGES} | ||
| nox_cache: | ||
| folder: ${CIRRUS_WORKING_DIR}/.nox | ||
| fingerprint_script: | ||
| - echo "${CIRRUS_OS} tests ${PY_VER}" | ||
| - echo "${CIRRUS_TASK_NAME}" | ||
| - echo "$(date +%Y).$(expr $(date +%U) / ${CACHE_PERIOD}):${NOX_CACHE_BUILD}" | ||
| - cat ${CIRRUS_WORKING_DIR}/requirements/py$(echo ${PY_VER} | tr -d ".").yml | ||
| - sha256sum ${CIRRUS_WORKING_DIR}/requirements/py$(echo ${PY_VER} | tr -d ".").yml | ||
| - if [ -n "${IRIS_SOURCE}" ]; then echo "${IRIS_SOURCE}"; fi | ||
| test_script: | ||
| - nox --session tests | ||
|
|
||
|
|
||
| # | ||
| # esmpy is unavailable from conda-forge for win | ||
| # | ||
| # windows_task: | ||
| # auto_cancellation: true | ||
| # matrix: | ||
| # env: | ||
| # PY_VER: "3.8" | ||
| # name: "Windows: py${PY_VER}" | ||
| # windows_container: | ||
| # image: cirrusci/windowsservercore:2019 | ||
| # env: | ||
| # ANACONDA_LOCATION: $USERPROFILE\anaconda | ||
| # PATH: $ANACONDA_LOCATION\Scripts;$ANACONDA_LOCATION;$PATH | ||
| # PYTHON_ARCH: 64 | ||
| # install_script: | ||
| # - choco install -y openssl.light | ||
| # - choco install -y miniconda3 --params="'/D:%ANACONDA_LOCATION%'" | ||
| # conda_script: | ||
| # - conda config --set always_yes yes --set changeps1 no | ||
| # - conda config --set show_channel_urls True | ||
| # - conda config --add channels conda-forge | ||
| # - conda install --quiet --name base nox pip | ||
| # test_script: | ||
| # - nox --session tests | ||
| - nox --session tests -- --verbose | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -127,3 +127,6 @@ dmypy.json | |
|
|
||
| # Pyre type checker | ||
| .pyre/ | ||
|
|
||
| # Editors and IDEs | ||
| .idea | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.