Skip to content

Commit f4ca325

Browse files
Revert "Merge branch 'RunestoneInteractive:master' into master"
This reverts commit 36d9e27, reversing changes made to 33aada5.
1 parent 36d9e27 commit f4ca325

56 files changed

Lines changed: 269 additions & 2286 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Our goal is to have unit tests which rely on Selenium (a library that helps simu
162162

163163
**To run tests:**
164164

165-
* Make sure the directory containing the ChromeDriver executable is in your ``PATH`` environment variable. e.g. ``PATH=$PATH:path/to/chromedriver`` at your command line (or edit your ``.bash_profile``).
165+
* Make sure the directory containing the PhantomJS executable is in your ``PATH`` environment variable. e.g. ``PATH=$PATH:path/to/virtualenv/directory/where/it/is/here`` at your command line (or edit your ``.bash_profile``). It should live in the site-packages/selenium/webdriver/ directory of your virtualenv.
166166

167167
* Check out the existing tests, e.g. the ``test_question.py`` file that tests the Question directive, which you can find at the path ``/runestone/question/test/test_question.py``, for an example.
168168

codechat_config.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# ************************************************
2+
# |docname| - Configuration for a CodeChat project
3+
# ************************************************
4+
# This file defines the configuration for a CodeChat project. In addition to allowing standard JSON objects, it also allows Python-style comments and any valid Python literal.
5+
#
6+
# The file must contain a single dict, with the following keys:
7+
{
8+
# ``source_path``: optional; defaults to ``.``. A path to the root of the source tree. Relative paths are rooted in the directory containing this file.
9+
"source_path": ".",
10+
11+
# ``output_path``: required. A path to the root of the HTML output produced by this renderer. Relative paths are rooted in the directory containing this file.
12+
"output_path": "build/RunestoneComponents",
13+
14+
# ``args``: required. A list of arguments to invoke the renderer. Each element of the list must be a string. Each string may optionally contain the following replacement values:
15+
#
16+
# - ``{project_path}``: an absolute path to the directory containing this file.
17+
# - ``{source_path}``: the ``source_path`` above, but as an absolute path.
18+
# - ``{output_path}``: the ``output_path`` above, but as an absolute path.
19+
"args": ["runestone", "build"],
20+
21+
# ``html_ext``: optional; defaults to ``.html``. The extension used by this renderer when generating HTML files.
22+
#"html_ext": ".html",
23+
}

codechat_config.yaml

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

index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Misc
4646
.gitignore
4747
.readthedocs.yml
4848
conf.py
49-
codechat_config.yaml
49+
codechat_config.json
5050
requirements-dev.in
5151
requirements.in
5252
webpack.config.js

requirements-dev.txt

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.9
2+
# This file is autogenerated by pip-compile
33
# To update, run:
44
#
55
# pip-compile --output-file=requirements-dev.txt requirements-dev.in requirements.in
66
#
77
alabaster==0.7.12
88
# via sphinx
9-
astroid==2.6.5
9+
astroid==2.5.6
1010
# via pylint
11-
attrs==21.2.0
11+
attrs==20.3.0
1212
# via pytest
1313
babel==2.9.1
1414
# via sphinx
15-
bleach==3.3.1
15+
bleach==3.3.0
1616
# via readme-renderer
17-
certifi==2021.5.30
17+
certifi==2020.12.5
1818
# via requests
19-
charset-normalizer==2.0.3
19+
chardet==4.0.0
2020
# via requests
21-
click==8.0.1
21+
click==7.1.2
2222
# via
2323
# -r requirements.in
2424
# pip-tools
25-
codechat==1.8.8
25+
codechat==1.8.6
2626
# via -r requirements.in
2727
cogapp==3.0.0
2828
# via -r requirements.in
@@ -35,33 +35,33 @@ docutils==0.16
3535
# sphinx
3636
easyprocess==0.3
3737
# via pyvirtualdisplay
38-
greenlet==1.1.0
38+
greenlet==1.0.0
3939
# via sqlalchemy
40-
idna==3.2
40+
idna==2.10
4141
# via requests
4242
imagesize==1.2.0
4343
# via sphinx
44-
importlib-metadata==4.6.1
44+
importlib-metadata==4.0.1
4545
# via
4646
# keyring
4747
# twine
4848
iniconfig==1.1.1
4949
# via pytest
50-
isort==5.9.3
50+
isort==5.8.0
5151
# via pylint
52-
jinja2==3.0.1
52+
jinja2==2.11.3
5353
# via sphinx
5454
keyring==23.0.1
5555
# via twine
5656
lazy-object-proxy==1.6.0
5757
# via astroid
5858
lxml==4.6.3
5959
# via codechat
60-
markupsafe==2.0.1
60+
markupsafe==1.1.1
6161
# via jinja2
6262
mccabe==0.6.1
6363
# via pylint
64-
packaging==21.0
64+
packaging==20.9
6565
# via
6666
# bleach
6767
# pytest
@@ -70,47 +70,47 @@ paver==1.3.4
7070
# via
7171
# -r requirements.in
7272
# sphinxcontrib-paverutils
73-
pep517==0.11.0
73+
pep517==0.10.0
7474
# via pip-tools
75-
pip-tools==6.2.0
75+
pip-tools==6.1.0
7676
# via -r requirements-dev.in
77-
pkginfo==1.7.1
77+
pkginfo==1.7.0
7878
# via twine
7979
pluggy==0.13.1
8080
# via pytest
8181
py==1.10.0
8282
# via pytest
83-
pygments==2.9.0
83+
pygments==2.8.1
8484
# via
8585
# codechat
8686
# readme-renderer
8787
# sphinx
88-
pylint==2.9.6
88+
pylint==2.8.2
8989
# via -r requirements-dev.in
9090
pyparsing==2.4.7
9191
# via packaging
92-
pytest==6.2.4
92+
pytest==6.2.3
9393
# via -r requirements-dev.in
9494
pytz==2021.1
9595
# via babel
96-
pyvirtualdisplay==2.2
96+
pyvirtualdisplay==2.1
9797
# via -r requirements-dev.in
9898
readme-renderer==29.0
9999
# via
100100
# -r requirements-dev.in
101101
# twine
102-
requests==2.26.0
102+
requests-toolbelt==0.9.1
103+
# via twine
104+
requests==2.25.1
103105
# via
104106
# requests-toolbelt
105107
# sphinx
106108
# twine
107-
requests-toolbelt==0.9.1
108-
# via twine
109-
rfc3986==1.5.0
109+
rfc3986==1.4.0
110110
# via twine
111111
selenium==3.141.0
112112
# via -r requirements-dev.in
113-
six==1.16.0
113+
six==1.15.0
114114
# via
115115
# -r requirements.in
116116
# bleach
@@ -126,41 +126,38 @@ sphinxcontrib-applehelp==1.0.2
126126
# via sphinx
127127
sphinxcontrib-devhelp==1.0.2
128128
# via sphinx
129-
sphinxcontrib-htmlhelp==2.0.0
129+
sphinxcontrib-htmlhelp==1.0.3
130130
# via sphinx
131131
sphinxcontrib-jsmath==1.0.1
132132
# via sphinx
133133
sphinxcontrib-paverutils==1.17.0
134134
# via -r requirements.in
135135
sphinxcontrib-qthelp==1.0.3
136136
# via sphinx
137-
sphinxcontrib-serializinghtml==1.1.5
137+
sphinxcontrib-serializinghtml==1.1.4
138138
# via sphinx
139-
sqlalchemy==1.4.22
139+
sqlalchemy==1.4.12
140140
# via -r requirements.in
141141
toml==0.10.2
142142
# via
143+
# pep517
143144
# pylint
144145
# pytest
145-
tomli==1.2.0
146-
# via pep517
147-
tqdm==4.61.2
146+
tqdm==4.60.0
148147
# via twine
149-
twine==3.4.2
148+
twine==3.4.1
150149
# via -r requirements-dev.in
151-
urllib3==1.26.6
150+
urllib3==1.26.4
152151
# via
153152
# requests
154153
# selenium
155154
webencodings==0.5.1
156155
# via bleach
157156
wheel==0.36.2
158-
# via
159-
# -r requirements-dev.in
160-
# pip-tools
157+
# via -r requirements-dev.in
161158
wrapt==1.12.1
162159
# via astroid
163-
zipp==3.5.0
160+
zipp==3.4.1
164161
# via importlib-metadata
165162

166163
# The following packages are considered to be unsafe in a requirements file:

requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
click
55
Paver>=1.2.4
66
six>1.12
7-
Sphinx<4.0.0
7+
Sphinx>=2.0.0
88
sphinxcontrib-paverutils>=1.17
99
cogapp>=2.5
1010
SQLAlchemy>=1.4.0

requirements.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.9
2+
# This file is autogenerated by pip-compile
33
# To update, run:
44
#
55
# pip-compile --output-file=requirements.txt requirements.in
@@ -8,49 +8,49 @@ alabaster==0.7.12
88
# via sphinx
99
babel==2.9.1
1010
# via sphinx
11-
certifi==2021.5.30
11+
certifi==2020.12.5
1212
# via requests
13-
charset-normalizer==2.0.3
13+
chardet==4.0.0
1414
# via requests
15-
click==8.0.1
15+
click==7.1.2
1616
# via -r requirements.in
17-
codechat==1.8.8
17+
codechat==1.8.6
1818
# via -r requirements.in
1919
cogapp==3.0.0
2020
# via -r requirements.in
2121
docutils==0.16
2222
# via
2323
# codechat
2424
# sphinx
25-
greenlet==1.1.0
25+
greenlet==1.0.0
2626
# via sqlalchemy
27-
idna==3.2
27+
idna==2.10
2828
# via requests
2929
imagesize==1.2.0
3030
# via sphinx
31-
jinja2==3.0.1
31+
jinja2==2.11.3
3232
# via sphinx
3333
lxml==4.6.3
3434
# via codechat
35-
markupsafe==2.0.1
35+
markupsafe==1.1.1
3636
# via jinja2
37-
packaging==21.0
37+
packaging==20.9
3838
# via sphinx
3939
paver==1.3.4
4040
# via
4141
# -r requirements.in
4242
# sphinxcontrib-paverutils
43-
pygments==2.9.0
43+
pygments==2.8.1
4444
# via
4545
# codechat
4646
# sphinx
4747
pyparsing==2.4.7
4848
# via packaging
4949
pytz==2021.1
5050
# via babel
51-
requests==2.26.0
51+
requests==2.25.1
5252
# via sphinx
53-
six==1.16.0
53+
six==1.15.0
5454
# via
5555
# -r requirements.in
5656
# paver
@@ -64,19 +64,19 @@ sphinxcontrib-applehelp==1.0.2
6464
# via sphinx
6565
sphinxcontrib-devhelp==1.0.2
6666
# via sphinx
67-
sphinxcontrib-htmlhelp==2.0.0
67+
sphinxcontrib-htmlhelp==1.0.3
6868
# via sphinx
6969
sphinxcontrib-jsmath==1.0.1
7070
# via sphinx
7171
sphinxcontrib-paverutils==1.17.0
7272
# via -r requirements.in
7373
sphinxcontrib-qthelp==1.0.3
7474
# via sphinx
75-
sphinxcontrib-serializinghtml==1.1.5
75+
sphinxcontrib-serializinghtml==1.1.4
7676
# via sphinx
77-
sqlalchemy==1.4.22
77+
sqlalchemy==1.4.12
7878
# via -r requirements.in
79-
urllib3==1.26.6
79+
urllib3==1.26.4
8080
# via requests
8181

8282
# The following packages are considered to be unsafe in a requirements file:

0 commit comments

Comments
 (0)