Browse Source

replace pip-compile with pipenv

keep-around/d4202572411d5331975e4b3e9563aba4bcab1743
Loïc Dachary 10 months ago
committed by some
parent
commit
c2cb22cf3c
Signed by: dachary GPG Key ID: 992D23B392F9E4F2
  1. 43
      Pipfile
  2. 1376
      Pipfile.lock
  3. 1
      enough/common/data/base.dockerfile
  4. 4
      enough/internal/data/enough-source.dockerfile
  5. 12
      requirements-dev.in
  6. 137
      requirements-dev.txt
  7. 20
      requirements.in
  8. 102
      requirements.txt
  9. 2
      tests/tox.dockerfile
  10. 4
      tox.ini

43
Pipfile

@ -0,0 +1,43 @@
[[source]]
name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true
[dev-packages]
coverage = "==4.5"
flake8 = "==3.5"
mock = "==2.0.0"
pip-tools = "==5.1.2"
pytest-cov = "==2.6.1"
pytest-mock = "==1.10.4"
pytest-django = "==3.4.8"
requests-mock = "==1.6.0"
sphinx = "==1.8.2"
tox = "==3.15.0"
twine = "==1.13.0"
dnspython = "==1.16.0"
[packages]
ansible = "==2.7.17"
beautifulsoup4 = "==4.7.1"
cliff = "*"
django = "==2.2"
djangorestframework = "==3.9.2"
django-allauth = "==0.39.1"
django-bootstrap3 = "==11.0.0"
docker = "*"
docker-compose = "*"
future = "==0.18.2"
icinga2api = {git = "https://github.com/fmnisme/python-icinga2api.git", ref = "9a1a3cc7968d6c72bf49e97ef387b2824e6835e9"}
jinja2 = ">=1.1"
testinfra = "==5.0.0"
netaddr = "==0.7.19"
openstacksdk = "*"
python-openstackclient = "*"
python-heatclient = "*"
pytest = "==4.4.0"
sh = ">=1.12"
shade = "==1.30.0"
[requires]
python_version = "3.8"

1376
Pipfile.lock
File diff suppressed because it is too large
View File

1
enough/common/data/base.dockerfile

@ -20,3 +20,4 @@ ENV REQUESTS_CA_BUNDLE /etc/ssl/certs
WORKDIR /opt
RUN virtualenv --python=python3 venv
ENV PATH="/opt/venv/bin:${PATH}"
RUN pip3 install pipenv

4
enough/internal/data/enough-source.dockerfile

@ -1,8 +1,8 @@
ARG IMAGE_NAME
FROM ${IMAGE_NAME}
COPY requirements.txt /tmp
RUN pip3 install -r /tmp/requirements.txt
COPY Pipfile Pipfile.lock /tmp/
RUN . /opt/venv/bin/activate ; cd /tmp ; PIPENV_VERBOSITY=-1 pipenv install --ignore-pipfile
COPY dist/* .
RUN pip3 install *.tar.gz

12
requirements-dev.in

@ -1,12 +0,0 @@
coverage==4.5
flake8==3.5
mock==2.0.0
pip-tools==5.1.2
pytest-cov==2.6.1
pytest-mock==1.10.4
pytest-django==3.4.8
requests_mock==1.6.0
sphinx==1.8.2
tox==3.15.0
twine==1.13.0
dnspython==1.16.0

137
requirements-dev.txt

@ -1,137 +0,0 @@
#
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=requirements-dev.txt requirements-dev.in requirements.in
#
-e git+https://github.com/fmnisme/python-icinga2api.git@9a1a3cc7968d6c72bf49e97ef387b2824e6835e9#egg=icinga2api # via -r requirements.in
alabaster==0.7.12 # via sphinx
ansible==2.7.17 # via -r requirements.in
appdirs==1.4.3 # via openstacksdk
asn1crypto==0.24.0 # via cryptography
atomicwrites==1.2.1 # via pytest
attrs==18.2.0 # via pytest
babel==2.6.0 # via osc-lib, oslo.i18n, python-cinderclient, python-heatclient, python-novaclient, python-openstackclient, sphinx
bcrypt==3.1.5 # via paramiko
beautifulsoup4==4.7.1 # via -r requirements.in
bleach==3.1.0 # via readme-renderer
cached-property==1.5.1 # via docker-compose
certifi==2018.11.29 # via requests
cffi==1.11.5 # via bcrypt, cryptography, pynacl
chardet==3.0.4 # via requests
click==7.1.2 # via pip-tools
cliff==2.14.0 # via -r requirements.in, osc-lib, python-heatclient, python-openstackclient
cmd2==0.8.9 # via cliff
coverage==4.5 # via -r requirements-dev.in, pytest-cov
cryptography==2.4.2 # via ansible, openstacksdk, paramiko, pyopenssl
debtcollector==1.21.0 # via oslo.config, oslo.utils, python-keystoneclient
decorator==4.3.0 # via openstacksdk
defusedxml==0.5.0 # via python3-openid
django-allauth==0.39.1 # via -r requirements.in
django-bootstrap3==11.0.0 # via -r requirements.in
django==2.2 # via -r requirements.in, django-allauth
djangorestframework==3.9.2 # via -r requirements.in
dnspython==1.16.0 # via -r requirements-dev.in
docker-compose==1.24.0 # via -r requirements.in
docker-pycreds==0.4.0 # via docker
docker[ssh]==3.7.2 # via -r requirements.in, docker-compose
dockerpty==0.4.1 # via docker-compose
docopt==0.6.2 # via docker-compose
docutils==0.14 # via readme-renderer, sphinx
dogpile.cache==0.6.8 # via openstacksdk
filelock==3.0.10 # via tox
flake8==3.5 # via -r requirements-dev.in
future==0.18.2 # via -r requirements.in
idna==2.7 # via cryptography, requests
imagesize==1.1.0 # via sphinx
importlib-metadata==1.6.0 # via pluggy, tox
iso8601==0.1.12 # via keystoneauth1, openstacksdk, oslo.utils, python-heatclient, python-novaclient
jinja2==2.10 # via -r requirements.in, ansible, sphinx
jmespath==0.9.3 # via openstacksdk
jsonpatch==1.23 # via openstacksdk, warlock
jsonpointer==2.0 # via jsonpatch
jsonschema==2.6.0 # via docker-compose, warlock
keystoneauth1==3.11.2 # via openstacksdk, osc-lib, python-cinderclient, python-glanceclient, python-heatclient, python-keystoneclient, python-novaclient, python-openstackclient
markupsafe==1.1.0 # via jinja2
mccabe==0.6.1 # via flake8
mock==2.0.0 # via -r requirements-dev.in
more-itertools==5.0.0 # via pytest
msgpack==0.6.1 # via oslo.serialization
munch==2.3.2 # via openstacksdk
netaddr==0.7.19 # via -r requirements.in, oslo.config, oslo.utils
netifaces==0.10.9 # via openstacksdk, oslo.utils
oauthlib==3.0.1 # via requests-oauthlib
openstacksdk==0.22.0 # via -r requirements.in, os-client-config, osc-lib, python-openstackclient, shade
os-client-config==1.31.2 # via shade
os-service-types==1.4.0 # via keystoneauth1, openstacksdk
osc-lib==1.12.1 # via python-heatclient, python-openstackclient
oslo.config==6.9.0 # via python-keystoneclient
oslo.i18n==3.23.1 # via osc-lib, oslo.config, oslo.utils, python-cinderclient, python-glanceclient, python-heatclient, python-keystoneclient, python-novaclient, python-openstackclient
oslo.serialization==2.29.0 # via python-heatclient, python-keystoneclient, python-novaclient
oslo.utils==3.41.0 # via osc-lib, oslo.serialization, python-cinderclient, python-glanceclient, python-heatclient, python-keystoneclient, python-novaclient, python-openstackclient
packaging==18.0 # via sphinx, tox
paramiko==2.4.2 # via ansible, docker
pbr==4.1.0 # via cliff, debtcollector, keystoneauth1, mock, openstacksdk, os-service-types, osc-lib, oslo.i18n, oslo.serialization, oslo.utils, python-cinderclient, python-glanceclient, python-heatclient, python-keystoneclient, python-novaclient, python-openstackclient, shade, stevedore
pip-tools==5.1.2 # via -r requirements-dev.in
pkginfo==1.5.0.1 # via twine
pluggy==0.13.1 # via pytest, tox
prettytable==0.7.2 # via cliff, python-cinderclient, python-glanceclient, python-heatclient, python-novaclient
py==1.7.0 # via pytest, tox
pyasn1==0.4.5 # via paramiko
pycodestyle==2.3.1 # via flake8
pycparser==2.19 # via cffi
pyflakes==1.6.0 # via flake8
pygments==2.3.1 # via readme-renderer, sphinx
pynacl==1.3.0 # via paramiko
pyopenssl==19.0.0 # via python-glanceclient
pyparsing==2.3.0 # via cliff, cmd2, oslo.utils, packaging
pyperclip==1.7.0 # via cmd2
pytest-cov==2.6.1 # via -r requirements-dev.in
pytest-django==3.4.8 # via -r requirements-dev.in
pytest-mock==1.10.4 # via -r requirements-dev.in
pytest==4.4.0 # via -r requirements.in, pytest-cov, pytest-django, pytest-mock, testinfra
python-cinderclient==4.1.0 # via python-openstackclient
python-glanceclient==2.16.0 # via python-openstackclient
python-heatclient==1.17 # via -r requirements.in
python-keystoneclient==3.19.0 # via python-openstackclient
python-novaclient==13.0.0 # via python-openstackclient
python-openstackclient==3.18.0 # via -r requirements.in
python-swiftclient==3.7.0 # via python-heatclient
python3-openid==3.1.0 # via django-allauth
pytz==2018.9 # via babel, django, oslo.serialization, oslo.utils
pyyaml==3.13 # via ansible, cliff, docker-compose, openstacksdk, oslo.config, oslo.serialization, python-heatclient
readme-renderer==24.0 # via twine
requests-oauthlib==1.2.0 # via django-allauth
requests-toolbelt==0.9.1 # via twine
requests==2.20.1 # via django-allauth, docker, docker-compose, icinga2api, keystoneauth1, oslo.config, python-glanceclient, python-heatclient, python-keystoneclient, python-swiftclient, requests-mock, requests-oauthlib, requests-toolbelt, sphinx, twine
requests_mock==1.6.0 # via -r requirements-dev.in
requestsexceptions==1.4.0 # via openstacksdk
rfc3986==1.3.1 # via oslo.config
sh==1.12.14 # via -r requirements.in
shade==1.30.0 # via -r requirements.in
simplejson==3.16.0 # via osc-lib, python-cinderclient, python-novaclient
six==1.14.0 # via bcrypt, bleach, cliff, cmd2, cryptography, debtcollector, docker, docker-compose, docker-pycreds, dockerpty, keystoneauth1, mock, more-itertools, munch, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.serialization, oslo.utils, packaging, pip-tools, pynacl, pyopenssl, pytest, python-cinderclient, python-glanceclient, python-heatclient, python-keystoneclient, python-novaclient, python-openstackclient, python-swiftclient, readme-renderer, requests-mock, sphinx, stevedore, tox, warlock, websocket-client
snowballstemmer==1.2.1 # via sphinx
soupsieve==1.9.1 # via beautifulsoup4
sphinx==1.8.2 # via -r requirements-dev.in
sphinxcontrib-websupport==1.1.0 # via sphinx
sqlparse==0.3.0 # via django
stevedore==1.30.0 # via cliff, keystoneauth1, osc-lib, oslo.config, python-keystoneclient
testinfra==5.0.0 # via -r requirements.in
texttable==0.9.1 # via docker-compose
toml==0.10.0 # via tox
tox==3.15.0 # via -r requirements-dev.in
tqdm==4.31.1 # via twine
twine==1.13.0 # via -r requirements-dev.in
urllib3==1.24.1 # via requests
virtualenv==16.2.0 # via tox
warlock==1.3.0 # via python-glanceclient
wcwidth==0.1.7 # via cmd2
webencodings==0.5.1 # via bleach
websocket-client==0.56.0 # via docker, docker-compose
wrapt==1.11.1 # via debtcollector, python-glanceclient
zipp==3.1.0 # via importlib-metadata
# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools

20
requirements.in

@ -1,20 +0,0 @@
ansible==2.7.17
beautifulsoup4==4.7.1
cliff>=2.14
django==2.2
djangorestframework==3.9.2
django-allauth==0.39.1
django-bootstrap3==11.0.0
docker
docker-compose
future==0.18.2
-e git+https://github.com/fmnisme/python-icinga2api.git@9a1a3cc7968d6c72bf49e97ef387b2824e6835e9#egg=icinga2api
jinja2>=1.1
testinfra==5.0.0
netaddr==0.7.19
openstacksdk==0.22.0
python-openstackclient==3.18.0
python-heatclient==1.17
pytest==4.4.0
sh>=1.12
shade==1.30.0

102
requirements.txt

@ -1,102 +0,0 @@
#
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=requirements.txt requirements.in
#
-e git+https://github.com/fmnisme/python-icinga2api.git@9a1a3cc7968d6c72bf49e97ef387b2824e6835e9#egg=icinga2api # via -r requirements.in
ansible==2.7.17 # via -r requirements.in
appdirs==1.4.3 # via openstacksdk, os-client-config
asn1crypto==0.23.0 # via cryptography
atomicwrites==1.3.0 # via pytest
attrs==19.1.0 # via pytest
babel==2.6.0 # via osc-lib, oslo.i18n, python-cinderclient, python-heatclient, python-novaclient, python-openstackclient
bcrypt==3.1.3 # via paramiko
beautifulsoup4==4.7.1 # via -r requirements.in
cached-property==1.5.1 # via docker-compose
certifi==2017.7.27.1 # via requests
cffi==1.11.0 # via bcrypt, cryptography, pynacl
chardet==3.0.4 # via requests
cliff==2.14.0 # via -r requirements.in, osc-lib, python-heatclient, python-openstackclient
cmd2==0.8.9 # via cliff
cryptography==2.4.2 # via ansible, openstacksdk, paramiko, pyopenssl
debtcollector==1.21.0 # via oslo.config, oslo.utils, python-keystoneclient
decorator==4.1.2 # via openstacksdk
defusedxml==0.5.0 # via python3-openid
django-allauth==0.39.1 # via -r requirements.in
django-bootstrap3==11.0.0 # via -r requirements.in
django==2.2 # via -r requirements.in, django-allauth
djangorestframework==3.9.2 # via -r requirements.in
docker-compose==1.24.0 # via -r requirements.in
docker-pycreds==0.4.0 # via docker
docker[ssh]==3.7.2 # via -r requirements.in, docker-compose
dockerpty==0.4.1 # via docker-compose
docopt==0.6.2 # via docker-compose
dogpile.cache==0.6.8 # via openstacksdk
future==0.18.2 # via -r requirements.in
idna==2.6 # via cryptography, requests
iso8601==0.1.12 # via keystoneauth1, openstacksdk, oslo.utils, python-heatclient, python-novaclient
jinja2==2.10 # via -r requirements.in, ansible
jmespath==0.9.3 # via openstacksdk
jsonpatch==1.16 # via openstacksdk, warlock
jsonpointer==1.12 # via jsonpatch
jsonschema==2.6.0 # via docker-compose, warlock
keystoneauth1==3.11.2 # via openstacksdk, os-client-config, osc-lib, python-cinderclient, python-glanceclient, python-heatclient, python-keystoneclient, python-novaclient, python-openstackclient
markupsafe==1.1.1 # via jinja2
more-itertools==7.0.0 # via pytest
msgpack==0.6.1 # via oslo.serialization
munch==2.2.0 # via openstacksdk
netaddr==0.7.19 # via -r requirements.in, oslo.config, oslo.utils
netifaces==0.10.6 # via openstacksdk, oslo.utils
oauthlib==3.0.1 # via requests-oauthlib
openstacksdk==0.22.0 # via -r requirements.in, osc-lib, python-openstackclient, shade
os-client-config==1.28.0 # via shade
os-service-types==1.4.0 # via keystoneauth1, openstacksdk
osc-lib==1.12.1 # via python-heatclient, python-openstackclient
oslo.config==6.9.0 # via python-keystoneclient
oslo.i18n==3.23.1 # via osc-lib, oslo.config, oslo.utils, python-cinderclient, python-glanceclient, python-heatclient, python-keystoneclient, python-novaclient, python-openstackclient
oslo.serialization==2.29.0 # via python-heatclient, python-keystoneclient, python-novaclient
oslo.utils==3.41.0 # via osc-lib, oslo.serialization, python-cinderclient, python-glanceclient, python-heatclient, python-keystoneclient, python-novaclient, python-openstackclient
paramiko==2.4.2 # via ansible, docker
pbr==4.1.0 # via cliff, debtcollector, keystoneauth1, openstacksdk, os-service-types, osc-lib, oslo.i18n, oslo.serialization, oslo.utils, python-cinderclient, python-glanceclient, python-heatclient, python-keystoneclient, python-novaclient, python-openstackclient, shade, stevedore
pluggy==0.13.1 # via pytest
prettytable==0.7.2 # via cliff, python-cinderclient, python-glanceclient, python-heatclient, python-novaclient
py==1.8.0 # via pytest
pyasn1==0.3.6 # via paramiko
pycparser==2.18 # via cffi
pynacl==1.1.2 # via paramiko
pyopenssl==19.0.0 # via python-glanceclient
pyparsing==2.3.0 # via cliff, cmd2, oslo.utils
pyperclip==1.7.0 # via cmd2
pytest==4.4.0 # via -r requirements.in, testinfra
python-cinderclient==4.1.0 # via python-openstackclient
python-glanceclient==2.16.0 # via python-openstackclient
python-heatclient==1.17 # via -r requirements.in
python-keystoneclient==3.19.0 # via python-openstackclient
python-novaclient==13.0.0 # via python-openstackclient
python-openstackclient==3.18.0 # via -r requirements.in
python-swiftclient==3.7.0 # via python-heatclient
python3-openid==3.1.0 # via django-allauth
pytz==2018.9 # via babel, django, oslo.serialization, oslo.utils
pyyaml==3.13 # via ansible, cliff, docker-compose, openstacksdk, os-client-config, oslo.config, oslo.serialization, python-heatclient
requests-oauthlib==1.2.0 # via django-allauth
requests==2.20.1 # via django-allauth, docker, docker-compose, icinga2api, keystoneauth1, oslo.config, python-glanceclient, python-heatclient, python-keystoneclient, python-swiftclient, requests-oauthlib
requestsexceptions==1.3.0 # via openstacksdk, os-client-config
rfc3986==1.3.1 # via oslo.config
sh==1.12.14 # via -r requirements.in
shade==1.30.0 # via -r requirements.in
simplejson==3.16.0 # via osc-lib, python-cinderclient, python-novaclient
six==1.14.0 # via bcrypt, cliff, cmd2, cryptography, debtcollector, docker, docker-compose, docker-pycreds, dockerpty, keystoneauth1, munch, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.serialization, oslo.utils, pynacl, pyopenssl, pytest, python-cinderclient, python-glanceclient, python-heatclient, python-keystoneclient, python-novaclient, python-openstackclient, python-swiftclient, stevedore, warlock, websocket-client
soupsieve==1.9.1 # via beautifulsoup4
sqlparse==0.3.0 # via django
stevedore==1.26.0 # via cliff, keystoneauth1, osc-lib, oslo.config, python-keystoneclient
testinfra==5.0.0 # via -r requirements.in
texttable==0.9.1 # via docker-compose
urllib3==1.22 # via requests
warlock==1.3.0 # via python-glanceclient
wcwidth==0.1.7 # via cmd2
websocket-client==0.56.0 # via docker, docker-compose
wrapt==1.11.1 # via debtcollector, python-glanceclient
# The following packages are considered to be unsafe in a requirements file:
# setuptools

2
tests/tox.dockerfile

@ -1,5 +1,5 @@
RUN pip install python-openstackclient python-heatclient # this is not necessary to run tests but to cleanup leftovers when tests fail
RUN pip install tox
RUN git init
COPY requirements-dev.txt tox.ini setup.cfg setup.py README.md /opt/
COPY Pipfile Pipfile.lock tox.ini setup.cfg setup.py README.md /opt/
RUN tox --notest

4
tox.ini

@ -13,8 +13,8 @@ passenv =
allowlist_externals = env
usedevelop = True
install_command = pip install {opts} {packages}
deps =
-r{toxinidir}/requirements-dev.txt
deps = pipenv
commands_pre = env PIPENV_VERBOSITY=-1 pipenv install --ignore-pipfile --dev
commands = coverage run --source=enough {envbindir}/py.test -vvv --durations 10 {posargs:tests}
coverage report --omit=*test*,*tox* --show-missing

Loading…
Cancel
Save