Skip to content

Commit

Permalink
Merge pull request #746 from DIRACGridBot/cherry-pick-2-912e2ac0-inte…
Browse files Browse the repository at this point in the history
…gration

[sweep:integration] fix: python 3.11 as default
  • Loading branch information
fstagni authored Aug 24, 2023
2 parents c2c20d2 + 58ed550 commit 737ed93
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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)^(
Expand All @@ -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: |
Expand All @@ -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:
Expand All @@ -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"]
29 changes: 0 additions & 29 deletions environment.yml

This file was deleted.

2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 9 additions & 2 deletions src/WebAppDIRAC/WebApp/static/core/css/css.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion src/WebAppDIRAC/WebApp/static/core/css/tabtheme.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 4 additions & 1 deletion src/WebAppDIRAC/WebApp/static/core/js/utils/css/PlotView.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 737ed93

Please sign in to comment.