Merge branch 'master' into ndcube_sequence_slicing

.circleci/config.yml

@@ -1,3 +1,10 @@
+no-backports: &no-backports
+  name: Skip any branches called backport*
+  command: |
+    if [[ "${CIRCLE_BRANCH}" = *"backport"* ]]; then
+      circleci step halt
+    fi
+
 skip-check: &skip-check
   name: Check for [ci skip]
   command: bash .circleci/early_exit.sh
@@ -11,114 +18,59 @@ merge-check: &merge-check
       git checkout -qf pr/$CIRCLE_PR_NUMBER/merge
     fi
 
-permission-run: &permission-run
-  name: Fix permssions for installing
-  command: |
-    sudo chown -R circleci:circleci /usr/local/bin
-    sudo chown -R circleci:circleci /usr/local/lib/python3.7/site-packages
-    sudo chown -R circleci:circleci /usr/local/share/
-
 apt-run: &apt-install
   name: Install apt packages
   command: |
     apt update
     apt install -y graphviz build-essential
 
-sudo-apt-run: &sudo-apt-install
-  name: Install apt packages
-  command: |
-    sudo apt update
-    sudo apt install -y graphviz build-essential
-
-tox-install: &tox-install
-  name: Install Tox
-  command: |
-    pip install tox
-
-tox-conda-install: &tox-conda-install
-  name: Install Tox-Conda
-  command: |
-    pip install tox-conda
-
 version: 2
 jobs:
-  egg-info-36:
-    docker:
-      - image: circleci/python:3.6
-    steps:
-      - checkout
-      - run: *skip-check
-      - run: *merge-check
-      - run: python setup.py egg_info
-
-  egg-info-37:
-    docker:
-      - image: circleci/python:3.7
-    steps:
-      - checkout
-      - run: *skip-check
-      - run: *merge-check
-      - run: python setup.py egg_info
-
   twine-check:
     docker:
-      - image: circleci/python:3.7
+      - image: continuumio/miniconda3
     steps:
       - checkout
+      - run: *no-backports
       - run: *skip-check
       - run: *merge-check
-      - run: *permission-run
-      - run: python setup.py sdist
+      - run: pip install -U pep517
+      - run: python -m pep517.build --source .
       - run: python -m pip install -U --user --force-reinstall twine
       - run: python -m twine check dist/*
 
-  pip-install:
-    docker:
-      - image: circleci/python:3.7
-    steps:
-      - checkout
-      - run: *skip-check
-      - run: *merge-check
-      - run: *permission-run
-      - run: *sudo-apt-install
-      - run: pip install -U pip
-      - run: pip install --progress-bar off .[all,dev]
-      - run: pip install -e .[all,dev]
-      - run: python setup.py develop
-
   html-docs:
     docker:
-      - image: circleci/python:3.7
+      - image: continuumio/miniconda3
     steps:
       - checkout
+      - run: *no-backports
       - run: *skip-check
       - run: *merge-check
-      - run: *permission-run
-      - run: *sudo-apt-install
+      - run: *apt-install
       - run: pip install -U tox
       - run: tox -e build_docs
+      - run:
+          name: Prepare for upload
+          command: |
+            # If it's not a PR, don't upload
+            if [ -z "${CIRCLE_PULL_REQUEST}" ]; then
+              rm -r docs/_build/html/*
+            else
+              # If it is a PR, delete sources, because it's a lot of files
+              # which we don't really need to upload
+              rm -r docs/_build/html/_sources
+            fi
       - store_artifacts:
           path: docs/_build/html
-      - run:
-          name: "Built documentation is available at:"
-          command: DOCS_URL="${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/docs/_build/html/index.html"; echo $DOCS_URL
 
 workflows:
   version: 2
 
-  egg-info:
-    jobs:
-      - egg-info-36
-      - egg-info-37
-
   twine-check:
     jobs:
       - twine-check
 
-  pip-install:
-    jobs:
-      - pip-install
-
   test-documentation:
     jobs:
       - html-docs

.gitignore

@@ -1,5 +1,3 @@
-### Python: https://raw.githubusercontent.com/github/gitignore/master/Python.gitignore
-
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -10,7 +8,6 @@ __pycache__/
 
 # Distribution / packaging
 .Python
-pip-wheel-metadata/
 build/
 develop-eggs/
 dist/
@@ -23,6 +20,8 @@ parts/
 sdist/
 var/
 wheels/
+pip-wheel-metadata/
+share/python-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
@@ -41,15 +40,17 @@ pip-delete-this-directory.txt
 # Unit test / coverage reports
 htmlcov/
 .tox/
+.nox/
 .coverage
 .coverage.*
 .cache
 nosetests.xml
 coverage.xml
 *.cover
+*.py,cover
 .hypothesis/
 .pytest_cache/
-junit/
+cover/
 
 # Translations
 *.mo
@@ -59,6 +60,7 @@ junit/
 *.log
 local_settings.py
 db.sqlite3
+db.sqlite3-journal
 
 # Flask stuff:
 instance/
@@ -71,16 +73,34 @@ instance/
 docs/_build/
 
 # PyBuilder
+.pybuilder/
 target/
 
 # Jupyter Notebook
 .ipynb_checkpoints
 
+# IPython
+profile_default/
+ipython_config.py
+
 # pyenv
-.python-version
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
 
-# celery beat schedule file
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
 celerybeat-schedule
+celerybeat.pid
 
 # SageMath parsed files
 *.sage.py
@@ -106,117 +126,27 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+.dmypy.json
+dmypy.json
 
-### 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
-
-*~
-
-# 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-*
+# Pyre type checker
+.pyre/
 
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
+# pytype static type analyzer
+.pytype/
 
-### MacOS: https://raw.githubusercontent.com/github/gitignore/master/Global/macOS.gitignore
+# Cython debug symbols
+cython_debug/
 
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
+# static files generated from Django application using `collectstatic`
+media
+static
 
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# 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 ndcube specific
-.hypothesis
-.pytest_cache
-sunpydata.sqlite
-sunpydata.sqlite-journal
-ndcube/_compiler.c
-ndcube/cython_version.py
+# Specifc Template
 docs/_build
 docs/generated
-docs/api/
+docs/api
 docs/whatsnew/latest_changelog.txt
-examples/**/*.asdf
-# This is incase you run the figure tests
-figure_test_images*
-tags
-
-### Pycharm(?)
-.idea
-
-# Release script
-.github_cache
+ndcube/version.py
+htmlcov/
+.github_cache/