Skip to content

Commit

Permalink
Merge branch 'master' of github.com:enthought/mayavi
Browse files Browse the repository at this point in the history
  • Loading branch information
marekyggdrasil committed Nov 11, 2021
2 parents 4a84061 + 927ab97 commit 561f9ed
Show file tree
Hide file tree
Showing 113 changed files with 698 additions and 1,335 deletions.
53 changes: 53 additions & 0 deletions .github/workflows/run-mayavi-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Tests
concurrency:
group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.type }}
cancel-in-progress: true

on:
pull_request

jobs:
tests:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: [3.6]
fail-fast: false

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- name: Install Linux packages for Qt5 support
run: |
sudo apt-get update
sudo apt-get install qt5-default
sudo apt-get install libxkbcommon-x11-0
sudo apt-get install libxcb-icccm4
sudo apt-get install libxcb-image0
sudo apt-get install libxcb-keysyms1
sudo apt-get install libxcb-randr0
sudo apt-get install libxcb-render-util0
sudo apt-get install libxcb-xinerama0
if: matrix.os == 'ubuntu-latest'
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies and local packages
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install pyqt5
python -m pip install numpy
python -m pip install vtk==9.0.3
python -m pip install pillow
python -m pip install nose
python -m pip install -e .[app]
- name: Test Mayavi package
uses: GabrielBB/xvfb-action@v1
with:
run: python -m nose.core -v mayavi
- name: Test tvtk package
uses: GabrielBB/xvfb-action@v1
with:
run: python -m nose.core -v tvtk
58 changes: 0 additions & 58 deletions .travis.yml

This file was deleted.

12 changes: 0 additions & 12 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,6 @@ TVTK docs: http://docs.enthought.com/mayavi/tvtk
:target: https://pypi.org/project/mayavi/
:alt: Package on PyPI

.. image:: https://api.travis-ci.org/enthought/mayavi.png?branch=master
:target: https://travis-ci.org/enthought/mayavi
:alt: Build status

.. image:: https://ci.appveyor.com/api/projects/status/lnb24gj70yidfnrl/branch/master
:target: https://ci.appveyor.com/project/EnthoughtOSS/mayavi
:alt: Appveyor build status

.. image:: http://codecov.io/github/enthought/mayavi/coverage.svg?branch=master
:target: http://codecov.io/github/enthought/mayavi?branch=master
:alt: Code coverage status

.. image:: https://img.shields.io/badge/License-BSD%203--Clause-blue.svg
:target: https://opensource.org/licenses/BSD-3-Clause
:alt: BSD 3 Clause
Expand Down
40 changes: 0 additions & 40 deletions appveyor.yml

This file was deleted.

1 change: 0 additions & 1 deletion checksums

This file was deleted.

9 changes: 0 additions & 9 deletions ci/appveyor-test.cmd

This file was deleted.

10 changes: 0 additions & 10 deletions ci/ci-requirements.txt

This file was deleted.

10 changes: 0 additions & 10 deletions ci/ci-src-requirements.txt

This file was deleted.

17 changes: 0 additions & 17 deletions ci/install-edm-linux.sh

This file was deleted.

17 changes: 0 additions & 17 deletions ci/install-edm-osx.sh

This file was deleted.

88 changes: 0 additions & 88 deletions ci/run_with_env.cmd

This file was deleted.

6 changes: 0 additions & 6 deletions ci/travis-run-integration-tests.sh

This file was deleted.

19 changes: 19 additions & 0 deletions docs/CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
Mayavi 4.7.3
============

This is a small bug fix release mainly concerned with compatability with Traits
6.2.0 and soon to be release TraitsUI 7.2.0.

Fixes
-----

10 Dec 2021 `#983 <https://github.com/enthought/mayavi/pull/983>`_ (larsoner)
- MAINT: Support Python 3.9

06 May 2021 `#1030 <https://github.com/enthought/mayavi/pull/1030>`_ (aaronayres35)
- import from pyface.image not traitsui.image

06 May 2021 `#1035 <https://github.com/enthought/mayavi/pull/1035>`_ (aaronayres35)
- Pass a value in appropriate range to avoid failure


Mayavi 4.7.2
============

Expand Down
2 changes: 1 addition & 1 deletion docs/source/mayavi/advanced_scripting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ handy to be able to navigate to a particular module/object. In the
above this could be achieved as follows::

x = mayavi.engine.scenes[0].children[0].children[0].children[-1]
print x
print(x)

In this case ``x`` will be set to the ``Streamline`` instance that we
just created.
Expand Down
19 changes: 19 additions & 0 deletions docs/source/mayavi/auto/changes.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
Mayavi 4.7.3
============

This is a small bug fix release mainly concerned with compatability with Traits
6.2.0 and soon to be release TraitsUI 7.2.0.

Fixes
-----

10 Dec 2021 `#983 <https://github.com/enthought/mayavi/pull/983>`_ (larsoner)
- MAINT: Support Python 3.9

06 May 2021 `#1030 <https://github.com/enthought/mayavi/pull/1030>`_ (aaronayres35)
- import from pyface.image not traitsui.image

06 May 2021 `#1035 <https://github.com/enthought/mayavi/pull/1035>`_ (aaronayres35)
- Pass a value in appropriate range to avoid failure


Mayavi 4.7.2
============

Expand Down
Loading

0 comments on commit 561f9ed

Please sign in to comment.