Skip to content
Snippets Groups Projects
Commit c3b22def authored by Simon Bjurek's avatar Simon Bjurek
Browse files

Removed requirement txt files and added optional dependencies instead. Also...

Removed requirement txt files and added optional dependencies instead. Also updated CI-file accordingly.
parent 5f47ec2c
No related branches found
No related tags found
1 merge request!463Removed requirement txt files and added optional dependencies instead.
Pipeline #155563 passed
This commit is part of merge request !463. Comments created here will be created in the context of that merge request.
...@@ -9,8 +9,7 @@ before_script: ...@@ -9,8 +9,7 @@ before_script:
- apt-get install -y libxcb-cursor-dev - apt-get install -y libxcb-cursor-dev
- python -m pip install --upgrade pip - python -m pip install --upgrade pip
- python --version - python --version
- pip install -r requirements.txt - pip install .[$QT_API]
- pip install $QT_API
- git fetch --tags - git fetch --tags
# - export CXXFLAGS='--coverage' # - export CXXFLAGS='--coverage'
# Install without dependencies to make sure that requirements.txt is up-to-date # Install without dependencies to make sure that requirements.txt is up-to-date
...@@ -18,7 +17,7 @@ before_script: ...@@ -18,7 +17,7 @@ before_script:
- pip show b_asic - pip show b_asic
- export QT_API=$QT_API - export QT_API=$QT_API
# Install test dependencies # Install test dependencies
- pip install -r requirements_test.txt - pip install .[test]
- export PYTEST_QT_API=$QT_API - export PYTEST_QT_API=$QT_API
.run-test: .run-test:
...@@ -90,7 +89,7 @@ run-doc-test: ...@@ -90,7 +89,7 @@ run-doc-test:
image: python:3.10 image: python:3.10
stage: test stage: test
script: script:
- pip install -r requirements_doc.txt - pip install .[doc]
- sphinx-build -b html docs_sphinx public - sphinx-build -b html docs_sphinx public
# Run linting on doc-strings # Run linting on doc-strings
- pip install black velin - pip install black velin
...@@ -110,7 +109,7 @@ pages: ...@@ -110,7 +109,7 @@ pages:
image: python:3.10 image: python:3.10
script: script:
- apt-get install --yes optipng - apt-get install --yes optipng
- pip install -r requirements_doc.txt - pip install .[doc]
- sphinx-build -b html docs_sphinx public - sphinx-build -b html docs_sphinx public
artifacts: artifacts:
paths: paths:
......
...@@ -33,6 +33,22 @@ dynamic = ["version", "authors"] ...@@ -33,6 +33,22 @@ dynamic = ["version", "authors"]
[project.optional-dependencies] [project.optional-dependencies]
pyqt6 = ["pyqt6"] pyqt6 = ["pyqt6"]
pyside6 = ["pyside6"] pyside6 = ["pyside6"]
test = [
"pytest",
"pytest-cov",
"pytest-qt",
"pytest-timeout",
"pytest-xvfb",
"pytest-xdist",
]
doc = [
"sphinx",
"furo",
"numpydoc",
"sphinx-gallery",
"mplsignal",
"sphinx-copybutton",
]
[tool.setuptools] [tool.setuptools]
zip-safe = false zip-safe = false
......
sphinx
furo
numpydoc
sphinx-gallery
mplsignal
sphinx-copybutton
pytest
pytest-cov
pytest-qt
pytest-timeout
pytest-xvfb
pytest-xdist
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment