From 2f34d766793a160c7a356417e79942eed9f267fe Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Tue, 26 Nov 2024 09:30:15 +0100
Subject: [PATCH] MAINT: Pipeline cleanup.
---
.gitlab-ci.yml | 3 +--
CHANGELOG.md | 5 ++++-
setup.py | 9 ++++++---
tox.ini | 14 ++++----------
4 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc0a1f73..0e953065 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,9 +139,8 @@ unittest_py38:
stage: unittest
image: python:3.8
script: &python_test_script
- - pip install pynose pandas
- pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev
- - pip install .[test,h5-crawler,gitignore-parser]
+ - pip install .[all]
- pytest --cov=caosadvancedtools unittests
unittest_py310:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa1511c8..18647b88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ###
* Official support for Python 3.13
-* New setup extras `test` and `doc` which install the dependencies for testing and documentation.
### Changed ###
@@ -17,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
following exposed names / features:
- `models.data_model.LINKAHEAD_INTERNAL_PROPERTIES`
- `export_related.export` exports to `linkahead_data.xml` now.
+- Renamed (and added) installation "extra" options:
+ - `h5` instead of `h5-crawler`
+ - `doc`, `test` and `all` are new, they install the dependencies for testing, documentation and
+ everything.
### Deprecated ###
diff --git a/setup.py b/setup.py
index 08908baa..747324fb 100755
--- a/setup.py
+++ b/setup.py
@@ -163,7 +163,7 @@ def setup_package():
"pandas>=1.2.0",
"xlrd>=2.0",
],
- extras_require={"h5-crawler": ["h5py>=3.3.0", ],
+ extras_require={"h5": ["h5py>=3.3.0", ],
"gitignore-parser": ["gitignore-parser >=0.1.0", ],
"doc": [
"sphinx",
@@ -171,13 +171,16 @@ def setup_package():
"sphinx-rtd-theme",
"recommonmark >= 0.6.0",
],
- "test": [
- "gitignore-parser",
+ "test": [ # include: h5, gitignore-parser
"pytest",
"pytest-pythonpath",
"pytest-cov",
"coverage>=4.4.2",
+ "caosadvancedtools[h5, gitignore-parser]",
],
+ "all": [ # include: doc, test
+ "caosadvancedtools[doc, test]",
+ ]
},
setup_requires=["pytest-runner>=2.0,<3dev"],
packages=find_packages('src'),
diff --git a/tox.ini b/tox.ini
index a7e06bf5..12c7ad50 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,12 @@
[tox]
-envlist=py38, py39, py310, py311, py312, py313
+envlist = py38, py39, py310, py311, py312, py313
skip_missing_interpreters = true
[testenv]
-deps=nose
- pandas
+deps =
git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev
- pytest
- pytest-cov
- gitignore-parser
- openpyxl >= 3.0.7
- xlrd == 1.2
- h5py
-commands=py.test --cov=caosadvancedtools --cov-report=html:.tox/cov_html -vv {posargs}
+extras = test
+commands = py.test --cov=caosadvancedtools --cov-report=html:.tox/cov_html -vv {posargs}
[flake8]
max-line-length=100
--
GitLab