Merge master into branch

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**System**
+ - OS: [e.g. iOS]
+ - Version [e.g. 22]
+ - SCIP version
+ - How did you install `pyscipopt`?
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/coverage.yml

@@ -2,12 +2,13 @@ name: Run tests with coverage
 env:
   version: 8.0.3
 
-# runs on branches and pull requests; doesn't run on tags.
 on:
   push:
     branches:
-      master
+      - 'master'
   pull_request:
+    branches:
+      - 'master'
 
 jobs:
 

.github/workflows/integration-test.yml

@@ -7,8 +7,7 @@ env:
 on:
   push:
     branches:
-      - master
-  pull_request:
+      - 'master'
 
 jobs:
 

CHANGELOG.md

@@ -2,19 +2,30 @@
 
 ## Unreleased
 ### Added
-- Add SCIP functions SCIPconsGetNVars, SCIPconsGetVars
-- Add SCIP functions SCIPchgCoefLinear, SCIPaddCoefLinear and SCIPdelCoefLinear
-- Add SCIP function SCIPgetSolTime and wrapper getSolTime
-- Add convenience methods relax and getVarDict
-- Add SCIP functions hasPrimalRay, getPrimalRay, getPrimalRayVal
+- Add getConshdlrName to class Constraint
 ### Fixed
+### Changed
+### Removed
+
+## 4.4.0 - 2023-12-04
+### Added
+- Added all event types and tests for checking them 
+- Added SCIP functions SCIPconsGetNVars, SCIPconsGetVars
+- Added SCIP functions SCIPchgCoefLinear, SCIPaddCoefLinear and SCIPdelCoefLinear
+- Added SCIP function SCIPgetSolTime and wrapper getSolTime
+- Added convenience methods relax and getVarDict
+- Added SCIP functions hasPrimalRay, getPrimalRay, getPrimalRayVal
+### Fixed
+- Fixed mistake with outdated values for several enums
+- Correctly set result, lowerbound in PyRelaxExec
 - Fixed typo in documentation of chgRhs
 - Pricer plugin fundamental callbacks now raise an error if not implemented
 - Brachrule plugin fundamental callbacks now raise an error if not implemented
 - Fixed segmentation fault when accessing the Solution class directly
 - Changed getSols so that it prints solutions in terms of the original variables
 - Fixed error message in _checkStage
 ### Changed
+- Made it so SCIP macros are used directly, instead of being manually inputted. 
 - Improved error message when using < or > instead of <= or >=
 ### Removed
 - Removed double declaration of SCIPfindEventhdlr

src/pyscipopt/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '4.3.0'
+__version__ = '4.4.0'
 
 # required for Python 3.8 on Windows
 import os

src/pyscipopt/relax.pxi

@@ -28,7 +28,7 @@ cdef class Relax:
         '''callls execution method of relaxation handler'''
         print("python error in relaxexec: this method needs to be implemented")
         return{}
-
+        
 
 cdef SCIP_RETCODE PyRelaxCopy (SCIP* scip, SCIP_RELAX* relax) with gil:
     return SCIP_OKAY
@@ -73,6 +73,8 @@ cdef SCIP_RETCODE PyRelaxExec (SCIP* scip, SCIP_RELAX* relax, SCIP_Real* lowerbo
     cdef SCIP_RELAXDATA* relaxdata
     relaxdata = SCIPrelaxGetData(relax)
     PyRelax = <Relax>relaxdata
-    PyRelax.relaxexec()
-    return SCIP_OKAY
-
+    result_dict = PyRelax.relaxexec()
+    assert isinstance(result_dict, dict), "relaxexec() must return a dictionary."
+    lowerbound[0] = result_dict.get("lowerbound", <SCIP_Real>lowerbound[0])
+    result[0] = result_dict.get("result", <SCIP_RESULT>result[0])
+    return SCIP_OKAY