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.

Sign up for GitHub

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

Test cryptography 3.0 #219

Closed
wants to merge 1 commit into from
Closed

Test cryptography 3.0 #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ matrix:
language: python
python: '3.8'
env: OLD_CRYPTOGRAPHY=2.6.1
- os: linux
language: python
python: '3.8'
env: OLD_CRYPTOGRAPHY=2.9.2
- os: linux
language: python
python: '3.8'
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ test_script:
# This is pretty lazy -- we don't go into an empty dir or anything.
# I think pytest will test the installed version? But I dunno the
# coverage will actually work right if just given as "trustme"
- "python -u -m pytest -W error -ra -v -s tests --cov=trustme --cov=tests --cov-config=.coveragerc"
- "python -u -m pytest -ra -v -s tests --cov=trustme --cov=tests --cov-config=.coveragerc"
- "codecov -F windows"

branches:
Expand Down
2 changes: 1 addition & 1 deletion ci/travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ else
mkdir empty
pushd empty
INSTALLDIR=$(python -c "import os, trustme; print(os.path.dirname(trustme.__file__))")
pytest -W error -ra -s ../tests --cov="$INSTALLDIR" --cov=../tests --cov-config="../.coveragerc"
pytest -ra -s ../tests --cov="$INSTALLDIR" --cov=../tests --cov-config="../.coveragerc"

pip install codecov
codecov -F $(uname | tr A-Z a-z)
Expand Down
5 changes: 5 additions & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
[bdist_wheel]
universal=1

[tool:pytest]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW I dislike putting a pytest config into a packaging-related file.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's pending pending deprecation pytest-dev/pytest#3523

the pyproject.toml is preferred

filterwarnings =
error
ignore:Python 2 is no longer supported by the Python core team. Support for it is now deprecated in cryptography, and will be removed in a future release.:UserWarning:cryptography
2 changes: 1 addition & 1 deletion test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ atomicwrites==1.4.0 # via pytest
attrs==19.3.0 # via pytest, service-identity
cffi==1.14.1 # via cryptography
coverage==5.2.1 # via pytest-cov
cryptography==2.9.2 # via -r test-requirements.in, pyopenssl, service-identity
cryptography==3.0 # via -r test-requirements.in, pyopenssl, service-identity
futures==3.1.1 # via -r test-requirements.in
idna==2.10 # via -r test-requirements.in
importlib-metadata==1.7.0 # via pytest
Expand Down