Skip to content

Commit 2b8ebfd

Browse files
authored
Merge pull request #362 from fpgmaas/setup_cfg
2 parents 7d651c7 + 8cb7527 commit 2b8ebfd

File tree

4 files changed

+24
-29
lines changed

4 files changed

+24
-29
lines changed

.github/workflows/pytest.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ jobs:
4545
# make install
4646

4747
- name: Install dependencies
48-
run: |
49-
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
50-
if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
48+
run: pip install -e ".[dev,docs,test]"
5149

5250
- name: Install
5351
id: install
@@ -100,8 +98,7 @@ jobs:
10098
- name: Install dependencies
10199
run: |
102100
python -m pip install --upgrade pip
103-
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
104-
if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
101+
pip install -e ".[dev,docs,test]"
105102
- name: "Build Package"
106103
run: |
107104
make dist

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ More detailed installation instructions, including the use of `conda`, are [also
2525
If you want to do development on Shiny for Python:
2626

2727
```sh
28-
pip install -r requirements-dev.txt
29-
pip install -e .
28+
pip install -e ".[dev,docs,test]"
3029
```
3130

3231
Additionally, you can install pre-commit hooks which will automatically reformat and lint the code when you make a commit:

requirements-dev.txt

Lines changed: 0 additions & 17 deletions
This file was deleted.

setup.cfg

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ project_urls =
2424
Documentation = https://shiny.rstudio.com/py/
2525
Source Code = https://github.com/rstudio/py-shiny
2626

27-
28-
2927
[options]
3028
python_requires = >=3.7
3129
packages = find:
@@ -55,6 +53,27 @@ tests_require =
5553
pytest>=3
5654
zip_safe = False
5755

56+
[options.extras_require]
57+
test =
58+
pytest>=6.2.4
59+
pytest-asyncio>=0.17.2
60+
docs =
61+
sphinx>=4.4.0
62+
pyright>=1.1.244
63+
# Building docs currently fails with 1.16.0 and up, so use 1.15.3 for now.
64+
sphinx-autodoc-typehints==1.15.3
65+
myst-parser>=0.16.1
66+
sphinx-book-theme>=0.2.0
67+
dev =
68+
black>=22.3.0
69+
flake8==3.9.2
70+
flake8-bugbear>=22.6.22
71+
isort>=5.10.1
72+
pytest-playwright>=0.3.0
73+
pre-commit>=2.15.0
74+
wheel
75+
tox
76+
5877
[options.packages.find]
5978
include = shiny, shiny.*
6079

@@ -65,7 +84,6 @@ shiny = py.typed
6584
console_scripts =
6685
shiny = shiny._main:main
6786

68-
6987
[flake8]
7088
# E302: Expected 2 blank lines
7189
# E501: Line too long
@@ -75,8 +93,6 @@ console_scripts =
7593
ignore = E302, E501, F403, F405, W503
7694
extend_exclude = docs, .venv, venv, typings, e2e, build
7795

78-
79-
8096
[tox:tox]
8197
envlist = mytestenv
8298

0 commit comments

Comments
 (0)