Skip to content

Commit

Permalink
Merge branch 'dev' into extend_floorplot
Browse files Browse the repository at this point in the history
  • Loading branch information
eltos authored Jan 25, 2025
2 parents 03db083 + 899a45e commit ff245b2
Show file tree
Hide file tree
Showing 10 changed files with 98 additions and 98 deletions.
44 changes: 22 additions & 22 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,25 +55,25 @@ jobs:
with:
extra_args: --all-files --hook-stage=manual

versioning:
if: ${{ github.ref_type == 'branch' && github.ref_name != 'main'}}
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- run: |
# Determine version
pip install -e .
VERSION=$(python3 -c "from xplt import __version__;print('v' + __version__)")
echo "Xplt version: $VERSION"
# Ensure it is unique
TAG=$(git tag -l $VERSION)
echo "Matching git tag: $TAG"
if [[ $TAG ]]; then
echo "Version is not unique. Please update it in 'xplt/__init__.py'"
exit 1
fi
# versioning:
# if: ${{ github.ref_type == 'branch' && github.ref_name != 'main'}}
# runs-on: ubuntu-24.04
# steps:
# - uses: actions/checkout@v4
# with:
# fetch-depth: 0
# - uses: actions/setup-python@v5
# with:
# python-version: '3.12'
# - run: |
# # Determine version
# pip install -e .
# VERSION=$(python3 -c "from xplt import __version__;print('v' + __version__)")
# echo "Xplt version: $VERSION"
# # Ensure it is unique
# TAG=$(git tag -l $VERSION)
# echo "Matching git tag: $TAG"
# if [[ $TAG ]]; then
# echo "Version is not unique. Please update it in 'xplt/__init__.py'"
# exit 1
# fi
20 changes: 10 additions & 10 deletions requirements/docs-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ defusedxml==0.7.1
dict2css==0.3.0.post1
docutils==0.21.2
domdf-python-tools==3.9.0
executing==2.1.0
executing==2.2.0
fastjsonschema==2.21.1
filelock==3.16.1
filelock==3.17.0
flexcache==0.3
flexparser==0.4
fonttools==4.55.3
fonttools==4.55.5
fqdn==1.5.1
greenlet==3.1.1
h11==0.14.0
Expand All @@ -50,7 +50,7 @@ httpcore==1.0.7
httpx==0.28.1
idna==3.10
imagesize==1.4.1
importlib-metadata==8.5.0
importlib-metadata==8.6.1
ipykernel==6.29.5
ipython==8.31.0
isoduration==20.11.0
Expand Down Expand Up @@ -101,7 +101,7 @@ pint==0.24.4
platformdirs==4.3.6
pockets==0.9.1
prometheus-client==0.21.1
prompt-toolkit==3.0.49
prompt-toolkit==3.0.50
psutil==6.1.1
ptyprocess==0.7.0
pure-eval==0.2.3
Expand Down Expand Up @@ -153,7 +153,7 @@ tqdm==4.67.1
traitlets==5.14.3
types-python-dateutil==2.9.0.20241206
typing-extensions==4.12.2
tzdata==2024.2
tzdata==2025.1
uri-template==1.3.0
urllib3==2.3.0
wcwidth==0.2.13
Expand All @@ -162,11 +162,11 @@ webencodings==0.5.1
websocket-client==1.8.0
xcoll==0.5.12
xdeps==0.9.0
xfields==0.21.5
xfields==0.22.0
xobjects==0.4.6
xpart==0.19.4
xsuite==0.20.0
xtrack==0.73.0
xpart==0.19.6
xsuite==0.20.2
xtrack==0.73.2
zipp==3.21.0

# The following packages are considered to be unsafe in a requirements file:
Expand Down
16 changes: 8 additions & 8 deletions requirements/examples-requirements-py3.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ debugpy==1.8.12
decorator==5.1.1
defusedxml==0.7.1
exceptiongroup==1.2.2
executing==2.1.0
executing==2.2.0
fastjsonschema==2.21.1
flexcache==0.3
flexparser==0.4
fonttools==4.55.3
fonttools==4.55.5
fqdn==1.5.1
h11==0.14.0
httpcore==1.0.7
Expand Down Expand Up @@ -75,7 +75,7 @@ pillow==11.1.0
pint==0.24.4
platformdirs==4.3.6
prometheus-client==0.21.1
prompt-toolkit==3.0.49
prompt-toolkit==3.0.50
psutil==6.1.1
ptyprocess==0.7.0
pure-eval==0.2.3
Expand Down Expand Up @@ -107,7 +107,7 @@ tqdm==4.67.1
traitlets==5.14.3
types-python-dateutil==2.9.0.20241206
typing-extensions==4.12.2
tzdata==2024.2
tzdata==2025.1
uri-template==1.3.0
urllib3==2.3.0
wcwidth==0.2.13
Expand All @@ -116,11 +116,11 @@ webencodings==0.5.1
websocket-client==1.8.0
xcoll==0.5.12
xdeps==0.9.0
xfields==0.21.5
xfields==0.22.0
xobjects==0.4.6
xpart==0.19.4
xsuite==0.20.0
xtrack==0.73.0
xpart==0.19.6
xsuite==0.20.2
xtrack==0.73.2

# The following packages are considered to be unsafe in a requirements file:
# setuptools
16 changes: 8 additions & 8 deletions requirements/examples-requirements-py3.11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ cython==3.0.11
debugpy==1.8.12
decorator==5.1.1
defusedxml==0.7.1
executing==2.1.0
executing==2.2.0
fastjsonschema==2.21.1
flexcache==0.3
flexparser==0.4
fonttools==4.55.3
fonttools==4.55.5
fqdn==1.5.1
h11==0.14.0
httpcore==1.0.7
Expand Down Expand Up @@ -74,7 +74,7 @@ pillow==11.1.0
pint==0.24.4
platformdirs==4.3.6
prometheus-client==0.21.1
prompt-toolkit==3.0.49
prompt-toolkit==3.0.50
psutil==6.1.1
ptyprocess==0.7.0
pure-eval==0.2.3
Expand Down Expand Up @@ -105,7 +105,7 @@ tqdm==4.67.1
traitlets==5.14.3
types-python-dateutil==2.9.0.20241206
typing-extensions==4.12.2
tzdata==2024.2
tzdata==2025.1
uri-template==1.3.0
urllib3==2.3.0
wcwidth==0.2.13
Expand All @@ -114,11 +114,11 @@ webencodings==0.5.1
websocket-client==1.8.0
xcoll==0.5.12
xdeps==0.9.0
xfields==0.21.5
xfields==0.22.0
xobjects==0.4.6
xpart==0.19.4
xsuite==0.20.0
xtrack==0.73.0
xpart==0.19.6
xsuite==0.20.2
xtrack==0.73.2

# The following packages are considered to be unsafe in a requirements file:
# setuptools
16 changes: 8 additions & 8 deletions requirements/examples-requirements-py3.12.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ cython==3.0.11
debugpy==1.8.12
decorator==5.1.1
defusedxml==0.7.1
executing==2.1.0
executing==2.2.0
fastjsonschema==2.21.1
flexcache==0.3
flexparser==0.4
fonttools==4.55.3
fonttools==4.55.5
fqdn==1.5.1
h11==0.14.0
httpcore==1.0.7
Expand Down Expand Up @@ -74,7 +74,7 @@ pillow==11.1.0
pint==0.24.4
platformdirs==4.3.6
prometheus-client==0.21.1
prompt-toolkit==3.0.49
prompt-toolkit==3.0.50
psutil==6.1.1
ptyprocess==0.7.0
pure-eval==0.2.3
Expand Down Expand Up @@ -105,7 +105,7 @@ tqdm==4.67.1
traitlets==5.14.3
types-python-dateutil==2.9.0.20241206
typing-extensions==4.12.2
tzdata==2024.2
tzdata==2025.1
uri-template==1.3.0
urllib3==2.3.0
wcwidth==0.2.13
Expand All @@ -114,11 +114,11 @@ webencodings==0.5.1
websocket-client==1.8.0
xcoll==0.5.12
xdeps==0.9.0
xfields==0.21.5
xfields==0.22.0
xobjects==0.4.6
xpart==0.19.4
xsuite==0.20.0
xtrack==0.73.0
xpart==0.19.6
xsuite==0.20.2
xtrack==0.73.2

# The following packages are considered to be unsafe in a requirements file:
# setuptools
18 changes: 9 additions & 9 deletions requirements/examples-requirements-py3.9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ debugpy==1.8.12
decorator==5.1.1
defusedxml==0.7.1
exceptiongroup==1.2.2
executing==2.1.0
executing==2.2.0
fastjsonschema==2.21.1
flexcache==0.3
flexparser==0.4
fonttools==4.55.3
fonttools==4.55.5
fqdn==1.5.1
h11==0.14.0
httpcore==1.0.7
httpx==0.28.1
idna==3.10
importlib-metadata==8.5.0
importlib-metadata==8.6.1
importlib-resources==6.5.2
ipykernel==6.29.5
ipython==8.18.1
Expand Down Expand Up @@ -77,7 +77,7 @@ pillow==11.1.0
pint==0.24.4
platformdirs==4.3.6
prometheus-client==0.21.1
prompt-toolkit==3.0.49
prompt-toolkit==3.0.50
psutil==6.1.1
ptyprocess==0.7.0
pure-eval==0.2.3
Expand Down Expand Up @@ -109,7 +109,7 @@ tqdm==4.67.1
traitlets==5.14.3
types-python-dateutil==2.9.0.20241206
typing-extensions==4.12.2
tzdata==2024.2
tzdata==2025.1
uri-template==1.3.0
urllib3==2.3.0
wcwidth==0.2.13
Expand All @@ -118,11 +118,11 @@ webencodings==0.5.1
websocket-client==1.8.0
xcoll==0.5.12
xdeps==0.9.0
xfields==0.21.5
xfields==0.22.0
xobjects==0.4.6
xpart==0.19.4
xsuite==0.20.0
xtrack==0.73.0
xpart==0.19.6
xsuite==0.20.2
xtrack==0.73.2
zipp==3.21.0

# The following packages are considered to be unsafe in a requirements file:
Expand Down
16 changes: 8 additions & 8 deletions requirements/tests-requirements-py3.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ debugpy==1.8.12
decorator==5.1.1
defusedxml==0.7.1
exceptiongroup==1.2.2
executing==2.1.0
executing==2.2.0
fastjsonschema==2.21.1
flexcache==0.3
flexparser==0.4
fonttools==4.55.3
fonttools==4.55.5
fqdn==1.5.1
h11==0.14.0
httpcore==1.0.7
Expand Down Expand Up @@ -78,7 +78,7 @@ pint==0.24.4
platformdirs==4.3.6
pluggy==1.5.0
prometheus-client==0.21.1
prompt-toolkit==3.0.49
prompt-toolkit==3.0.50
psutil==6.1.1
ptyprocess==0.7.0
pure-eval==0.2.3
Expand Down Expand Up @@ -115,7 +115,7 @@ tqdm==4.67.1
traitlets==5.14.3
types-python-dateutil==2.9.0.20241206
typing-extensions==4.12.2
tzdata==2024.2
tzdata==2025.1
uri-template==1.3.0
urllib3==2.3.0
wcwidth==0.2.13
Expand All @@ -124,11 +124,11 @@ webencodings==0.5.1
websocket-client==1.8.0
xcoll==0.5.12
xdeps==0.9.0
xfields==0.21.5
xfields==0.22.0
xobjects==0.4.6
xpart==0.19.4
xsuite==0.20.0
xtrack==0.73.0
xpart==0.19.6
xsuite==0.20.2
xtrack==0.73.2

# The following packages are considered to be unsafe in a requirements file:
# setuptools
Loading

0 comments on commit ff245b2

Please sign in to comment.