use a submodule instead of bower

gawel · Nov 12, 2016 · 17cf6c5 · 17cf6c5
1 parent d9b63f7
commit 17cf6c5
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 27 deletions.
diff --git a/.bowerrc b/.bowerrc
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-impress/static/components/
 docs/html
 html
 .tox
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "impress/static/impressjs"]
+	path = impress/static/impressjs
+	url = git@github.com:impress/impress.js.git
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,13 @@
 language: python
-python:
-- "2.7"
+language: python
+python: 3.5
+sudo: false
 install:
-- pip install tox
-script: tox
-
+  - pip install tox
+script:
+  - tox
+env:
+  - TOXENV=py27
+  - TOXENV=py33
+  - TOXENV=py34
+  - TOXENV=py35
diff --git a/bower.json b/bower.json
diff --git a/impress/layout.html b/impress/layout.html
@@ -14,7 +14,7 @@
     <div id="impress">
       {% block body %} {% endblock %}
     </div>
-    <script src="{{ pathto('_static/components/impress.js/js/impress.js', 1) }}"></script>
+    <script src="{{ pathto('_static/impressjs/js/impress.js', 1) }}"></script>
     <script src="{{ pathto('_static/jquery.js', 1) }}"></script>
     <script src="{{ pathto('_static/impress.js', 1) }}"></script>
     <script src="{{ pathto('_static/custom.js', 1) }}"></script>

diff --git a/impress/static/impressjs b/impress/static/impressjs
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py33,py34
+envlist = py27,py33,py34,py35
 
 [testenv]
 changedir={toxinidir}