Skip to content

Commit 3aebf8a

Browse files
spamegg1spamegg1
authored
Merge pull request alexmojaki#142 from alexmojaki/latest-my-deps
Upgrading things
2 parents de6b254 + 8e7385b commit 3aebf8a

File tree

6 files changed

+244
-100
lines changed

6 files changed

+244
-100
lines changed

‎.github/workflows/pytest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
runs-on: ubuntu-latest
66
strategy:
77
matrix:
8-
python-version: [3.8]
8+
python-version: [3.9]
99
steps:
1010
- uses: actions/checkout@v2
1111
- name: Set up Python ${{ matrix.python-version }}

‎Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ WORKDIR build
1111
RUN sed -i s:/static/:/static_backend/:g index.html
1212

1313
# Stage 2 - Setup server
14-
FROM ubuntu:18.04
14+
FROM ubuntu:20.04
1515

1616
RUN apt-get update
1717

@@ -21,15 +21,15 @@ RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)"-pgdg
2121
RUN apt-get update
2222

2323
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
24-
python3.8-dev \
24+
python3.9-dev \
2525
vim \
26-
python3.8-distutils \
26+
python3.9-distutils \
2727
gcc \
2828
postgresql-client-12 \
2929
git \
3030
libpq-dev
3131

32-
RUN ln -s /usr/bin/python3.8 /usr/local/bin/python
32+
RUN ln -s /usr/bin/python3.9 /usr/local/bin/python
3333
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
3434
RUN python get-pip.py
3535
RUN pip install poetry

‎backend/entrypoint.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
set -eux
44

5+
rm -f /usr/lib/python3/dist-packages/.wh*
6+
57
# We probably don't want this to be automatic but it makes life a lot easier
68
# For setting up the cloud
79
python manage.py migrate

‎backend/main/tests/test_transcript.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@
934934
"result": [
935935
{
936936
"color": "red",
937-
"text": " print('---')\n ^\nIndentationError: unindent does not match any outer indentation level\nat line 3\n\nAn `IndentationError` occurs when a given line of code is\nnot indented (aligned vertically with other lines) as expected.\n\nIn this case, the line identified above is\nless indented than the preceding one,\nand is not aligned vertically with another block of code.\n"
937+
"text": " print('---')\n ^\nIndentationError: unindent does not match any outer indentation level\nat line 3\n\nAn `IndentationError` occurs when a given line of code is\nnot indented (aligned vertically with other lines) as expected.\n\nIn this case, the line identified above is\nless indented than the preceding one,\nand is not aligned vertically with another block of code.\n"
938938
},
939939
{
940940
"color": "red",
@@ -2685,7 +2685,7 @@
26852685
"result": [
26862686
{
26872687
"color": "red",
2688-
"text": "SyntaxError: expression cannot contain assignment, perhaps you meant \"==\"?\nat line 1\n\nA `SyntaxError` occurs when Python cannot understand your code.\n\nOne of the following two possibilities could be the cause:\n1. You meant to do a comparison with == and wrote = instead.\n2. You called a function with a named argument:\n\n a_function(invalid=something)\n\nwhere `invalid` is not a valid variable name in Python\neither because it starts with a number, or is a string,\nor contains a period, etc.\n\n"
2688+
"text": " print(1 + 2 = 3)\n ^\nSyntaxError: expression cannot contain assignment, perhaps you meant \"==\"?\nat line 1\n\nA `SyntaxError` occurs when Python cannot understand your code.\n\nOne of the following two possibilities could be the cause:\n1. You meant to do a comparison with == and wrote = instead.\n2. You called a function with a named argument:\n\n a_function(invalid=something)\n\nwhere `invalid` is not a valid variable name in Python\neither because it starts with a number, or is a string,\nor contains a period, etc.\n\n"
26892689
},
26902690
{
26912691
"color": "red",
@@ -3501,7 +3501,7 @@
35013501
{
35023502
"lines": [
35033503
{
3504-
"content": "<span class=\"n\">words</span><span class=\"p\">[</span><span class=\"mi\">4</span><span class=\"p\">]</span>",
3504+
"content": "<span class=\"n n-ExecutingNode\">words</span><span class=\"p p-ExecutingNode\">[</span><span class=\"mi mi-ExecutingNode\">4</span><span class=\"p p-ExecutingNode\">]</span>",
35053505
"is_current": true,
35063506
"lineno": 1,
35073507
"type": "line"
@@ -5027,7 +5027,7 @@
50275027
{
50285028
"lines": [
50295029
{
5030-
"content": "<span class=\"s1\">&#39;Python&#39;</span><span class=\"o\">.</span><span class=\"n\">append</span><span class=\"p\">(</span><span class=\"s1\">&#39; is cool!&#39;</span><span class=\"p\">)</span>",
5030+
"content": "<span class=\"s1 s1-ExecutingNode\">&#39;Python&#39;</span><span class=\"o o-ExecutingNode\">.</span><span class=\"n n-ExecutingNode\">append</span><span class=\"p\">(</span><span class=\"s1\">&#39; is cool!&#39;</span><span class=\"p\">)</span>",
50315031
"is_current": true,
50325032
"lineno": 1,
50335033
"type": "line"
@@ -5158,7 +5158,7 @@
51585158
"result": [
51595159
{
51605160
"color": "white",
5161-
"text": "['__add__', '__class__', '__contains__', '__delattr__', '__delitem__', '__dir__', '__doc__', '__eq__', '__format__', '__ge__', '__getattribute__', '__getitem__', '__gt__', '__hash__', '__iadd__', '__imul__', '__init__', '__init_subclass__', '__iter__', '__le__', '__len__', '__lt__', '__mul__', '__ne__', '__new__', '__reduce__', '__reduce_ex__', '__repr__', '__reversed__', '__rmul__', '__setattr__', '__setitem__', '__sizeof__', '__str__', '__subclasshook__', 'append', 'clear', 'copy', 'count', 'extend', 'index', 'insert', 'pop', 'remove', 'reverse', 'sort']"
5161+
"text": "['__add__', '__class__', '__class_getitem__', '__contains__', '__delattr__', '__delitem__', '__dir__', '__doc__', '__eq__', '__format__', '__ge__', '__getattribute__', '__getitem__', '__gt__', '__hash__', '__iadd__', '__imul__', '__init__', '__init_subclass__', '__iter__', '__le__', '__len__', '__lt__', '__mul__', '__ne__', '__new__', '__reduce__', '__reduce_ex__', '__repr__', '__reversed__', '__rmul__', '__setattr__', '__setitem__', '__sizeof__', '__str__', '__subclasshook__', 'append', 'clear', 'copy', 'count', 'extend', 'index', 'insert', 'pop', 'remove', 'reverse', 'sort']"
51625162
},
51635163
{
51645164
"color": "white",
@@ -6096,7 +6096,7 @@
60966096
{
60976097
"lines": [
60986098
{
6099-
"content": "<span class=\"nb\">print</span><span class=\"p\">(</span><span class=\"mi\">1</span> <span class=\"o\">+</span> <span class=\"s2\">&quot;x&quot;</span><span class=\"p\">)</span>",
6099+
"content": "<span class=\"nb\">print</span><span class=\"p\">(</span><span class=\"mi mi-ExecutingNode\">1</span><span class=\" -ExecutingNode\"> </span><span class=\"o o-ExecutingNode\">+</span><span class=\" -ExecutingNode\"> </span><span class=\"s2 s2-ExecutingNode\">&quot;x&quot;</span><span class=\"p\">)</span>",
61006100
"is_current": true,
61016101
"lineno": 1,
61026102
"type": "line"
@@ -14998,7 +14998,7 @@
1499814998
"result": [
1499914999
{
1500015000
"color": "red",
15001-
"text": " is_friend = name == \"Alice\" or\n ^\nSyntaxError: invalid syntax\nat line 1\n\nA `SyntaxError` occurs when Python cannot understand your code.\n\nI make an effort below to guess what caused the problem\nbut I might guess incorrectly.\n\nThere appears to be a Python identifier (variable name)\nimmediately following a string.\nI suspect that you were trying to use a quote inside a string\nthat was enclosed in quotes of the same kind.\n"
15001+
"text": " is_friend = name == \"Alice\" or\n ^\nSyntaxError: invalid syntax\nat line 1\n\nA `SyntaxError` occurs when Python cannot understand your code.\n\nI make an effort below to guess what caused the problem\nbut I might guess incorrectly.\n\nThere appears to be a Python identifier (variable name)\nimmediately following a string.\nI suspect that you were trying to use a quote inside a string\nthat was enclosed in quotes of the same kind.\n"
1500215002
},
1500315003
{
1500415004
"color": "red",
@@ -15515,7 +15515,7 @@
1551515515
"result": [
1551615516
{
1551715517
"color": "red",
15518-
"text": " \"XOX\n ^\nSyntaxError: EOL while scanning string literal\nat line 7\n\nA `SyntaxError` occurs when Python cannot understand your code.\n\nYou starting writing a string with a single or double quote\nbut never ended the string with another quote on that line.\n"
15518+
"text": " \"XOX\n ^\nSyntaxError: EOL while scanning string literal\nat line 7\n\nA `SyntaxError` occurs when Python cannot understand your code.\n\nYou starting writing a string with a single or double quote\nbut never ended the string with another quote on that line.\n"
1551915519
},
1552015520
{
1552115521
"color": "red",
@@ -15984,7 +15984,7 @@
1598415984
{
1598515985
"lines": [
1598615986
{
15987-
"content": "<span class=\"mi\">12</span> <span class=\"o\">+</span> <span class=\"s1\">&#39;34&#39;</span>",
15987+
"content": "<span class=\"mi mi-ExecutingNode\">12</span><span class=\" -ExecutingNode\"> </span><span class=\"o o-ExecutingNode\">+</span><span class=\" -ExecutingNode\"> </span><span class=\"s1 s1-ExecutingNode\">&#39;34&#39;</span>",
1598815988
"is_current": true,
1598915989
"lineno": 1,
1599015990
"type": "line"

0 commit comments

Comments
 (0)