Skip to content

Commit

Permalink
working requests, fix lack of effective venv in 2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
maxbelanger committed May 7, 2024
1 parent 3a3a19d commit 419d263
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
28 changes: 15 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
pip install flake8 pytest
pip install -r requirements.txt
pip install -r test/requirements.txt
python setup.py install
python setup.py install --user
- name: Run Linter
run: |
flake8 setup.py dropbox example test
Expand Down Expand Up @@ -73,17 +73,17 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-13, windows-latest]
python-version: [3.5, 3.6, 3.7, 3.8, pypy-3.7]
exclude:
- os: windows-latest
python-version: 3.6
include:
- os: ubuntu-20.04
python-version: 3.7
- os: ubuntu-20.04
python-version: 2.7
steps:
os: [macos-13, windows-latest]
python-version: [3.5, 3.6, 3.7, 3.8, pypy-3.7]
exclude:
- os: windows-latest
python-version: 3.6
include:
- os: ubuntu-20.04
python-version: 3.7
- os: ubuntu-20.04
python-version: 2.7
steps:
- uses: actions/[email protected]
- if: ${{ matrix.python-version == '2.7' }}
name: Setup Python environment (2.7)
Expand All @@ -102,7 +102,9 @@ jobs:
pip install flake8 pytest
pip install -r requirements.txt
pip install -r test/requirements.txt
python setup.py install
pip install setuptools wheel twine # XXX
python setup.py bdist_wheel # XXX
python setup.py install --user
- name: Run Integration Tests
env:
LEGACY_USER_DROPBOX_TOKEN: ${{ secrets.LEGACY_USER_DROPBOX_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Dependencies required for installation (keep in sync with setup.py)
requests>=2.27
requests<2.30
urllib3<2
six >= 1.12.0
stone>=2,<3.3.3
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
version = eval(line.split('=', 1)[1].strip()) # pylint: disable=eval-used

install_reqs = [
'requests>=2.27',
'requests<2.30',
'urllib3<2',
'six >= 1.12.0',
'stone>=2,<3.3.3',
Expand Down

0 comments on commit 419d263

Please sign in to comment.