Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the OwnCA requirements #91

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-versions: [ "3.7", "3.8", "3.9", "3.10", ]
python-versions: [ "3.8", "3.9", "3.10", ]

steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ all-tests:
coverage xml -i
coverage html -i

py37-tests:
tox -re py37,pep8
coverage xml -i
coverage html -i

py38-tests:
tox -re py38,pep8
coverage xml -i
Expand Down Expand Up @@ -45,5 +40,6 @@ docs:
@echo "\033[95m\n\nBuild successful! View the docs homepage at docs/_build/html/index.html.\n\033[0m"

requirements:
pipenv lock
pipenv requirements > requirements.txt
pipenv requirements --dev-only > requirements-dev.txt
6 changes: 3 additions & 3 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ verify_ssl = true

[dev-packages]
pytest = "*"
coverage = "==5.1"
coverage = "*"
tox = "*"
flake8 = "==3.9.2"
flake8 = "*"
codecov = "*"
sphinx = "*"
sphinx-rtd-theme = "*"
twine = "*"
mypy = "*"
isort = "*"
black = "==21.12b0"
black = "*"
pre-commit = "*"

[packages]
Expand Down
751 changes: 405 additions & 346 deletions Pipfile.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ classifiers = [
"Natural Language :: English",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand Down
152 changes: 70 additions & 82 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,86 +1,74 @@
#
# These requirements were autogenerated by pipenv
# To regenerate from the project's Pipfile, run:
#
# pipenv lock --requirements --dev
#

# Note: in pipenv 2020.x, "--dev" changed to emit both default and development
# requirements. To emit only development requirements, pass "--dev-only".

-i https://pypi.org/simple/
alabaster==0.7.12
attrs==22.2.0; python_version >= '3.6'
babel==2.11.0; python_version >= '3.6'
black==21.12b0
bleach==5.0.1; python_version >= '3.7'
certifi==2022.12.7; python_version >= '3.6'
cffi==1.15.1
cfgv==3.3.1; python_full_version >= '3.6.1'
charset-normalizer==2.1.1; python_version >= '3.6'
click==8.1.3; python_version >= '3.7'
-i https://pypi.org/simple
alabaster==0.7.13 ; python_version >= '3.6'
attrs==22.2.0 ; python_version >= '3.6'
babel==2.12.1 ; python_version >= '3.7'
black==23.1.0
bleach==6.0.0 ; python_version >= '3.7'
cachetools==5.3.0 ; python_version ~= '3.7'
certifi==2022.12.7 ; python_version >= '3.6'
cfgv==3.3.1 ; python_full_version >= '3.6.1'
chardet==5.1.0 ; python_version >= '3.7'
charset-normalizer==3.0.1 ; python_version >= '3.6'
click==8.1.3 ; python_version >= '3.7'
codecov==2.1.12
commonmark==0.9.1
coverage==5.1
cryptography==3.4.8
colorama==0.4.6 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'
coverage==7.2.1
distlib==0.3.6
docutils==0.17.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
filelock==3.9.0; python_version >= '3.7'
flake8==3.9.2
identify==2.5.12; python_version >= '3.7'
idna==3.4; python_version >= '3.5'
imagesize==1.4.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
importlib-metadata==6.0.0; python_version >= '3.7'
iniconfig==2.0.0; python_version >= '3.7'
isort==5.10.1
jaraco.classes==3.2.3; python_version >= '3.7'
jeepney==0.8.0; sys_platform == 'linux'
jinja2==3.1.2; python_version >= '3.7'
keyring==23.13.1; python_version >= '3.7'
markupsafe==2.1.1; python_version >= '3.7'
mccabe==0.6.1; python_version >= '3.6'
more-itertools==9.0.0; python_version >= '3.7'
mypy-extensions==0.4.3
mypy==0.982
nodeenv==1.7.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'
packaging==23.0; python_version >= '3.7'
pathspec==0.10.3; python_version >= '3.7'
pkginfo==1.9.6; python_version >= '3.6'
platformdirs==2.6.2; python_version >= '3.7'
pluggy==1.0.0; python_version >= '3.6'
pre-commit==2.20.0
py==1.11.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
pycodestyle==2.7.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
pycparser==2.21; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
pyflakes==2.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
pygments==2.14.0; python_version >= '3.6'
pytest==7.1.3
pytz==2022.7
pyyaml==6.0; python_version >= '3.6'
readme-renderer==37.3; python_version >= '3.7'
requests-toolbelt==0.10.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
requests==2.28.1; python_version >= '3.7' and python_version < '4'
rfc3986==2.0.0; python_version >= '3.7'
rich==13.0.1; python_version >= '3.7'
secretstorage==3.3.3; sys_platform == 'linux'
setuptools==65.6.3; python_version >= '3.7'
six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
docutils==0.18.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
exceptiongroup==1.1.0 ; python_version < '3.11'
filelock==3.9.0 ; python_version >= '3.7'
flake8==6.0.0
identify==2.5.18 ; python_version >= '3.7'
idna==3.4 ; python_version >= '3.5'
imagesize==1.4.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
importlib-metadata==6.0.0 ; python_version >= '3.7'
iniconfig==2.0.0 ; python_version >= '3.7'
isort==5.12.0
jaraco.classes==3.2.3 ; python_version >= '3.7'
jinja2==3.1.2 ; python_version >= '3.7'
keyring==23.13.1 ; python_version >= '3.7'
markdown-it-py==2.2.0 ; python_version >= '3.7'
markupsafe==2.1.2 ; python_version >= '3.7'
mccabe==0.7.0 ; python_version >= '3.6'
mdurl==0.1.2 ; python_version >= '3.7'
more-itertools==9.1.0 ; python_version >= '3.7'
mypy==1.0.1
mypy-extensions==1.0.0 ; python_version >= '3.5'
nodeenv==1.7.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'
packaging==23.0 ; python_version >= '3.7'
pathspec==0.11.0 ; python_version >= '3.7'
pkginfo==1.9.6 ; python_version >= '3.6'
platformdirs==3.0.0 ; python_version >= '3.7'
pluggy==1.0.0 ; python_version >= '3.6'
pre-commit==3.1.1
pycodestyle==2.10.0 ; python_version >= '3.6'
pyflakes==3.0.1 ; python_version >= '3.6'
pygments==2.14.0 ; python_version >= '3.6'
pyproject-api==1.5.0 ; python_version >= '3.7'
pytest==7.2.1
pyyaml==6.0 ; python_version >= '3.6'
readme-renderer==37.3 ; python_version >= '3.7'
requests==2.28.2 ; python_version >= '3.7' and python_version < '4'
requests-toolbelt==0.10.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
rfc3986==2.0.0 ; python_version >= '3.7'
rich==13.3.1 ; python_full_version >= '3.7.0'
setuptools==67.4.0 ; python_version >= '3.7'
six==1.16.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
snowballstemmer==2.2.0
sphinx-rtd-theme==1.0.0
sphinx==5.2.3
sphinxcontrib-applehelp==1.0.3; python_version >= '3.8'
sphinxcontrib-devhelp==1.0.2; python_version >= '3.5'
sphinxcontrib-htmlhelp==2.0.0; python_version >= '3.6'
sphinxcontrib-jsmath==1.0.1; python_version >= '3.5'
sphinxcontrib-qthelp==1.0.3; python_version >= '3.5'
sphinxcontrib-serializinghtml==1.1.5; python_version >= '3.5'
toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
tomli==1.2.3; python_version >= '3.6'
tox==3.25.1
twine==4.0.1
typing-extensions==4.4.0; python_version >= '3.10'
urllib3==1.26.13; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
virtualenv==20.17.1; python_version >= '3.6'
voluptuous==0.13.1
sphinx==6.1.3
sphinx-rtd-theme==1.2.0
sphinxcontrib-applehelp==1.0.4 ; python_version >= '3.8'
sphinxcontrib-devhelp==1.0.2 ; python_version >= '3.5'
sphinxcontrib-htmlhelp==2.0.1 ; python_version >= '3.8'
sphinxcontrib-jquery==2.0.0 ; python_version >= '3.1'
sphinxcontrib-jsmath==1.0.1 ; python_version >= '3.5'
sphinxcontrib-qthelp==1.0.3 ; python_version >= '3.5'
sphinxcontrib-serializinghtml==1.1.5 ; python_version >= '3.5'
tomli==2.0.1 ; python_version < '3.11'
tox==4.4.6
twine==4.0.2
typing-extensions==4.5.0 ; python_version >= '3.7'
urllib3==1.26.14 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
virtualenv==20.20.0 ; python_version >= '3.7'
webencodings==0.5.1
zipp==3.11.0; python_version >= '3.7'
zipp==3.15.0 ; python_version >= '3.7'
11 changes: 2 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
#
# These requirements were autogenerated by pipenv
# To regenerate from the project's Pipfile, run:
#
# pipenv lock --requirements
#

-i https://pypi.org/simple/
-i https://pypi.org/simple
cffi==1.15.1
cryptography==3.4.8
pycparser==2.21; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
pycparser==2.21 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
voluptuous==0.13.1
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ def run_tests(self):
"Natural Language :: English",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py37,py38,py39,,py310,pep8,lint,integrations
envlist = py38,py39,,py310,pep8,lint,integrations

[flake8]
exclude = ownca/__init__.py,venv,.venv,settings.py,.git,.tox,dist,docs,*lib/python*,*egg,build,tools
Expand Down Expand Up @@ -31,7 +31,6 @@ commands = coverage run -m pytest --pdb -vv tests/unit tests/integrations

[gh-actions]
python =
3.7: py37,pep8,lint,integrations
3.8: py38,pep8,lint,integrations
3.9: py39,pep8,lint,integrations
3.10: py310,pep8,lint,integrations