Skip to content

Commit

Permalink
Merge pull request #107 from jjpaulo2/master
Browse files Browse the repository at this point in the history
Fixes #106 - Solved dependencies conflicts from pytest version
  • Loading branch information
illume committed Nov 9, 2020
2 parents bd71828 + 6014927 commit 144b248
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion README.rst
Expand Up @@ -33,6 +33,7 @@ Set up the required packages::
pip install -r requirements.dev.txt
pip install -e .

If you would get some error related to *pip's conflic checker update* after execute **pip install -r requirements.dev.txt**, add the flag **--use-feature=2020-resolver** to the end of the command.

For now yuicompressor is needed for css compression, and
imagamagick and optipng are needed for creating and optimizing image thumbnails::
Expand All @@ -44,8 +45,13 @@ imagamagick and optipng are needed for creating and optimizing image thumbnails:
Environment setup
=================

cp example.env .env
Define a **.env** file based on the **example.env** file.

::

cp example.env .env

If you get some errors while executing the tests, just define the **APP_SECRET_KEY** variable on the **.env** file. You can define any value, like **"a"** or **"s3cret-stuff-blah"**.

Tool setup
==========
Expand Down
2 changes: 1 addition & 1 deletion requirements.dev.txt
Expand Up @@ -5,7 +5,7 @@ mock==2.0.0
ipdb==0.11
pep8==1.7.1
pylint==1.8.2
pytest==3.4.0
pytest
pytest-cache==1.0
pytest-cov==2.5.1
pytest-flask==0.15.0
Expand Down

0 comments on commit 144b248

Please sign in to comment.