From 0649e70fae6535a9d7ee36c166b7f3e7a1df2f11 Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Tue, 31 Jan 2023 09:45:31 +0100
Subject: [PATCH] Add testing with Python 3.11
---
.gitlab-ci.yml | 20 +++++++++++++++-----
dependencies/fmt/CMakeLists.txt | 2 +-
dependencies/pybind11/CMakeLists.txt | 2 +-
pyproject.toml | 2 +-
src/simulation.hpp | 2 +-
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c1b5250..adb43994 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,7 +71,21 @@ run-test-3.10-pyqt5:
image: python:3.10
extends: ".run-test"
-# Seemingly works with Qt6, but tests stall on closing scheduler GUI due to modal dialog(?)
+run-test-3.11-pyside2:
+ variables:
+ QT_API: pyside2
+ image: python:3.11
+ extends: ".run-test"
+ # Does not work for this combination for unknown reasons
+ allow_failure: true
+
+run-test-3.11-pyqt5:
+ variables:
+ QT_API: pyqt5
+ image: python:3.11
+ extends: ".run-test"
+
+ # Seemingly works with Qt6, but tests stall on closing scheduler GUI due to modal dialog(?)
#run-test-3.10-pyside6:
# variables:
# QT_API: pyside6
@@ -94,10 +108,6 @@ run-doc-test:
script:
- sphinx-build -b html docs_sphinx public
-#run-test-3.11:
-# image: python:3.11
-# extends: ".run-test"
-
pages:
variables:
QT_API: pyqt5
diff --git a/dependencies/fmt/CMakeLists.txt b/dependencies/fmt/CMakeLists.txt
index fda9e099..68221648 100644
--- a/dependencies/fmt/CMakeLists.txt
+++ b/dependencies/fmt/CMakeLists.txt
@@ -2,7 +2,7 @@ message(STATUS "Fetching fmt...")
FetchContent_Declare(fmt
GIT_REPOSITORY https://github.com/fmtlib/fmt
- GIT_TAG d141cdbeb0fb422a3fb7173b285fd38e0d1772dc # 8.0.1
+ GIT_TAG 9.1.0
)
FetchContent_MakeAvailable(fmt)
diff --git a/dependencies/pybind11/CMakeLists.txt b/dependencies/pybind11/CMakeLists.txt
index dea520bc..0d1b685b 100644
--- a/dependencies/pybind11/CMakeLists.txt
+++ b/dependencies/pybind11/CMakeLists.txt
@@ -2,6 +2,6 @@ message(STATUS "Fetching pybind11...")
FetchContent_Declare(pybind11
GIT_REPOSITORY https://github.com/pybind/pybind11
- GIT_TAG f7b499615e14d70ab098a20deb0cdb3889998a1a # 2.8.1
+ GIT_TAG v2.10.3
)
FetchContent_MakeAvailable(pybind11)
diff --git a/pyproject.toml b/pyproject.toml
index 261237dc..a574167f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
-# "Programming Language :: Python :: 3.11",
+ "Programming Language :: Python :: 3.11",
"Programming Language :: C++",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
diff --git a/src/simulation.hpp b/src/simulation.hpp
index 5e7ab381..5d3401fc 100644
--- a/src/simulation.hpp
+++ b/src/simulation.hpp
@@ -1,7 +1,7 @@
#ifndef ASIC_SIMULATION_HPP
#define ASIC_SIMULATION_HPP
-#define NOMINMAX
+// #define NOMINMAX
#include <pybind11/pybind11.h>
namespace asic {
--
GitLab