Skip to content

Commit abdf883

Browse files
committed
Merge branch 'main' into release/0.9
2 parents 2882b44 + f016863 commit abdf883

File tree

4 files changed

+13
-34
lines changed

4 files changed

+13
-34
lines changed

.github/workflows/ci_cd.yml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,12 @@ jobs:
8484
os: [ubuntu-latest, windows-latest]
8585
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
8686
steps:
87-
- name: Install dependencies
88-
if: ${{ matrix.os == 'ubuntu-latest' }}
89-
run: |
90-
sudo apt-get update
91-
sudo apt-get install gobject-introspection
92-
sudo apt update
93-
sudo apt install python3-dev libgirepository1.0-dev libcairo2-dev gir1.2-secret-1 gnome-keyring
9487
- name: Build wheelhouse and perform smoke test
9588
uses: ansys/actions/build-wheelhouse@v8
9689
with:
9790
library-name: ${{ env.PACKAGE_NAME }}
9891
operating-system: ${{ matrix.os }}
9992
python-version: ${{ matrix.python-version }}
100-
whitelist-license-check: email_validator
10193

10294
tests:
10395
name: Tests and coverage
@@ -109,15 +101,6 @@ jobs:
109101
python-version: ["3.9","3.10","3.11", "3.12", "3.13"]
110102
fail-fast: false
111103
steps:
112-
- name: Install dependencies
113-
if: ${{ matrix.os == 'ubuntu-latest' }}
114-
run: |
115-
sudo apt-get update
116-
sudo apt-get install -y pandoc
117-
sudo apt-get install texlive-latex-extra texlive-xetex texlive-fonts-extra
118-
sudo apt-get install gobject-introspection
119-
sudo apt update
120-
sudo apt install python3-dev libgirepository1.0-dev libcairo2-dev gir1.2-secret-1 gnome-keyring
121104
- uses: ansys/actions/tests-pytest@v8
122105
env:
123106
CONCEPTEV_PASSWORD: ${{ secrets.CONCEPTEV_PASSWORD }}
@@ -145,14 +128,6 @@ jobs:
145128
runs-on: ubuntu-latest
146129
needs : [tests]
147130
steps:
148-
- name: Install dependencies
149-
run: |
150-
sudo apt-get update
151-
sudo apt-get install -y pandoc
152-
sudo apt-get install texlive-latex-extra texlive-xetex texlive-fonts-extra
153-
sudo apt-get install gobject-introspection
154-
sudo apt update
155-
sudo apt install python3-dev libgirepository1.0-dev libcairo2-dev gir1.2-secret-1 gnome-keyring
156131
- uses: ansys/actions/tests-pytest@v8
157132
env:
158133
PYCONCEPTEV_SETTINGS: "tests/config.toml"
@@ -172,9 +147,6 @@ jobs:
172147
sudo apt-get install -y pandoc
173148
sudo apt-get install texlive-latex-extra texlive-xetex texlive-fonts-extra
174149
sudo apt-get install gobject-introspection
175-
sudo apt update
176-
sudo apt install python3-dev libgirepository1.0-dev libcairo2-dev gir1.2-secret-1 gnome-keyring
177-
# sudo apt-get install libgl1-mesa-glx xvfb texlive-latex-extra latexmk graphviz texlive-xetex texlive-fonts-extra qpdf texlive-xetex xindy
178150
179151
- name: Verify Pandoc installation
180152
run: pandoc --version

doc/changelog.d/209.maintenance.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
208-make-optional-dependency

poetry.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@ msal-extensions = ">=1.2.0"
4141
tomli = {version = ">=2.0.1", python = "<3.11"}
4242
websockets = ">=13.0.1"
4343
async-timeout = { version = ">=4", python = "<3.11" }
44-
pandas = {extras = ["excel"], version = "^2.2.3"}
4544
pydantic-settings = "^2.7.1"
4645
email-validator = "^2.2.0"
47-
pygobject = {version = "<3.52.1", platform = "linux"}
4846
matplotlib = "~3.9"
4947
[tool.poetry.group.dev.dependencies] # Common packages for test and examples
5048
plotly = "^5.18.0"
@@ -74,11 +72,11 @@ sphinx-autodoc-typehints = "^2.1.1"
7472
sphinx-copybutton = "^0.5.1"
7573
sphinx-design = "^0.6.0"
7674
pypandoc-binary = "^1.13"
77-
78-
# Optional testing dependencies
7975
sphinx-gallery = ">=0.18,<0.20"
8076
matplotlib = "3.9.4"
81-
[tool.poetry.group.tests]
77+
pandas = {extras = ["excel"], version = "^2.2.3"}
78+
79+
[tool.poetry.group.tests] # Optional testing dependencies
8280
optional = true
8381

8482
[tool.poetry.group.tests.dependencies]
@@ -96,6 +94,14 @@ optional = true
9694
build = "^1.0.3"
9795
twine = ">=5,<7"
9896

97+
98+
99+
[tool.poetry.group.linux-encryption]
100+
optional = true
101+
102+
[tool.poetry.group.linux-encryption.dependencies]
103+
pygobject = {version = "<3.52.1", platform = "linux"}
104+
99105
[tool.black]
100106
line-length = 100
101107

0 commit comments

Comments
 (0)