Skip to content

Commit

Permalink
fix: better python2 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
joamag committed Apr 5, 2021
1 parent 1b36b09 commit 50a83b0
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 7 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/deploy.yml
Expand Up @@ -14,8 +14,14 @@ jobs:
steps:
- uses: actions/checkout@v1
- run: python --version
- run: pip install -r requirements.txt
- run: pip install -r extra.txt
- run: |
pip install -r requirements.txt
pip install -r extra.txt
if: matrix.python-version != '2.7'
- run: |
pip install -r requirements.py2.txt
pip install -r extra.py2.txt
if: matrix.python-version == '2.7'
- run: ADAPTER=tiny HTTPBIN=httpbin.bemisc.com python setup.py test
- run: pip install twine wheel
- run: python setup.py sdist bdist_wheel
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/main.yml
Expand Up @@ -11,6 +11,12 @@ jobs:
steps:
- uses: actions/checkout@v1
- run: python --version
- run: pip install -r requirements.txt
- run: pip install -r extra.txt
- run: |
pip install -r requirements.txt
pip install -r extra.txt
if: matrix.python-version != '2.7'
- run: |
pip install -r requirements.py2.txt
pip install -r extra.py2.txt
if: matrix.python-version == '2.7'
- run: ADAPTER=tiny HTTPBIN=httpbin.bemisc.com python setup.py test
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -22,8 +22,8 @@ before_install:
- pip install --upgrade pip setuptools
install:
- if [[ $TRAVIS_PYTHON_VERSION == pypy* ]]; then pip install "tinydb<4"; fi
- pip install -r requirements.txt
- pip install -r extra.txt
- pip install -r requirements.py2.txt
- pip install -r extra.py2.txt
- if [[ $TRAVIS_PYTHON_VERSION != pypy* ]]; then pip install coveralls; fi
env:
- ADAPTER=mongo HTTPBIN=httpbin.bemisc.com
Expand Down
1 change: 1 addition & 0 deletions extra.py2.txt
@@ -0,0 +1 @@
netius
5 changes: 5 additions & 0 deletions requirements.py2.txt
@@ -0,0 +1,5 @@
flask
pymongo
redis
pika
tinydb<4
2 changes: 1 addition & 1 deletion requirements.txt
Expand Up @@ -2,4 +2,4 @@ flask
pymongo
redis
pika
tinydb<4
tinydb

0 comments on commit 50a83b0

Please sign in to comment.