Skip to content

Commit

Permalink
organize dev requirements (#636)
Browse files Browse the repository at this point in the history
  • Loading branch information
mr-c authored Dec 9, 2022
1 parent 4733227 commit 6e6fb37
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ EXTRAS=[pycodegen]
# `SHELL=bash` doesn't work for some, so don't use BASH-isms like
# `[[` conditional expressions.
PYSOURCES=$(wildcard ${MODULE}/**.py ${MODULE}/avro/*.py ${MODULE}/tests/*.py) setup.py
DEVPKGS=diff_cover black pylint pep257 pydocstyle flake8 tox tox-pyenv \
isort wheel autoflake flake8-bugbear pyupgrade bandit build\
-rtest-requirements.txt -rmypy-requirements.txt
DEVPKGS=-rdev-requirements.txt -rtest-requirements.txt -rmypy-requirements.txt
COVBASE=coverage run --append

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

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

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

## dev : install the schema-salad package in dev mode
dev: install-dep
pip install -U pip setuptools wheel
pip install -e .$(EXTRAS)

## dist : create a module package for distribution
Expand Down
10 changes: 10 additions & 0 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
diff_cover < 7.3
pylint < 2.16
pydocstyle < 6.2
flake8-bugbear < 22.13
tox < 3.28 # until tox-pyenv is updated for tox 4.x
tox-pyenv < 1.2
isort < 5.11
build < 0.9.1
autoflake < 2.1
bandit < 1.7.4
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ rdflib>= 4.2.2, < 6.0.0;python_version<='3.6'
rdflib-jsonld>=0.4.0, <= 0.6.1;python_version<='3.6'
mistune>=2.0.3,<2.1
CacheControl[filecache]==0.12.11
black
black<22.13
1 change: 0 additions & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
pytest >= 6.2, < 7.3
pytest-cov
pytest-xdist
tox
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ passenv =
deps =
py{36,37,38,39,310,311}-{unit,mypy}: -rrequirements.txt
py{36,37,38,39,310,311}-{unit,mypy}: -rtest-requirements.txt
py{36,37,38,39,310,311}-lint: flake8-bugbear
py{36,37,38,39,310,311}-lint: flake8-bugbear < 22.13
py{36,37,38,39,310,311}-lint: black
py{37,38,39,310,311}-bandit: bandit
py{37,38,39,310,311}-bandit: bandit < 1.8
py{37,38,39,310,311}-mypy: -rmypy-requirements.txt
# don't forget to update dev-requirements.txt as well

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

0 comments on commit 6e6fb37

Please sign in to comment.