Skip to content

Commit 419d263

Browse files
committed
working requests, fix lack of effective venv in 2.7
1 parent 3a3a19d commit 419d263

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
pip install flake8 pytest
4040
pip install -r requirements.txt
4141
pip install -r test/requirements.txt
42-
python setup.py install
42+
python setup.py install --user
4343
- name: Run Linter
4444
run: |
4545
flake8 setup.py dropbox example test
@@ -73,17 +73,17 @@ jobs:
7373
runs-on: ${{ matrix.os }}
7474
strategy:
7575
matrix:
76-
os: [macos-13, windows-latest]
77-
python-version: [3.5, 3.6, 3.7, 3.8, pypy-3.7]
78-
exclude:
79-
- os: windows-latest
80-
python-version: 3.6
81-
include:
82-
- os: ubuntu-20.04
83-
python-version: 3.7
84-
- os: ubuntu-20.04
85-
python-version: 2.7
86-
steps:
76+
os: [macos-13, windows-latest]
77+
python-version: [3.5, 3.6, 3.7, 3.8, pypy-3.7]
78+
exclude:
79+
- os: windows-latest
80+
python-version: 3.6
81+
include:
82+
- os: ubuntu-20.04
83+
python-version: 3.7
84+
- os: ubuntu-20.04
85+
python-version: 2.7
86+
steps:
8787
- uses: actions/checkout@v2.3.4
8888
- if: ${{ matrix.python-version == '2.7' }}
8989
name: Setup Python environment (2.7)
@@ -102,7 +102,9 @@ jobs:
102102
pip install flake8 pytest
103103
pip install -r requirements.txt
104104
pip install -r test/requirements.txt
105-
python setup.py install
105+
pip install setuptools wheel twine # XXX
106+
python setup.py bdist_wheel # XXX
107+
python setup.py install --user
106108
- name: Run Integration Tests
107109
env:
108110
LEGACY_USER_DROPBOX_TOKEN: ${{ secrets.LEGACY_USER_DROPBOX_TOKEN }}

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Dependencies required for installation (keep in sync with setup.py)
2-
requests>=2.27
2+
requests<2.30
33
urllib3<2
44
six >= 1.12.0
55
stone>=2,<3.3.3

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
version = eval(line.split('=', 1)[1].strip()) # pylint: disable=eval-used
2626

2727
install_reqs = [
28-
'requests>=2.27',
28+
'requests<2.30',
2929
'urllib3<2',
3030
'six >= 1.12.0',
3131
'stone>=2,<3.3.3',

0 commit comments

Comments
 (0)