Skip to content

Commit

Permalink
Merge pull request #33 from jamescooke/test-tools
Browse files Browse the repository at this point in the history
Improve test tools
  • Loading branch information
jamescooke committed Apr 20, 2018
2 parents a53a95f + edebdeb commit b8a7f8d
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 43 deletions.
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@ dist:
python setup.py sdist bdist_wheel

test-upload:
twine upload -r test dist/factory_djoy-*
twine upload --repository-url https://test.pypi.org/legacy/ dist/factory_djoy-*

# Need to manually install dependencies since they are not on test pypi
test-install:
pip install -r test_framework/requirements/local.txt
pip install -r test_framework/requirements/django110.txt
pip install -i https://testpypi.python.org/pypi factory-djoy
pip install Django factory-boy
pip install factory-djoy -i https://test.pypi.org/simple

upload:
twine upload dist/factory_djoy-*
Expand Down
84 changes: 46 additions & 38 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,50 +4,58 @@
#
# pip-compile --output-file base.txt base.in
#
alabaster==0.7.9 # via sphinx
alabaster==0.7.10 # via sphinx
argh==0.26.2 # via sphinx-autobuild, watchdog
babel==2.3.4 # via sphinx
bandit==1.1.0
check-manifest==0.34
click==6.6 # via pip-tools
docutils==0.12
babel==2.5.3 # via sphinx
bandit==1.4.0
certifi==2018.4.16 # via requests
chardet==3.0.4 # via requests
check-manifest==0.37
click==6.7 # via pip-tools
docutils==0.14
first==2.0.1 # via pip-tools
flake8==3.0.4
gitdb2==2.0.0 # via gitpython
GitPython==2.1.0 # via bandit
imagesize==0.7.1 # via sphinx
isort==4.2.5
Jinja2==2.8 # via sphinx
livereload==2.4.1 # via sphinx-autobuild
MarkupSafe==0.23 # via jinja2
mccabe==0.5.2 # via flake8
flake8==3.5.0
gitdb2==2.0.3 # via gitpython
GitPython==2.1.9 # via bandit
idna==2.6 # via requests
imagesize==1.0.0 # via sphinx
isort==4.3.4
Jinja2==2.10 # via sphinx
livereload==2.5.1 # via sphinx-autobuild
MarkupSafe==1.0 # via jinja2
mccabe==0.6.1 # via flake8
packaging==17.1 # via sphinx
pathtools==0.1.2 # via sphinx-autobuild, watchdog
pbr==1.10.0 # via stevedore
pip-tools==1.7.0
pkginfo==1.3.2 # via twine
pluggy==0.3.1 # via tox
port-for==0.3.1 # via sphinx-autobuild
py==1.4.31 # via tox
pycodestyle==2.0.0 # via flake8
pyflakes==1.2.3 # via flake8
Pygments==2.1.3 # via sphinx
pytz==2016.7 # via babel
pbr==4.0.2 # via stevedore
pip-tools==2.0.1
pkginfo==1.4.2 # via twine
pluggy==0.6.0 # via tox
port_for==0.3.1 # via sphinx-autobuild
py==1.5.3 # via tox
pycodestyle==2.3.1 # via flake8
pyflakes==1.6.0 # via flake8
Pygments==2.2.0 # via sphinx
pyparsing==2.2.0 # via packaging
pytz==2018.4 # via babel
PyYAML==3.12 # via bandit, sphinx-autobuild, watchdog
requests-toolbelt==0.6.2 # via twine
requests==2.10.0 # via requests-toolbelt, twine
six==1.10.0 # via bandit, livereload, pip-tools, sphinx, stevedore
smmap2==2.0.1 # via gitdb2
requests-toolbelt==0.8.0 # via twine
requests==2.18.4 # via requests-toolbelt, sphinx, twine
six==1.11.0 # via bandit, livereload, packaging, pip-tools, sphinx, stevedore, tox
smmap2==2.0.3 # via gitdb2
snowballstemmer==1.2.1 # via sphinx
sphinx-autobuild==0.6.0
sphinx-rtd-theme==0.1.9
sphinx==1.4.8
stevedore==1.18.0 # via bandit
tornado==4.4.2 # via livereload, sphinx-autobuild
tox==2.3.1
twine==1.6.5
virtualenv==15.0.1 # via tox
sphinx-autobuild==0.7.1
sphinx-rtd-theme==0.3.0
sphinx==1.7.2
sphinxcontrib-websupport==1.0.1 # via sphinx
stevedore==1.28.0 # via bandit
tornado==5.0.2 # via livereload, sphinx-autobuild
tox==3.0.0
tqdm==4.23.0 # via twine
twine==1.11.0
urllib3==1.22 # via requests
virtualenv==15.2.0 # via tox
watchdog==0.8.3 # via sphinx-autobuild

# The following packages are commented out because they are
# considered to be unsafe in a requirements file:
# setuptools # via twine
# setuptools # via sphinx, twine
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def readme():
],

classifiers=[
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'Framework :: Django',
'License :: OSI Approved :: MIT License',
Expand Down

0 comments on commit b8a7f8d

Please sign in to comment.