Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deprecations setuptools #214

Merged
merged 5 commits into from
Jul 31, 2024
Merged

deprecations setuptools #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e58d5a
ci(pytest): invoke `pytest` directly instead of `setup.py test` (#214)
mdonadoni Jul 30, 2024
5beb31e
build(python): remove deprecated `pytest-runner` (#214)
mdonadoni Jul 30, 2024
906d439
build(python): use optional deps instead of `tests_require` (#214)
mdonadoni Jul 30, 2024
c3cd6f6
build(python): add minimal `pyproject.toml` (#214)
mdonadoni Jul 30, 2024
c6ae076
build(docker): pin setuptools to v70 (#214)
mdonadoni Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN apt-get update -y && \
python3-dev \
python3-pip \
vim-tiny && \
pip install --no-cache-dir --upgrade pip setuptools && \
pip install --no-cache-dir --upgrade pip 'setuptools<71' && \
pip install --no-cache-dir -r /code/requirements.txt && \
apt-get remove -y \
gcc \
Expand Down
9 changes: 9 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# This file is part of REANA.
# Copyright (C) 2024 CERN.
#
# REANA is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.

[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"
2 changes: 1 addition & 1 deletion run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ check_sphinx () {
}

check_pytest () {
python setup.py test
pytest
}

check_dockerfile () {
Expand Down
3 changes: 0 additions & 3 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# REANA is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.

[aliases]
test = pytest

[build_sphinx]
source-dir = docs/
build-dir = docs/_build
Expand Down
14 changes: 3 additions & 11 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
readme = open("README.md").read()
history = open("CHANGELOG.md").read()

tests_require = [
"pytest-reana>=0.95.0a2,<0.96.0",
]

extras_require = {
"debug": [
"wdb",
Expand All @@ -34,7 +30,9 @@
"sphinx-rtd-theme>=0.1.9",
"Jinja2<3.1",
],
"tests": tests_require,
"tests": [
"pytest-reana>=0.95.0a2,<0.96.0",
],
}

extras_require["all"] = []
Expand All @@ -43,10 +41,6 @@
continue
extras_require["all"].extend(reqs)

setup_requires = [
"pytest-runner>=2.7",
]

install_requires = [
"reana-commons>=0.95.0a2,<0.96.0",
]
Expand Down Expand Up @@ -82,8 +76,6 @@
python_requires=">=3.8",
install_requires=install_requires,
extras_require=extras_require,
setup_requires=setup_requires,
tests_require=tests_require,
classifiers=[
"Development Status :: 3 - Alpha",
"Environment :: Web Environment",
Expand Down
Loading