Skip to content

Commit c7d83b1

Browse files
authored
Merge pull request #31 from clowder-framework/fix-sphinx
use pipenv, update requirements.txt
2 parents 8ff1dcc + 1201780 commit c7d83b1

4 files changed

Lines changed: 301 additions & 33 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7-
## 1.10.1 - 2020-07-15
7+
## 1.10.1 - 2020-07-16
88

99
### Fixed
1010
- Queue threads (e.g. Elasticsearch indexer) will no longer crash permanently if the queue connection to Mongo is lost temporarily.
1111
- Docker images would not build correctly on GitHub.
1212
- If monitor HTTP server would crash, it would not restart correctly.
1313
- Don't call server side twice when rendering list of files on dataset page.
1414
[#7](https://github.com/clowder-framework/clowder/issues/7)
15+
- Fixed Sphinx build errors and switched to using pipenv. Now building docs on [readthedocs](https://clowder-framework.readthedocs.io/en/latest/).
1516

1617
### Added
1718
- GitHub artifacts can be uploaded using SCP to remote server.

doc/src/sphinx/Pipfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[[source]]
2+
name = "pypi"
3+
url = "https://pypi.org/simple"
4+
verify_ssl = true
5+
6+
[dev-packages]
7+
8+
[packages]
9+
sphinx = "*"
10+
recommonmark = "*"
11+
sphinx-rtd-theme = "*"
12+
13+
[requires]
14+
python_version = "3.7"

doc/src/sphinx/Pipfile.lock

Lines changed: 262 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/src/sphinx/requirements.txt

Lines changed: 23 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,27 @@
11
alabaster==0.7.12
2-
argh==0.26.2
3-
Babel==2.7.0
4-
certifi==2019.3.9
2+
Babel==2.8.0
3+
certifi==2020.6.20
54
chardet==3.0.4
6-
commonmark==0.9.0
7-
docutils==0.14
8-
future==0.17.1
9-
idna==2.8
10-
imagesize==1.1.0
11-
Jinja2==2.10.1
12-
livereload==2.6.1
5+
commonmark==0.9.1
6+
docutils==0.16
7+
idna==2.10
8+
imagesize==1.2.0
9+
Jinja2==2.11.2
1310
MarkupSafe==1.1.1
14-
packaging==19.0
15-
pathtools==0.1.2
16-
port-for==0.3.1
17-
Pygments==2.4.2
18-
pyparsing==2.4.0
19-
pytz==2019.1
20-
PyYAML==5.1.1
21-
recommonmark==0.5.0
22-
requests==2.22.0
23-
six==1.12.0
24-
snowballstemmer==1.2.1
25-
Sphinx==2.1.1
26-
sphinx-autobuild==0.7.1
27-
sphinx-rtd-theme==0.4.3
28-
sphinxcontrib-applehelp==1.0.1
29-
sphinxcontrib-devhelp==1.0.1
30-
sphinxcontrib-htmlhelp==1.0.2
11+
packaging==20.4
12+
Pygments==2.6.1
13+
pyparsing==2.4.7
14+
pytz==2020.1
15+
recommonmark==0.6.0
16+
requests==2.24.0
17+
six==1.15.0
18+
snowballstemmer==2.0.0
19+
Sphinx==3.1.2
20+
sphinx-rtd-theme==0.5.0
21+
sphinxcontrib-applehelp==1.0.2
22+
sphinxcontrib-devhelp==1.0.2
23+
sphinxcontrib-htmlhelp==1.0.3
3124
sphinxcontrib-jsmath==1.0.1
32-
sphinxcontrib-qthelp==1.0.2
33-
sphinxcontrib-serializinghtml==1.1.3
34-
tornado==6.0.2
35-
urllib3==1.25.3
36-
watchdog==0.9.0
25+
sphinxcontrib-qthelp==1.0.3
26+
sphinxcontrib-serializinghtml==1.1.4
27+
urllib3==1.25.9

0 commit comments

Comments
 (0)