Skip to content

Commit

Permalink
Merge branch 'main' into feat/pyhps-support
Browse files Browse the repository at this point in the history
  • Loading branch information
germa89 authored Jun 26, 2024
2 parents 0279ffc + a0f7433 commit dd0cb4b
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 10 deletions.
7 changes: 4 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ updates:
day: "friday"
time: "00:00"
labels:
- "Maintenance"
- "Dependencies"
- "maintenance"
- "dependencies"
assignees:
- "ansys/pymapdl-maintainers"
commit-message:
Expand All @@ -48,7 +48,7 @@ updates:

core:
patterns:
- "*ansys*"
- "ansys*"
- "click"
- "matplotlib"
- "pexpect"
Expand All @@ -57,6 +57,7 @@ updates:
- "scipy"
- "tqdm"
- "vtk"
- "tabulate"

exclude-patterns:
- "ansys-api-mapdl"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -986,10 +986,11 @@ jobs:
test_julia:
name: "Test julia implementation"
runs-on: ${{ matrix.os }}
if: github.ref != 'refs/heads/main' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
strategy:
fail-fast: false
matrix:
julia-version: ['1.10.2'] # '1.6.7'
julia-version: ['1.10.3', '1.10.4']
os: [ubuntu-latest, windows-latest]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ repos:

# this validates our github workflow files
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.28.5
rev: 0.28.6
hooks:
- id: check-github-workflows
1 change: 1 addition & 0 deletions doc/changelog.d/3204.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ci: Fix missing labels format in dependabot file
1 change: 1 addition & 0 deletions doc/changelog.d/3206.miscellaneous.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ci: [pre-commit.ci] pre-commit autoupdate
1 change: 1 addition & 0 deletions doc/changelog.d/3211.changed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ci: Update julia testing
1 change: 1 addition & 0 deletions doc/changelog.d/3212.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump importlib-metadata from 7.2.0 to 7.2.1 in the minimal group
1 change: 1 addition & 0 deletions doc/changelog.d/3213.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump scipy from 1.13.1 to 1.14.0 in the core group
1 change: 1 addition & 0 deletions doc/changelog.d/3214.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump the documentation group with 2 updates
1 change: 1 addition & 0 deletions doc/changelog.d/3215.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump autopep8 from 2.3.0 to 2.3.1 in the testing group
2 changes: 1 addition & 1 deletion minimum_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ansys-api-mapdl==0.5.1
importlib-metadata==7.2.0
importlib-metadata==7.2.1
numpy==1.26.4
platformdirs==4.2.2
psutil==6.0.0
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ jupyter = [

tests = [
"ansys-dpf-core==0.10.1",
"autopep8==2.3.0",
"autopep8==2.3.1",
"matplotlib==3.9.0",
"scipy==1.13.1",
"scipy==1.14.0",
"pandas==2.2.2",
"pyiges[full]==0.3.1",
"pytest==8.2.2",
Expand All @@ -80,7 +80,7 @@ doc = [
"ansys-sphinx-theme==0.16.6",
"grpcio==1.64.1",
"imageio-ffmpeg==0.5.1",
"imageio==2.34.1",
"imageio==2.34.2",
"jupyter_sphinx==0.5.3",
"jupyterlab>=3.2.8",
"matplotlib==3.9.0",
Expand All @@ -100,7 +100,7 @@ doc = [
"sphinx-notfound-page==1.0.2",
"sphinxcontrib-websupport==1.2.7",
"sphinxemoji==0.3.1",
"sphinx-reredirects==0.1.3",
"sphinx-reredirects==0.1.4",
"vtk==9.3.0",
]

Expand Down

0 comments on commit dd0cb4b

Please sign in to comment.