Skip to content

Commit 7ad484c

Browse files
authored
Upgrade requirements (#262)
* upgrade requirements * one less hash * add notes in readme
1 parent bbc296c commit 7ad484c

File tree

6 files changed

+311
-286
lines changed

6 files changed

+311
-286
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,18 @@ jobs:
3737
uses: actions/[email protected]
3838
with:
3939
path: ~/.cache/pip
40-
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements-constraints.txt') }}-${{ hashFiles('dev-requirements.txt') }}
40+
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}-${{ hashFiles('dev-requirements.txt') }}
4141
restore-keys: |
4242
${{ runner.os }}-pip-
4343
4444
- name: Install Dependencies
4545
run: |
4646
pip install -U pip wheel --progress-bar off
47-
# pip install -r requirements.txt
48-
# Have to do this because of a bug in the new pip resolver (grr!!)
49-
pip install -r dev-requirements.txt -r requirements-constraints.txt -r requirements.txt --progress-bar off
47+
pip install -r requirements.txt --progress-bar off
5048
5149
- name: Run lints
5250
run: |
51+
pip install -r dev-requirements.txt --progress-bar off
5352
black --check app.py
5453
flake8 app.py
5554
yarn prettier:check

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ front end.
3232
To install dependencies:
3333

3434
```
35+
pip install -r requirements.txt
3536
pip install -r dev-requirements.txt
3637
yarn install
3738
```
@@ -76,3 +77,14 @@ This file will automatically be read when running the Python backend.
7677

7778
For the front-end, we check the output of `yarn run build`
7879
as a `build.zip` file. This is generated by running `./bin/build.sh`.
80+
81+
## Upgrade dependencies
82+
83+
To upgrade a dependency, edit `requirements.in` and then run:
84+
85+
```
86+
pip-compile --generate-hashes requirements.in
87+
```
88+
89+
Now you should have a change in `requirements.in` _and_ in `requirements.txt`.
90+
Check in both.

dev-requirements.txt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
-r requirements.txt
2-
-c requirements-constraints.txt
3-
4-
black==21.5b0 \
5-
--hash=sha256:0e80435b8a88f383c9149ae89d671eb2095b72344b0fe8a1d61d2ff5110ed173 \
6-
--hash=sha256:9dc2042018ca10735366d944c2c12d9cad6dec74a3d5f679d09384ea185d9943
7-
flake8==3.9.2 \
8-
--hash=sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b \
9-
--hash=sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907
1+
black==21.5b0
2+
flake8==3.9.2
3+
pip-tools==6.1.0

requirements-constraints.txt

Lines changed: 0 additions & 234 deletions
This file was deleted.

0 commit comments

Comments
 (0)