Skip to content

Commit 5bbef31

Browse files
Fix: Docs building and compiling.
1 parent 96258e5 commit 5bbef31

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

requirements-doc.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
# Docs
2-
vstutils[rpc,ldap,doc,prod]~=5.1.11
3-
markdown2~=2.4.0
4-
gitpython~=3.1.14
2+
-rrequirements.txt

setup.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@ def make_setup(**opts):
387387
if 'develop' in sys.argv:
388388
ext_list = []
389389

390+
install_requirements = load_requirements('requirements.txt', os.getcwd())
391+
390392
kwargs = dict(
391393
name='polemarch',
392394
packages=find_packages(),
@@ -395,11 +397,11 @@ def make_setup(**opts):
395397
'polemarch/templates/gui/service-worker.js',
396398
],
397399
install_requires=[
398-
] + load_requirements('requirements.txt', os.getcwd()) + load_requirements('requirements-doc.txt', os.getcwd()),
400+
] + install_requirements,
399401
extras_require={
400402
'test': load_requirements('requirements-test.txt', os.getcwd()) + [
401403
i.replace('prod', 'test,prod')
402-
for i in load_requirements('requirements.txt', os.getcwd())
404+
for i in install_requirements
403405
if isinstance(i, str) and 'vstutils' in i
404406
],
405407
'mysql': ['mysqlclient'],

tox_build.ini

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,10 @@ whitelist_externals =
1111
bash
1212
grep
1313
mkdir
14-
make
1514
commands =
1615
rm -rf build
17-
build: make compile PY=python {posargs}
18-
wheel: make wheel PY=python {posargs}
19-
deb: make deb PY=python {posargs}
20-
rpm: make rpm PY=python {posargs}
16+
build: python setup.py compile -v {posargs}
17+
wheel: python setup.py compile_docs -v {posargs}
18+
wheel: python setup.py bdist_wheel -v {posargs}
2119
deps =
2220
-rrequirements.txt
23-
{rpm,deb}: virtualenv==16.0
24-
{rpm,deb}: venvctrl

0 commit comments

Comments
 (0)