Skip to content

Commit

Permalink
deps
Browse files Browse the repository at this point in the history
  • Loading branch information
sfermigier committed Aug 13, 2020
1 parent 6f0debd commit 5d99081
Show file tree
Hide file tree
Showing 6 changed files with 93 additions and 94 deletions.
7 changes: 6 additions & 1 deletion Makefile
Expand Up @@ -53,6 +53,11 @@ test-with-coverage:
py.test $(PYTEST_MULTI) --cov $(PKG)
@echo ""

test-with-typeguard:
@echo "--> Running Python tests with typeguard"
pytest --typeguard-packages=abilian
@echo ""

vagrant-tests:
vagrant up
vagrant ssh -c /vagrant/deploy/vagrant_test.sh
Expand Down Expand Up @@ -181,7 +186,7 @@ release:
update-deps:
pip install -U pip setuptools wheel
poetry update
poetry run pip freeze > etc/requirements.txt
poetry run pip freeze | grep -v abilian-core > etc/requirements.txt
yarn upgrade -s --no-progress

sync-deps:
Expand Down
16 changes: 8 additions & 8 deletions abilian/testing/fixtures.py
Expand Up @@ -63,10 +63,10 @@ def test_request_context(app: Flask) -> Iterator[RequestContext]:
yield ctx


@fixture
def req_ctx(app: Flask) -> Iterator[RequestContext]:
with app.test_request_context() as _req_ctx:
yield _req_ctx
# @fixture
# def req_ctx(app: Flask) -> Iterator[RequestContext]:
# with app.test_request_context() as _req_ctx:
# yield _req_ctx


@fixture
Expand Down Expand Up @@ -96,10 +96,10 @@ def db_session(db: SQLAlchemy) -> Session:
return db.session


@fixture
def client(app: Flask) -> FlaskClient:
"""Return a Web client, used for testing."""
return app.test_client()
# @fixture
# def client(app: Flask) -> FlaskClient:
# """Return a Web client, used for testing."""
# return app.test_client()


@fixture
Expand Down
14 changes: 6 additions & 8 deletions etc/requirements.txt
@@ -1,5 +1,3 @@
# Editable install with no version control (abilian-core==0.11.6)
-e /Users/fermigier/envs/abilian-core/lib/python3.7/site-packages
alabaster==0.7.12
alembic==1.4.2
amqp==2.6.1
Expand Down Expand Up @@ -55,7 +53,7 @@ Flask-WTF==0.12
gitchangelog==3.0.4
honcho==1.0.1
html5lib==1.1
hyperlink==20.0.0
hyperlink==20.0.1
identify==1.4.25
idna==2.10
imagesize==1.2.0
Expand All @@ -64,7 +62,7 @@ incremental==17.5.0
infinity==1.5
iniconfig==1.0.1
intervals==0.9.0
isort==5.2.2
isort==5.4.0
itsdangerous==1.1.0
jdcal==1.4.1
Jinja2==2.11.2
Expand Down Expand Up @@ -101,6 +99,7 @@ Pygments==2.6.1
pyparsing==2.4.7
pytest==6.0.1
pytest-cov==2.10.0
pytest-flask==1.0.0
pytest-forked==1.3.0
pytest-randomly==3.4.1
pytest-repeat==0.8.0
Expand All @@ -117,7 +116,7 @@ restructuredtext-lint==1.3.1
sentry-sdk==0.16.3
six==1.15.0
snowballstemmer==2.0.0
Sphinx==3.1.2
Sphinx==3.2.0
sphinx-rtd-theme==0.5.0
sphinxcontrib-applehelp==1.0.2
sphinxcontrib-devhelp==1.0.2
Expand All @@ -131,18 +130,17 @@ sqlparse==0.3.1
toml==0.10.1
toolz==0.10.0
towncrier==19.2.0
tox==3.18.1
tox==3.19.0
tqdm==4.48.2
typed-ast==1.4.1
typeguard==2.9.1
typing==3.7.4.3
typing-extensions==3.7.4.2
untokenize==0.1.1
urllib3==1.25.10
validate-email==1.3
validators==0.17.1
vine==1.3.0
virtualenv==20.0.29
virtualenv==20.0.30
webassets==0.12.1
webencodings==0.5.1
Werkzeug==0.16.1
Expand Down
65 changes: 36 additions & 29 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pyproject.toml
Expand Up @@ -108,6 +108,7 @@ Flask-DebugToolbar = ">=0.10"

# For running tests (pytest and friends)
pytest = ">=2.4.0"
pytest-flask = "^1"
pytest-xdist = "*"
pytest-randomly = "*"
pytest-repeat = "*"
Expand Down

0 comments on commit 5d99081

Please sign in to comment.