Commit e086d0ea authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Merge branch 'rel/1.6.6' into 'v1.6'

Rel/1.6.6

See merge request fsl/fsleyes/props!35
parents 34138e35 ec0b2136
#!/bin/bash
pip install wheel
set -e
source /test.venv/bin/activate
pip install --upgrade pip wheel setuptools twine
python setup.py sdist
python setup.py bdist_wheel
twine check dist/*
PIPARGS="--retries 10 --timeout 30"
pip install dist/*.whl
pip uninstall -y fsleyes-props
pip install dist/*.tar.gz
pip uninstall -y fsleyes-props
#!/bin/bash
####################################################
# The patch_version script is run on release builds,
# The check_version script is run on release builds,
# and makes sure that the version in the code is up
# to date (i.e. equal to the tag name).
####################################################
if [[ "x$CI_COMMIT_TAG" != "x" ]]; then
echo "Release detected - patching version - $CI_COMMIT_REF_NAME";
sed -ie "s/^__version__ = .*$/__version__ = '$CI_COMMIT_REF_NAME'/g" fsleyes_props/__init__.py;
fi
set -e
cat fsleyes_props/__init__.py | egrep "^__version__ += +'$CI_COMMIT_REF_NAME' *$"
......@@ -30,9 +30,7 @@ if [[ -f /.dockerenv ]]; then
echo "$SSH_PRIVATE_KEY_GIT" > $HOME/.ssh/id_git;
if [[ "$CI_PROJECT_PATH" == "$UPSTREAM_PROJECT" ]]; then
echo "$SSH_PRIVATE_KEY_DOC_DEPLOY" > $HOME/.ssh/id_doc_deploy;
echo "$SSH_PRIVATE_KEY_CONDA_DEPLOY" > $HOME/.ssh/id_conda_deploy;
echo "$SSH_PRIVATE_KEY_CONDA_INDEX" > $HOME/.ssh/id_conda_index;
echo "$SSH_PRIVATE_KEY_DOC_DEPLOY" > $HOME/.ssh/id_doc_deploy;
fi;
chmod go-rwx $HOME/.ssh/id_*;
......@@ -41,7 +39,6 @@ if [[ -f /.dockerenv ]]; then
if [[ "$CI_PROJECT_PATH" == "$UPSTREAM_PROJECT" ]]; then
ssh-add $HOME/.ssh/id_doc_deploy;
ssh-add $HOME/.ssh/id_conda_deploy;
fi
echo "$SSH_SERVER_HOSTKEYS" > $HOME/.ssh/known_hosts;
......@@ -57,16 +54,6 @@ if [[ -f /.dockerenv ]]; then
echo " User ${DOC_HOST%@*}" >> $HOME/.ssh/config;
echo " IdentityFile $HOME/.ssh/id_doc_deploy" >> $HOME/.ssh/config;
echo "Host condadeploy" >> $HOME/.ssh/config;
echo " HostName ${CONDA_HOST##*@}" >> $HOME/.ssh/config;
echo " User ${CONDA_HOST%@*}" >> $HOME/.ssh/config;
echo " IdentityFile $HOME/.ssh/id_conda_deploy" >> $HOME/.ssh/config;
echo "Host condaindex" >> $HOME/.ssh/config;
echo " HostName ${CONDA_HOST##*@}" >> $HOME/.ssh/config;
echo " User ${CONDA_HOST%@*}" >> $HOME/.ssh/config;
echo " IdentityFile $HOME/.ssh/id_conda_index" >> $HOME/.ssh/config;
echo "Host *" >> $HOME/.ssh/config;
echo " IdentitiesOnly yes" >> $HOME/.ssh/config;
......
......@@ -30,4 +30,4 @@ if [ "$TEST_STYLE"x != "x" ]; then pylint --output-format=colorized fsleyes_prop
if [ "$TEST_STYLE"x != "x" ]; then exit 0; fi
# Run the tests
xvfb-run python setup.py test
xvfb-run -a -s "-screen 0 1920x1200x24" python setup.py test
......@@ -107,9 +107,9 @@ variables:
- bash ./.ci/setup_ssh.sh
.patch_version: &patch_version
.check_version: &check_version
before_script:
- bash ./.ci/patch_version.sh
- bash ./.ci/check_version.sh
############
......@@ -131,34 +131,31 @@ variables:
- bash ./.ci/test_template.sh
test:wxpython3:
test:3.6:
stage: test
image: pauldmccarthy/fsleyes-py27-wxpy3-gtk2
image: pauldmccarthy/fsleyes-py36-wxpy4-gtk3
<<: *test_template
test:2.7:
test:3.7:
stage: test
image: pauldmccarthy/fsleyes-py27-wxpy4-gtk2
image: pauldmccarthy/fsleyes-py37-wxpy4-gtk3
<<: *test_template
test:3.4:
test:3.8:
stage: test
image: pauldmccarthy/fsleyes-py34-wxpy4-gtk2
image: pauldmccarthy/fsleyes-py38-wxpy4-gtk3
<<: *test_template
test:3.5:
test:build-pypi-dist:
stage: test
image: pauldmccarthy/fsleyes-py35-wxpy4-gtk2
<<: *test_template
image: pauldmccarthy/fsleyes-py36-wxpy4-gtk3
<<: *except_releases
tags:
- docker
test:3.6:
stage: test
image: pauldmccarthy/fsleyes-py36-wxpy4-gtk2
<<: *test_template
script:
- bash ./.ci/build_pypi_dist.sh
#############
......@@ -168,7 +165,7 @@ test:3.6:
style:
stage: style
image: pauldmccarthy/fsleyes-py35-wxpy4-gtk2
image: pauldmccarthy/fsleyes-py36-wxpy4-gtk3
<<: *test_template
variables:
TEST_STYLE: "true"
......@@ -180,13 +177,12 @@ style:
build-doc:
<<: *only_upstream
<<: *patch_version
tags:
- docker
stage: doc
image: python:3.5
image: python:3.6
script:
- bash ./.ci/build_doc.sh
......@@ -204,10 +200,10 @@ build-doc:
build-pypi-dist:
<<: *only_releases
<<: *patch_version
<<: *check_version
stage: build
image: python:3.5
image: pauldmccarthy/fsleyes-py36-wxpy4-gtk3
tags:
- docker
......@@ -231,7 +227,7 @@ deploy-doc:
<<: *setup_ssh
stage: deploy
when: manual
image: python:3.5
image: python:3.6
tags:
- docker
......@@ -248,7 +244,7 @@ deploy-pypi:
<<: *setup_ssh
stage: deploy
when: manual
image: python:3.5
image: python:3.6
tags:
- docker
......
......@@ -2,6 +2,19 @@ This document contains the ``fsleyes-props`` release history in reverse
chronological order.
1.6.6 (Wednesday September 18th 2019)
-------------------------------------
Changed
^^^^^^^
* ``fsleyes-props`` is no longer tested against Python 2.7-3.5, but is now
tested against Python 3.6-3.8, and GTK3.
1.6.5 (Monday January 7th 2019)
-------------------------------
......
......@@ -27,8 +27,8 @@ fsleyes-props
values of the attributes of a python object.
To do this, you just need to subclass the :class:`.HasProperties` class,
and add some :class:`.PropertyBase` types as class attributes.
To do this, you just need to subclass the ``HasProperties`` class,
and add some ``PropertyBase`` types as class attributes.
Installation
......
......@@ -291,7 +291,7 @@ notification of properties to be suppressed in a ``with`` statement.
"""
__version__ = '1.6.5'
__version__ = '1.6.6'
import sys
......
sphinx==1.6.*
sphinx_rtd_theme==0.*
mock==2.*
coverage==4.*
pytest==3.*
pytest-cov==2.*
sphinx
sphinx_rtd_theme
mock
coverage
pytest
pytest-cov
......@@ -61,7 +61,7 @@ class doc(Command):
print('Building documentation [{}]'.format(destdir))
import sphinx
import sphinx.cmd.build as sphinx_build
try:
import unittest.mock as mock
......@@ -77,7 +77,7 @@ class doc(Command):
patches = [mock.patch.dict('sys.modules', **mockedModules)]
[p.start() for p in patches]
sphinx.main(['sphinx-build', docdir, destdir])
sphinx_build.main([docdir, destdir])
[p.stop() for p in patches]
......@@ -87,6 +87,7 @@ setup(
version=version,
description='[wx]Python event programming framework',
long_description=readme,
long_description_content_type='text/x-rst',
url='https://git.fmrib.ox.ac.uk/fsl/fsleyes/props',
author='Paul McCarthy',
author_email='pauldmccarthy@gmail.com',
......@@ -96,10 +97,9 @@ setup(
'Development Status :: 3 - Alpha',
'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Topic :: Software Development :: Libraries :: Python Modules'],
packages=packages,
......
......@@ -12,7 +12,7 @@ import fsleyes_props as props
import fsleyes_widgets.bitmaptoggle as bmptoggle
import fsleyes_widgets.bitmapradio as bmpradio
from . import (run_with_wx, simclick, addall)
from . import run_with_wx, simclick, addall, realYield
datadir = op.join(op.dirname(__file__), 'testdata')
......@@ -60,13 +60,17 @@ def _test_widget_boolean(parent):
assert mybooltog.GetValue()
assert myboolrad.GetSelection() == 0
simclick(sim, myboolcb)
myboolcb.SetValue(False)
wx.PostEvent(myboolcb, wx.CommandEvent(wx.EVT_CHECKBOX.evtType[0]))
realYield()
assert not obj.mybool
assert not myboolcb .GetValue()
assert not mybooltog.GetValue()
assert myboolrad.GetSelection() == 1
simclick(sim, mybooltog)
myboolcb.SetValue(True)
wx.PostEvent(myboolcb, wx.CommandEvent(wx.EVT_CHECKBOX.evtType[0]))
realYield()
assert obj.mybool
assert myboolcb .GetValue()
assert mybooltog.GetValue()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment