diff --git a/.github/workflows/pythonpublish-linux.yml b/.github/workflows/pythonpublish-linux.yml index 62cc514..ce6ef74 100644 --- a/.github/workflows/pythonpublish-linux.yml +++ b/.github/workflows/pythonpublish-linux.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: python-version: ['cp38-cp38', 'cp39-cp39', 'cp310-cp310', 'cp311-cp311', 'cp312-cp312'] - pyside_ver: ['6.6.0'] + pyside_ver: ['6.6.1'] steps: - name: add Python and qt dir to path run: | diff --git a/.github/workflows/pythonpublish-osx.yml b/.github/workflows/pythonpublish-osx.yml index 5f00b8f..5ef39b9 100644 --- a/.github/workflows/pythonpublish-osx.yml +++ b/.github/workflows/pythonpublish-osx.yml @@ -12,7 +12,7 @@ jobs: max-parallel: 4 matrix: python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] - pyside_ver: ['6.6.0'] + pyside_ver: ['6.6.1'] name: Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v3 @@ -56,7 +56,7 @@ jobs: strategy: matrix: python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] - pyside_ver: ['6.6.0'] + pyside_ver: ['6.6.1'] runs-on: self-hosted steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/pythonpublish-win.yml b/.github/workflows/pythonpublish-win.yml index c24b51d..a274988 100644 --- a/.github/workflows/pythonpublish-win.yml +++ b/.github/workflows/pythonpublish-win.yml @@ -12,7 +12,7 @@ jobs: max-parallel: 4 matrix: python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] - pyside_ver: ['6.6.0'] + pyside_ver: ['6.6.1'] name: Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v3 diff --git a/SciQLopPlots/__init__.py b/SciQLopPlots/__init__.py index e844e7e..cf3cb61 100644 --- a/SciQLopPlots/__init__.py +++ b/SciQLopPlots/__init__.py @@ -2,4 +2,4 @@ from .SciQLopPlotsBindings import * from .SciQLopPlotsBindings import _QCustomPlot as QCustomPlot -__version__ = '0.6.0' +__version__ = '0.6.1' diff --git a/SciQLopPlots/meson.build b/SciQLopPlots/meson.build index bd17c57..723f93d 100644 --- a/SciQLopPlots/meson.build +++ b/SciQLopPlots/meson.build @@ -50,14 +50,14 @@ shiboken_dep = declare_dependency(compile_args: shiboken_build_flags, link_args: moc_headers = [ 'bindings/_QCustomPlot.hpp', - project_source_root+'/include/SciQLopPlots/SciQLopGraph.hpp', - project_source_root+'/include/SciQLopPlots/SciQLopColorMap.hpp', - project_source_root+'/include/SciQLopPlots/SciQLopVerticalSpan.hpp', - project_source_root+'/include/SciQLopPlots/SciQLopPlotItem.hpp', - project_source_root+'/include/SciQLopPlots/SciQLopPlot.hpp', - project_source_root+'/include/SciQLopPlots/SciQLopGraphResampler.hpp', - project_source_root+'/include/SciQLopPlots/SciQLopColorMapResampler.hpp', - project_source_root+'/qcustomplot-source/qcustomplot.h' + project_source_root + '/include/SciQLopPlots/SciQLopGraph.hpp', + project_source_root + '/include/SciQLopPlots/SciQLopColorMap.hpp', + project_source_root + '/include/SciQLopPlots/SciQLopVerticalSpan.hpp', + project_source_root + '/include/SciQLopPlots/SciQLopPlotItem.hpp', + project_source_root + '/include/SciQLopPlots/SciQLopPlot.hpp', + project_source_root + '/include/SciQLopPlots/SciQLopGraphResampler.hpp', + project_source_root + '/include/SciQLopPlots/SciQLopColorMapResampler.hpp', + project_source_root + '/qcustomplot-source/qcustomplot.h' ] moc_sources = [] @@ -76,9 +76,12 @@ moc_files = qtmod.preprocess( sources = moc_files \ + sciqlopplots_bindings_src \ + shiboken_generator_out \ - + [ '../src/SciQLopPlot.cpp', '../src/SciQLopPlotItem.cpp', - '../src/SciQLopVerticalSpan.cpp', '../src/SciQLopGraph.cpp', + + [ '../src/SciQLopPlot.cpp', + '../src/SciQLopPlotItem.cpp', + '../src/SciQLopVerticalSpan.cpp', + '../src/SciQLopGraph.cpp', '../src/SciQLopColorMap.cpp', + '../src/SciQLopColorMapResampler.cpp', '../src/BufferProtocol.cpp', '../qcustomplot-source/qcustomplot.cpp' ] diff --git a/meson.build b/meson.build index e954965..a519ff0 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('SciQLopPlots', 'cpp',default_options : ['cpp_std=c++17', 'buildtype=release'], license: 'GPL3', version: '0.6.0') +project('SciQLopPlots', 'cpp',default_options : ['cpp_std=c++17', 'buildtype=release'], license: 'GPL3', version: '0.6.1') add_project_arguments( '-DCATCH_CONFIG_NO_POSIX_SIGNALS', # workaround for this https://github.com/catchorg/Catch2/issues/2192 language: 'cpp', diff --git a/pyproject.toml b/pyproject.toml index afab2a5..a50c0f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,9 +5,9 @@ requires = [ "numpy", "meson-python>=0.14.0", "meson", - "shiboken6==6.6.0", - "pyside6==6.6.0", - "shiboken6_generator==6.6.0" + "shiboken6==6.6.1", + "pyside6==6.6.1", + "shiboken6_generator==6.6.1" ] build-backend = 'mesonpy' @@ -31,7 +31,7 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", ] -dependencies = ['numpy', 'pyside6==6.6.0', 'shiboken6==6.6.0'] +dependencies = ['numpy', 'pyside6==6.6.1', 'shiboken6==6.6.1'] dynamic = [ 'version', ] diff --git a/setup.cfg b/setup.cfg index abd35d2..d4dae11 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.6.0 +current_version = 0.6.1 commit = True tag = True