Skip to content

Commit 6e6fb37

Browse files
authored
organize dev requirements (#636)
1 parent 4733227 commit 6e6fb37

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
lines changed

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ EXTRAS=[pycodegen]
2727
# `SHELL=bash` doesn't work for some, so don't use BASH-isms like
2828
# `[[` conditional expressions.
2929
PYSOURCES=$(wildcard ${MODULE}/**.py ${MODULE}/avro/*.py ${MODULE}/tests/*.py) setup.py
30-
DEVPKGS=diff_cover black pylint pep257 pydocstyle flake8 tox tox-pyenv \
31-
isort wheel autoflake flake8-bugbear pyupgrade bandit build\
32-
-rtest-requirements.txt -rmypy-requirements.txt
30+
DEVPKGS=-rdev-requirements.txt -rtest-requirements.txt -rmypy-requirements.txt
3331
COVBASE=coverage run --append
3432

3533
# Updating the Major & Minor version below?
@@ -52,14 +50,14 @@ install-dep: install-dependencies
5250

5351
install-dependencies: FORCE
5452
pip install --upgrade $(DEVPKGS)
55-
pip install -r requirements.txt -r mypy-requirements.txt
5653

5754
## install : install the schema-salad package and scripts
5855
install: FORCE
5956
pip install .$(EXTRAS)
6057

6158
## dev : install the schema-salad package in dev mode
6259
dev: install-dep
60+
pip install -U pip setuptools wheel
6361
pip install -e .$(EXTRAS)
6462

6563
## dist : create a module package for distribution

dev-requirements.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
diff_cover < 7.3
2+
pylint < 2.16
3+
pydocstyle < 6.2
4+
flake8-bugbear < 22.13
5+
tox < 3.28 # until tox-pyenv is updated for tox 4.x
6+
tox-pyenv < 1.2
7+
isort < 5.11
8+
build < 0.9.1
9+
autoflake < 2.1
10+
bandit < 1.7.4

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ rdflib>= 4.2.2, < 6.0.0;python_version<='3.6'
55
rdflib-jsonld>=0.4.0, <= 0.6.1;python_version<='3.6'
66
mistune>=2.0.3,<2.1
77
CacheControl[filecache]==0.12.11
8-
black
8+
black<22.13

test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
pytest >= 6.2, < 7.3
22
pytest-cov
33
pytest-xdist
4-
tox

tox.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ passenv =
3737
deps =
3838
py{36,37,38,39,310,311}-{unit,mypy}: -rrequirements.txt
3939
py{36,37,38,39,310,311}-{unit,mypy}: -rtest-requirements.txt
40-
py{36,37,38,39,310,311}-lint: flake8-bugbear
40+
py{36,37,38,39,310,311}-lint: flake8-bugbear < 22.13
4141
py{36,37,38,39,310,311}-lint: black
42-
py{37,38,39,310,311}-bandit: bandit
42+
py{37,38,39,310,311}-bandit: bandit < 1.8
4343
py{37,38,39,310,311}-mypy: -rmypy-requirements.txt
44+
# don't forget to update dev-requirements.txt as well
4445

4546
setenv =
4647
py{36,37,38,39,310,311}-unit: LC_ALL = C.UTF-8

0 commit comments

Comments
 (0)