diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml index fd97d1fc5..a8b0e4b66 100644 --- a/.github/workflows/codestyle.yml +++ b/.github/workflows/codestyle.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.11" - name: Install pre-commit run: pip install pre-commit - name: Run pre-commit diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index d1bdb466d..50a8c7856 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -31,7 +31,7 @@ jobs: git clone https://github.com/DIRACGrid/DIRAC.git ../DIRAC - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.11" - name: Installing dependencies run: | python -m pip install \ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c5678b497..0ab2524d1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ # See https://pre-commit.com/hooks.html for more hooks default_language_version: - python: python3.9 + python: python3.11 exclude: | (?x)^( @@ -19,12 +19,12 @@ repos: - id: check-added-large-files - repo: https://github.com/psf/black - rev: 23.1.0 + rev: 23.7.0 hooks: - id: black - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0-alpha.4 + rev: v3.0.1 hooks: - id: prettier exclude: | @@ -33,7 +33,7 @@ repos: )$ - repo: https://github.com/pre-commit/mirrors-eslint - rev: v8.34.0 + rev: v8.47.0 hooks: - id: eslint additional_dependencies: @@ -46,7 +46,7 @@ repos: - id: flynt - repo: https://github.com/asottile/pyupgrade - rev: v3.3.1 + rev: v3.10.1 hooks: - id: pyupgrade - args: ["--py39-plus"] + args: ["--py311-plus"] diff --git a/environment.yml b/environment.yml deleted file mode 100644 index 29cd8aabd..000000000 --- a/environment.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: dirac-web-development - -channels: - - conda-forge - -dependencies: - # runtime - - python =2.7 - - pip - - certifi - # testing and development - - autopep8 - - caniusepython3 - - coverage - - hypothesis - - ipython - - mock - - parameterized - - pylint >=1.6.5 - - pyparsing >=2.0.6 - - pytest >=3.6 - - pytest-cov >=2.2.0 - - pytest-mock - - shellcheck - - diraccfg - # - readline >=6.2.4 in the standard library - - simplejson >=3.8.1 - - tornado >=5.0.0,<6.0.0 - - typing >=3.6.6 diff --git a/setup.cfg b/setup.cfg index dbe3bea3c..a4266c067 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,6 +15,8 @@ classifiers = License :: OSI Approved :: GNU General Public License v3 (GPLv3) Programming Language :: Python :: 3 Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 Topic :: Scientific/Engineering Topic :: System :: Distributed Computing diff --git a/src/WebAppDIRAC/WebApp/static/core/css/css.css b/src/WebAppDIRAC/WebApp/static/core/css/css.css index 1107a167a..4a3a5078b 100755 --- a/src/WebAppDIRAC/WebApp/static/core/css/css.css +++ b/src/WebAppDIRAC/WebApp/static/core/css/css.css @@ -23,7 +23,10 @@ #app-dirac-loading .app-dirac-loading-indicator { background: none; color: #444; - font: bold 13px Helvetica, Arial, sans-serif; + font: + bold 13px Helvetica, + Arial, + sans-serif; height: auto; margin: 0; padding: 10px; @@ -230,7 +233,11 @@ } .ux-desktop-shortcut-text { - font: normal 10px tahoma, arial, verdana, sans-serif; + font: + normal 10px tahoma, + arial, + verdana, + sans-serif; text-decoration: none; padding-top: 5px; color: white; diff --git a/src/WebAppDIRAC/WebApp/static/core/css/tabtheme.css b/src/WebAppDIRAC/WebApp/static/core/css/tabtheme.css index 40e36e927..e1b0dcc15 100644 --- a/src/WebAppDIRAC/WebApp/static/core/css/tabtheme.css +++ b/src/WebAppDIRAC/WebApp/static/core/css/tabtheme.css @@ -59,7 +59,9 @@ pre { @font-face { font-family: "Pictos"; src: url("../pictos/pictos.eot"); - src: url("../pictos/pictos.eot?#iefix") format("embedded-opentype"), url("../pictos/pictos.woff") format("woff"), + src: + url("../pictos/pictos.eot?#iefix") format("embedded-opentype"), + url("../pictos/pictos.woff") format("woff"), url("../pictos/pictos.ttf") format("truetype"); font-weight: normal; font-style: normal; diff --git a/src/WebAppDIRAC/WebApp/static/core/js/utils/css/PlotView.css b/src/WebAppDIRAC/WebApp/static/core/js/utils/css/PlotView.css index d2a4b852f..82220fed4 100644 --- a/src/WebAppDIRAC/WebApp/static/core/js/utils/css/PlotView.css +++ b/src/WebAppDIRAC/WebApp/static/core/js/utils/css/PlotView.css @@ -59,7 +59,10 @@ #images-view .x-panel-body { background: white; - font: 11px Arial, Helvetica, sans-serif; + font: + 11px Arial, + Helvetica, + sans-serif; } #images-view .thumb { background: #dddddd;