Skip to content

Commit c225c5d

Browse files
authored
Merge pull request #7136 from fstagni/80_fixes64
[8.0] use python 3.11 by default
2 parents 7c330d3 + 7cd5f18 commit c225c5d

File tree

10 files changed

+51
-10
lines changed

10 files changed

+51
-10
lines changed

.github/workflows/basic.yml

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- uses: actions/checkout@v3
1111
- uses: actions/setup-python@v2
1212
with:
13-
python-version: '3.9'
13+
python-version: '3.11'
1414
- name: Install pre-commit
1515
run: pip install pre-commit
1616
- name: Run pre-commit
@@ -40,7 +40,7 @@ jobs:
4040
- uses: actions/checkout@v3
4141
- uses: actions/setup-python@v2
4242
with:
43-
python-version: '3.9'
43+
python-version: '3.11'
4444
- name: Installing dependencies
4545
run: |
4646
python -m pip install pycodestyle
@@ -90,6 +90,45 @@ jobs:
9090
env:
9191
REFERENCE_BRANCH: ${{ github['base_ref'] || github['head_ref'] }}
9292

93+
check-py39:
94+
runs-on: ubuntu-latest
95+
if: github.event_name != 'push' || github.repository == 'DIRACGrid/DIRAC'
96+
timeout-minutes: 30
97+
defaults:
98+
# Activate the conda environment automatically in each step
99+
run:
100+
shell: bash -l {0}
101+
102+
strategy:
103+
fail-fast: False
104+
matrix:
105+
command:
106+
# TODO These three tests fail on Python 3:
107+
# * `test_BaseType_Unicode` and `test_nestedStructure` fail due to
108+
# DISET's string and unicode types being poorly defined
109+
- pytest --runslow -k 'not test_BaseType_Unicode and not test_nestedStructure'
110+
- pylint -j 0 -E src/
111+
112+
steps:
113+
- uses: actions/checkout@v3
114+
- name: Fail-fast for outdated pipelines
115+
run: .github/workflows/fail-fast.sh
116+
- name: fix python3.9
117+
run: |
118+
sed -i "s/python =3.11/python =3.9/g" environment.yml
119+
- uses: conda-incubator/setup-miniconda@master
120+
with:
121+
environment-file: environment.yml
122+
miniforge-variant: Mambaforge
123+
use-mamba: true
124+
- name: Run tests
125+
run: |
126+
# FIXME: The unit tests currently only work with editable installs
127+
pip install -e .[server,testing]
128+
${{ matrix.command }}
129+
env:
130+
REFERENCE_BRANCH: ${{ github['base_ref'] || github['head_ref'] }}
131+
93132
pylint-py27:
94133
name: Pylint for Python 2.7 in Pilot files
95134
runs-on: ubuntu-latest

.github/workflows/deployment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
git config --global user.name "DIRACGrid CI"
3131
- uses: actions/setup-python@v2
3232
with:
33-
python-version: '3.9'
33+
python-version: '3.11'
3434
- name: Installing dependencies
3535
run: |
3636
python -m pip install \

.github/workflows/integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
git fetch --prune --unshallow
4949
- uses: actions/setup-python@v2
5050
with:
51-
python-version: '3.9'
51+
python-version: '3.11'
5252
- name: Installing dependencies
5353
run: |
5454
python -m pip install \

.github/workflows/pilotWrapper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- 2.7.5
1515
- 2.7.13
1616
- 3.6.8
17-
- 3.9.4
17+
- 3.11.4
1818

1919
steps:
2020
- uses: actions/checkout@v3

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33

44
default_language_version:
5-
python: python3.9
5+
python: python3.11
66

77
exclude: |
88
(?x)^(

docs/docs.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ document_private_members = FCConditionsParser
2929
# whose docstrings are not reST formatted
3030
no_inherited_members =
3131
DIRAC.Core.Utilities.Graphs.GraphUtilities,
32-
DIRAC.DataManagementSystem.private.HttpStorageAccessHandler
32+
DIRAC.DataManagementSystem.private.HttpStorageAccessHandler,
33+
DIRAC.FrameworkSystem.private.standardLogging.LogLevels,
3334

3435
# only creating dummy files, because they cannot be safely imported due to sideEffects
3536
create_dummy_files = lfc_dfc_copy, lfc_dfc_db_copy, JobWrapperTemplate

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ channels:
88
dependencies:
99
# Temporary workarounds
1010
# runtime
11-
- python =3.9
11+
- python =3.11
1212
- pip
1313
- apache-libcloud
1414
- boto3

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ classifiers =
1616
Programming Language :: Python :: 3
1717
Programming Language :: Python :: 3.9
1818
Programming Language :: Python :: 3.10
19+
Programming Language :: Python :: 3.11
1920
Topic :: Scientific/Engineering
2021
Topic :: System :: Distributed Computing
2122

src/DIRAC/RequestManagementSystem/private/RequestValidator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def addValidator(cls, fcnObj):
139139
"""add `fcnObj` validator"""
140140
if not callable(fcnObj):
141141
return S_ERROR("supplied argument is not callable")
142-
args = inspect.getargspec(fcnObj).args
142+
args = inspect.getfullargspec(fcnObj).args
143143
if len(args) not in (1, 2):
144144
return S_ERROR("wrong number of arguments for supplied function object")
145145
cls.validator = cls.validator + tuple(

tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# - 2.7.x (x < 9)
1010
# - 2.7.x (x >= 9)
1111
# - 3.6.x
12-
# - 3.9.x
12+
# - 3.11.x
1313
#
1414
#
1515
# Invoke this with:

0 commit comments

Comments
 (0)