From 733ca47fb955ce1f00eef302c659307821a139f6 Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Tue, 13 Apr 2021 11:58:02 +0100 Subject: [PATCH 1/7] Bump version to 1.4 --- hyperspy_gui_traitsui/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyperspy_gui_traitsui/version.py b/hyperspy_gui_traitsui/version.py index 223e240..e992399 100644 --- a/hyperspy_gui_traitsui/version.py +++ b/hyperspy_gui_traitsui/version.py @@ -1 +1 @@ -__version__ = "1.4.dev0" +__version__ = "1.4" From a4ca13d29c00ca9e314f8d98f1fe6e9ae9b18146 Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Tue, 13 Apr 2021 13:01:18 +0100 Subject: [PATCH 2/7] Add changelog --- CHANGES.rst | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 CHANGES.rst diff --git a/CHANGES.rst b/CHANGES.rst new file mode 100644 index 0000000..db0fbe0 --- /dev/null +++ b/CHANGES.rst @@ -0,0 +1,13 @@ +.. + Add a single entry in the corresponding section below. + See https://keepachangelog.com for details + + +1.4.0 +----- +The is a minor release: +* Fix closing contrast editor tool. +* Add iterpath to fit component GUI. +* Make axes gui compatible with non-unform axis. +* Use GitHub Actions to run the test suite and make release. + From 2bea50288abbf83fa674c69c3ff96fcac617e145 Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Tue, 13 Apr 2021 13:11:18 +0100 Subject: [PATCH 3/7] Update setup.py --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 47e03fe..17582ce 100644 --- a/setup.py +++ b/setup.py @@ -54,6 +54,7 @@ "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Development Status :: 4 - Beta", "Environment :: Console", "Intended Audience :: Science/Research", @@ -79,7 +80,7 @@ # your project is installed. For an analysis of "install_requires" vs pip's # requirements files see: # https://packaging.python.org/en/latest/requirements.html - install_requires=['hyperspy>=1.6', 'traitsui>=6.0'], + install_requires=['hyperspy>=1.6.2', 'traitsui>=6.0'], extras_require={ 'tests': ['pytest'], 'coverage':["pytest-cov", "codecov"]}, From 1367e3a3b5d1105a396715927a187f53a561d369 Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Tue, 13 Apr 2021 14:55:56 +0100 Subject: [PATCH 4/7] Fix formatting changelog for github. --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index db0fbe0..6b206be 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -6,6 +6,7 @@ 1.4.0 ----- The is a minor release: + * Fix closing contrast editor tool. * Add iterpath to fit component GUI. * Make axes gui compatible with non-unform axis. From 1ae49fad924dbe9a704573eea842d180088bd8de Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Tue, 13 Apr 2021 15:04:30 +0100 Subject: [PATCH 5/7] Fix release workflow --- .github/workflows/release.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d98b21..1adc853 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,12 +67,22 @@ jobs: run: | ls dist/ - - name: Install and test distribution + - name: Install Dependencies + run: | + pip install pyqt5 + sudo apt-get install -y libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xinput0 libxcb-xfixes0 + + - name: Install package env: MPLBACKEND: agg run: | pip install --find-links dist hyperspy_gui_traitsui[tests] - pytest --pyargs hyperspy_gui_traitsui + + - name: Run test suite + # run the tests headlessly + uses: GabrielBB/xvfb-action@v1 + with: + run: pytest --pyargs hyperspy_gui_traitsui - uses: actions/upload-artifact@v2 with: From f629b4f47fa9195ee6bdc3ac325880181853eca2 Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Tue, 13 Apr 2021 15:06:12 +0100 Subject: [PATCH 6/7] Upload artifacts just after they are built. --- .github/workflows/release.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1adc853..bdf1e64 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,11 +67,18 @@ jobs: run: | ls dist/ + - uses: actions/upload-artifact@v2 + with: + path: | + ./dist/*.whl + ./dist/*.tar.gz + - name: Install Dependencies run: | pip install pyqt5 sudo apt-get install -y libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xinput0 libxcb-xfixes0 + - name: Install package env: MPLBACKEND: agg @@ -84,12 +91,6 @@ jobs: with: run: pytest --pyargs hyperspy_gui_traitsui - - uses: actions/upload-artifact@v2 - with: - path: | - ./dist/*.whl - ./dist/*.tar.gz - - name: Publish wheels to PyPI if: github.repository_owner == 'hyperspy' env: From c5bb97849027ee391fe1b93ce8befd6e58a81927 Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Tue, 13 Apr 2021 15:22:56 +0100 Subject: [PATCH 7/7] Set version back to dev (1.5.0.dev0) --- CHANGES.rst | 4 ++++ hyperspy_gui_traitsui/version.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 6b206be..e3732d4 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,10 @@ Add a single entry in the corresponding section below. See https://keepachangelog.com for details +1.5.0.dev0 (Unreleased) +----------------------- + + 1.4.0 ----- diff --git a/hyperspy_gui_traitsui/version.py b/hyperspy_gui_traitsui/version.py index e992399..b93562a 100644 --- a/hyperspy_gui_traitsui/version.py +++ b/hyperspy_gui_traitsui/version.py @@ -1 +1 @@ -__version__ = "1.4" +__version__ = "1.5.0.dev0"