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.

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

build: unbreak dependency tracking, doc builds and multiline tables #499

Merged
merged 3 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ jobs:
with:
python-version: ${{ matrix.python_version }}
- run: |
pip install -r tests/requirements.txt
pip install --editable .
pip install --editable .[tests]
pytest -vv
strategy:
fail-fast: false
Expand Down Expand Up @@ -136,8 +135,7 @@ jobs:
with:
python-version: ${{ matrix.python_version }}
- run: |
pip install -r tests/requirements.txt
pip install --editable .
pip install --editable .[tests]
pytest -vv
strategy:
fail-fast: false
Expand Down
16 changes: 13 additions & 3 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
version: 2
build:
image: latest
os: ubuntu-22.04
tools:
python: "3.12"

python:
version: 3.8
requirements_file: docs/requirements.txt
install:
- method: pip
path: .
extra_requirements:
- docs

sphinx:
configuration: docs/conf.py
17 changes: 5 additions & 12 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,11 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
on_rtd = os.environ.get('READTHEDOCS') == 'True'
if on_rtd:
html_theme = 'default'
html_theme_options = {
'logo_only': True,
}
else:
html_theme = 'alabaster'
html_theme_options = {
'logo': 'images/GNPy-logo.png',
'logo_name': False,
}
html_theme = 'alabaster'
html_theme_options = {
'logo': 'images/GNPy-logo.png',
'logo_name': False,
}

html_logo = 'images/GNPy-logo.png'

Expand Down
12 changes: 0 additions & 12 deletions docs/requirements.txt

This file was deleted.

11 changes: 0 additions & 11 deletions requirements.txt

This file was deleted.

32 changes: 32 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,35 @@ console_scripts =
gnpy-transmission-example = gnpy.tools.cli_examples:transmission_main_example
gnpy-path-request = gnpy.tools.cli_examples:path_requests_run
gnpy-convert-xls = gnpy.tools.convert:_do_convert

[options]
install_requires =
# matplotlib 3.8 removed support for Python 3.8
matplotlib>=3.7.3,<4
# networkx 3.2 removed support for Python 3.8
networkx>=3.1,<4
# numpy 1.25 removed support for Python 3.8
numpy>=1.24.4,<2
pbr>=6.0.0,<7
# scipy 1.11 removed support for Python 3.8
scipy>=1.10.1,<2
# xlrd 2.x removed support for .xlsx, it's only .xls now
xlrd>=1.2.0,<2

[options.extras_require]
tests =
build>=1.0.3,<2
pytest>=7.4.3,<8
# pandas 2.1 removed support for Python 3.8
pandas>=2.0.3,<3
# flake v6 killed the --diff option
flake8>=5.0.4,<6

docs =
alabaster>=0.7.12,<1
docutils>=0.17.1,<1
myst-parser>=0.16.1,<1
Pygments>=2.11.2,<3
rstcheck
Sphinx>=5.3.0,<6
sphinxcontrib-bibtex>=2.4.1,<3
7 changes: 0 additions & 7 deletions tests/requirements.txt

This file was deleted.

6 changes: 2 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
skipsdist = True

[testenv]
extras = tests
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/tests/requirements.txt
cover: pytest-cov
linters: flake8
linters: pep8-naming
Expand All @@ -22,8 +21,7 @@ commands =
python -m build

[testenv:docs]
deps =
-r{toxinidir}/docs/requirements.txt
extras = docs
allowlist_externals =
/bin/sh
commands =
Expand Down
Loading