search

ome / omero-web

Django-based OMERO.web client
https://www.openmicroscopy.org/omero
16 stars 29 forks source link

Removal of python-future compatibility code #531

Closed knabar closed 4 months ago

knabar commented 5 months ago

This PR implements issue #528 to review the OMERO.web source code to update all paths with either Python 2 or Python 2/3 logic to pure Python 3+, similar to @sbesson's work for OMERO.py at https://github.com/ome/omero-py/pull/390.

knabar commented 5 months ago

@sbesson I have gotten to the point where tests are now failing because the underlying omero-py is not Python 3.12 compatible, so we have to coordinate somehow

jburel commented 5 months ago

2edac67 broke today's installation of omero-server. It highlights an issue in the ci-build

sbesson commented 5 months ago

I think the issue is with 52c84a6dec8529c2c9df796efbd544f737ff9f14 rather than the tox.ini change which is unused by OME CI as far as I know. Here's the failing workflow as I understand it:

I suspect force pushing away 52c84a6dec8529c2c9df796efbd544f737ff9f14 should be sufficient to keep testing this PR through GitHub actions (as per the tox.ini workflow) and meet the requirement of the OME Jenkins pipeline.

jburel commented 5 months ago

I have now removed the excluded label since I found the issue in the CI job leading to the unexpected behaviour

jburel commented 5 months ago

Sorry yes, wrong cut and paste. Problem is sorted now note that this is not due to the misconfiguration of the JENKINS_URL

No need to force push the commit

jburel commented 5 months ago

The JENKINS_URL has been reviewed in https://github.com/ome/devspace/pull/212/commits/1859719ce12c7071925fc7ac763fae036f4a0d62

jburel commented 5 months ago

See https://github.com/ome/devspace/pull/212/commits/096b024b077a737522b7ea304b44dd5be6601466 for the adjustment (new CI) Similar changes made to merge-ci https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-server/402/

snoopycrimecop commented 5 months ago

Conflicting PR. Removed from build OMERO-python-superbuild-push#2. See the console output for more details. Possible conflicts:

--conflicts

snoopycrimecop commented 5 months ago

Conflicting PR. Removed from build OMERO-python-superbuild-push#452. See the console output for more details. Possible conflicts:

--conflicts

snoopycrimecop commented 4 months ago

Conflicting PR. Removed from build OMERO-python-superbuild-push#3. See the console output for more details. Possible conflicts:

--conflicts

snoopycrimecop commented 4 months ago

Conflicting PR. Removed from build OMERO-python-superbuild-push#453. See the console output for more details. Possible conflicts:

--conflicts

snoopycrimecop commented 4 months ago

Conflicting PR. Removed from build OMERO-python-superbuild-push#454. See the console output for more details. Possible conflicts:

--conflicts Conflict resolved in build OMERO-python-superbuild-push#4. See the console output for more details.

jburel commented 4 months ago

What is the reason for dropping Python 3.8 from the testing matrix?

knabar commented 4 months ago

What is the reason for dropping Python 3.8 from the testing matrix?

Just an oversight, I made a mistake undoing the removal.