Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cybersecurity #2403

Merged
merged 1 commit into from
Jan 29, 2025
Merged

cybersecurity #2403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/pyFAI/app/benchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# https://github.com/silx-kit/pyFAI
#
#
# Copyright (C) 2012-2023 European Synchrotron Radiation Facility, Grenoble, France
# Copyright (C) 2012-2025 European Synchrotron Radiation Facility, Grenoble, France
#
# Authors: Jérôme Kieffer <[email protected]>
#
Expand All @@ -32,7 +32,7 @@
__contact__ = "[email protected]"
__license__ = "MIT"
__copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
__date__ = "08/11/2024"
__date__ = "29/01/2025"
__status__ = "development"

from argparse import ArgumentParser
Expand All @@ -47,12 +47,6 @@
import hdf5plugin # noqa
except ImportError:
logger.debug("Unable to load hdf5plugin, backtrace:", exc_info=True)

try:
from rfoo.utils import rconsole
rconsole.spawn_server()
except ImportError:
logger.debug("No socket opened for debugging. Please install rfoo")
from .. import benchmark, version as pyFAI_version, date as pyFAI_date, logger as pyFAI_logger


Expand Down
10 changes: 2 additions & 8 deletions src/pyFAI/app/calib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Project: Azimuthal integration
# https://github.com/silx-kit/pyFAI
#
# Copyright (C) 2012-2018 European Synchrotron Radiation Facility, Grenoble, France
# Copyright (C) 2012-2025 European Synchrotron Radiation Facility, Grenoble, France
#
# Principal author: Jérôme Kieffer ([email protected])
#
Expand Down Expand Up @@ -32,7 +32,7 @@
__contact__ = "[email protected]"
__license__ = "MIT"
__copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
__date__ = "27/09/2024"
__date__ = "29/01/2025"
__satus__ = "development"

import logging
Expand All @@ -43,13 +43,7 @@
import hdf5plugin # noqa
except ImportError:
logger.debug("Unable to load hdf5plugin, backtrace:", exc_info=True)

from ..gui.cli_calibration import Calibration
try:
from rfoo.utils import rconsole
rconsole.spawn_server()
except ImportError:
logger.debug("No socket opened for debugging. Please install rfoo")


def main(args=None):
Expand Down
11 changes: 2 additions & 9 deletions src/pyFAI/app/calib2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Project: Azimuthal integration
# https://github.com/silx-kit/pyFAI
#
# Copyright (C) 2017-2024 European Synchrotron Radiation Facility, Grenoble, France
# Copyright (C) 2017-2025 European Synchrotron Radiation Facility, Grenoble, France
#
# Principal author: Jérôme Kieffer ([email protected])
#
Expand All @@ -28,7 +28,7 @@
__contact__ = "[email protected]"
__license__ = "MIT"
__copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
__date__ = "19/03/2024"
__date__ = "29/01/2025"
__status__ = "production"

import os
Expand All @@ -46,19 +46,12 @@
logger.debug("Unable to load hdf5plugin, backtrace:", exc_info=True)

logger_uncaught = logging.getLogger("pyFAI-calib2.UNCAUGHT")

import pyFAI.resources
import pyFAI.calibrant
import pyFAI.detectors
import pyFAI.io.image
from pyFAI.io.ponifile import PoniFile

try:
from rfoo.utils import rconsole
rconsole.spawn_server()
except ImportError:
logger.debug("No socket opened for debugging. Please install rfoo")


def configure_parser_arguments(parser):
# From AbstractCalibration
Expand Down
13 changes: 2 additions & 11 deletions src/pyFAI/app/integrate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# https://github.com/silx-kit/pyFAI
#
#
# Copyright (C) 2013-2022 European Synchrotron Radiation Facility, Grenoble, France
# Copyright (C) 2013-2025 European Synchrotron Radiation Facility, Grenoble, France
#
# Principal author: Jérôme Kieffer ([email protected])
#
Expand Down Expand Up @@ -33,7 +33,7 @@
__contact__ = "[email protected]"
__license__ = "MIT"
__copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
__date__ = "27/09/2024"
__date__ = "29/01/2025"
__satus__ = "production"

import sys
Expand All @@ -51,22 +51,13 @@
import hdf5plugin # noqa
except ImportError:
logger.debug("Unable to load hdf5plugin, backtrace:", exc_info=True)

import fabio

from .. import utils, worker, io, version as pyFAI_version, date as pyFAI_date
from ..io import DefaultAiWriter, HDF5Writer
from ..utils.shell import ProgressBar
from ..utils import logging_utils, header_utils
from ..worker import Worker

try:
from rfoo.utils import rconsole
rconsole.spawn_server()
logger.debug("Socket opened for debugging using rfoo")
except ImportError:
logger.debug("No socket opened for debugging -> please install rfoo")


def integrate_gui(options, args):
from silx.gui import qt
Expand Down
10 changes: 2 additions & 8 deletions src/pyFAI/app/mx_calibrate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Project: Azimuthal integration
# https://github.com/silx-kit/pyFAI
#
# Copyright (C) 2013-2018 European Synchrotron Radiation Facility, Grenoble, France
# Copyright (C) 2013-2025 European Synchrotron Radiation Facility, Grenoble, France
#
# Principal author: Jérôme Kieffer ([email protected])
#
Expand Down Expand Up @@ -32,7 +32,7 @@
__contact__ = "[email protected]"
__license__ = "MIT"
__copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
__date__ = "27/09/2024"
__date__ = "29/01/2025"
__satus__ = "development"

import logging
Expand All @@ -46,12 +46,6 @@

from ..gui.cli_calibration import MultiCalib

try:
from rfoo.utils import rconsole
rconsole.spawn_server()
except ImportError:
logger.debug("No socket opened for debugging. Please install rfoo")


def main(args=None):
c = MultiCalib()
Expand Down
9 changes: 2 additions & 7 deletions src/pyFAI/app/recalib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Project: Azimuthal integration
# https://github.com/silx-kit/pyFAI
#
# Copyright (C) 2012-2018 European Synchrotron Radiation Facility, Grenoble, France
# Copyright (C) 2012-2025 European Synchrotron Radiation Facility, Grenoble, France
#
# Principal author: Jérôme Kieffer ([email protected])
#
Expand Down Expand Up @@ -32,7 +32,7 @@
__contact__ = "[email protected]"
__license__ = "MIT"
__copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
__date__ = "27/09/2024"
__date__ = "29/01/2024"
__satus__ = "development"

import logging
Expand All @@ -45,11 +45,6 @@
logger.debug("Unable to load hdf5plugin, backtrace:", exc_info=True)

from ..gui.cli_calibration import Recalibration
try:
from rfoo.utils import rconsole
rconsole.spawn_server()
except ImportError:
logger.debug("No socket opened for debugging -> install rfoo")


def main(args=None):
Expand Down