Skip to content

Commit

Permalink
Fixes and bump reqs (#103)
Browse files Browse the repository at this point in the history
* Fix documentation typo in dev doc

* Fix content type error in setup.py

* Update requirements with Python 3.6.13
  • Loading branch information
jamescooke committed May 9, 2021
1 parent 5e9a352 commit 97cf68a
Show file tree
Hide file tree
Showing 8 changed files with 156 additions and 69 deletions.
4 changes: 2 additions & 2 deletions docs/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ like ``1.2.3``.
make test-upload
deactive
virtualenv /tmp/tenv
deactivate
virtualenv /tmp/tenv --python=python3.8
. /tmp/tenv/bin/activate
make test-install
Expand Down
73 changes: 49 additions & 24 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ bandit==1.7.0
# via -r base.in
bleach==3.3.0
# via readme-renderer
build==0.2.1
build==0.3.1.post1
# via check-manifest
certifi==2020.12.5
# via requests
cffi==1.14.4
cffi==1.14.5
# via cryptography
chardet==4.0.0
# via requests
Expand All @@ -29,8 +29,10 @@ check-manifest==0.46
click==7.1.2
# via pip-tools
colorama==0.4.4
# via twine
cryptography==3.4.4
# via
# sphinx-autobuild
# twine
cryptography==3.4.7
# via secretstorage
distlib==0.3.1
# via virtualenv
Expand All @@ -39,31 +41,45 @@ docutils==0.16
# -r base.in
# readme-renderer
# sphinx
# sphinx-rtd-theme
filelock==3.0.12
# via
# tox
# virtualenv
flake8-aaa==0.11.1
# via -r base.in
flake8==3.8.4
flake8==3.9.0
# via -r base.in
gitdb==4.0.5
gitdb==4.0.7
# via gitpython
gitpython==3.1.13
gitpython==3.1.14
# via bandit
idna==2.10
# via requests
imagesize==1.2.0
# via sphinx
isort==5.7.0
importlib-metadata==3.10.0
# via
# build
# flake8
# keyring
# pep517
# pluggy
# stevedore
# tox
# twine
# virtualenv
importlib-resources==5.1.2
# via virtualenv
isort==5.8.0
# via -r base.in
jeepney==0.6.0
# via
# keyring
# secretstorage
jinja2==2.11.3
# via sphinx
keyring==22.0.1
keyring==23.0.1
# via twine
livereload==2.6.3
# via sphinx-autobuild
Expand All @@ -79,23 +95,25 @@ packaging==20.9
# tox
pbr==5.5.1
# via stevedore
pep517==0.9.1
# via build
pip-tools==5.5.0
pep517==0.10.0
# via
# build
# pip-tools
pip-tools==6.0.1
# via -r base.in
pkginfo==1.7.0
# via twine
pluggy==0.13.1
# via tox
py==1.10.0
# via tox
pycodestyle==2.6.0
pycodestyle==2.7.0
# via flake8
pycparser==2.20
# via cffi
pyflakes==2.2.0
pyflakes==2.3.1
# via flake8
pygments==2.7.4
pygments==2.8.1
# via
# readme-renderer
# sphinx
Expand All @@ -107,7 +125,7 @@ pyyaml==5.4.1
# via
# -r base.in
# bandit
readme-renderer==28.0
readme-renderer==29.0
# via twine
requests-toolbelt==0.9.1
# via twine
Expand All @@ -129,15 +147,15 @@ six==1.15.0
# readme-renderer
# tox
# virtualenv
smmap==3.0.5
smmap==4.0.0
# via gitdb
snowballstemmer==2.1.0
# via sphinx
sphinx-autobuild==2020.9.1
sphinx-autobuild==2021.3.14
# via -r base.in
sphinx-rtd-theme==0.5.1
sphinx-rtd-theme==0.5.2
# via -r base.in
sphinx==3.4.3
sphinx==3.5.3
# via
# -r base.in
# sphinx-autobuild
Expand All @@ -164,18 +182,25 @@ toml==0.10.2
# tox
tornado==6.1
# via livereload
tox==3.21.4
tox==3.23.0
# via -r base.in
tqdm==4.56.2
tqdm==4.60.0
# via twine
twine==3.3.0
twine==3.4.1
# via -r base.in
typing-extensions==3.7.4.3
# via importlib-metadata
urllib3==1.26.4
# via requests
virtualenv==20.4.2
virtualenv==20.4.3
# via tox
webencodings==0.5.1
# via bleach
zipp==3.4.1
# via
# importlib-metadata
# importlib-resources
# pep517

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def readme():

description=about['__description__'],
long_description=readme(),
long_description_content_type="test/x-rst",
long_description_content_type="text/x-rst",
url='http://github.com/jamescooke/factory_djoy',
author=about['__author__'],
author_email=about['__email__'],
Expand Down
6 changes: 4 additions & 2 deletions test_framework/requirements/django111.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@
#
# pip-compile --output-file=django111.txt django111.in
#
django==1.11.29 # via -r django111.in
pytz==2021.1 # via django
django==1.11.29
# via -r django111.in
pytz==2021.1
# via django
9 changes: 6 additions & 3 deletions test_framework/requirements/django22.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
#
# pip-compile --output-file=django22.txt django22.in
#
django==2.2.18 # via -r django22.in
pytz==2021.1 # via django
sqlparse==0.4.1 # via django
django==2.2.20
# via -r django22.in
pytz==2021.1
# via django
sqlparse==0.4.1
# via django
14 changes: 10 additions & 4 deletions test_framework/requirements/django30.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
#
# pip-compile --output-file=django30.txt django30.in
#
asgiref==3.3.1 # via django
django==3.0.12 # via -r django30.in
pytz==2021.1 # via django
sqlparse==0.4.1 # via django
asgiref==3.3.4
# via django
django==3.0.14
# via -r django30.in
pytz==2021.1
# via django
sqlparse==0.4.1
# via django
typing-extensions==3.7.4.3
# via asgiref
14 changes: 10 additions & 4 deletions test_framework/requirements/django31.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
#
# pip-compile --output-file=django31.txt django31.in
#
asgiref==3.3.1 # via django
django==3.1.6 # via -r django31.in
pytz==2021.1 # via django
sqlparse==0.4.1 # via django
asgiref==3.3.4
# via django
django==3.1.8
# via -r django31.in
pytz==2021.1
# via django
sqlparse==0.4.1
# via django
typing-extensions==3.7.4.3
# via asgiref
103 changes: 74 additions & 29 deletions test_framework/requirements/local.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,80 @@
#
# pip-compile --output-file=local.txt local.in
#
backcall==0.2.0 # via ipython
click==7.1.2 # via pip-tools
decorator==4.4.2 # via ipython, traitlets
factory-boy==3.2.0 # via -r local.in
faker==6.1.1 # via factory-boy
flake8==3.8.4 # via -r local.in
importlib-metadata==3.4.0 # via flake8
ipdb==0.13.4 # via -r local.in
ipython-genutils==0.2.0 # via traitlets
ipython==7.16.1 # via -r local.in, ipdb
isort==5.7.0 # via -r local.in
jedi==0.18.0 # via ipython
mccabe==0.6.1 # via flake8
parso==0.8.1 # via jedi
pexpect==4.8.0 # via ipython
pickleshare==0.7.5 # via ipython
pip-tools==5.5.0 # via -r local.in
prompt-toolkit==3.0.15 # via ipython
ptyprocess==0.7.0 # via pexpect
pycodestyle==2.6.0 # via flake8
pyflakes==2.2.0 # via flake8
pygments==2.7.4 # via ipython
python-dateutil==2.8.1 # via faker
six==1.15.0 # via python-dateutil, traitlets
text-unidecode==1.3 # via faker
traitlets==4.3.3 # via ipython
typing-extensions==3.7.4.3 # via importlib-metadata
wcwidth==0.2.5 # via prompt-toolkit
zipp==3.4.0 # via importlib-metadata
backcall==0.2.0
# via ipython
click==7.1.2
# via pip-tools
decorator==5.0.5
# via
# ipython
# traitlets
factory-boy==3.2.0
# via -r local.in
faker==8.0.0
# via factory-boy
flake8==3.9.0
# via -r local.in
importlib-metadata==3.10.0
# via
# flake8
# pep517
ipdb==0.13.7
# via -r local.in
ipython-genutils==0.2.0
# via traitlets
ipython==7.16.1
# via
# -r local.in
# ipdb
isort==5.8.0
# via -r local.in
jedi==0.18.0
# via ipython
mccabe==0.6.1
# via flake8
parso==0.8.2
# via jedi
pep517==0.10.0
# via pip-tools
pexpect==4.8.0
# via ipython
pickleshare==0.7.5
# via ipython
pip-tools==6.0.1
# via -r local.in
prompt-toolkit==3.0.18
# via ipython
ptyprocess==0.7.0
# via pexpect
pycodestyle==2.7.0
# via flake8
pyflakes==2.3.1
# via flake8
pygments==2.8.1
# via ipython
python-dateutil==2.8.1
# via faker
six==1.15.0
# via
# python-dateutil
# traitlets
text-unidecode==1.3
# via faker
toml==0.10.2
# via
# ipdb
# pep517
traitlets==4.3.3
# via ipython
typing-extensions==3.7.4.3
# via importlib-metadata
wcwidth==0.2.5
# via prompt-toolkit
zipp==3.4.1
# via
# importlib-metadata
# pep517

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down

0 comments on commit 97cf68a

Please sign in to comment.