Steven Silvester 8 år sedan
förälder
incheckning
ce45ef6bd8
7 ändrade filer med 11 tillägg och 37 borttagningar
  1. 1 4
      .travis.yml
  2. 0 1
      README.md
  3. 4 4
      package.json
  4. 1 24
      scripts/travis_script.sh
  5. 1 1
      setup.py
  6. 2 1
      setupbase.py
  7. 2 2
      test/src/renderers/latex.spec.ts

+ 1 - 4
.travis.yml

@@ -11,8 +11,7 @@ cache:
 env:
   matrix:
     - GROUP=tests
-    - GROUP=coverage_and_docs
-    - GROUP=examples
+    - GROUP=coverage
   global:
   - GH_REF: github.com/jupyterlab/jupyterlab.git
   - secure: MWpTI6cj3/Bnmtrr0Oqlp2JeWqDneB9aEjlQDaRxLOkqVbxhqDcYW9qAgZZP+sq29vT5oVMWzyCirteKxJfG2vy3HQE1XNLhz82Sf/7sE6DQ51gohl0CcOeA/uA8hCXEw97hneFWsZgHKqSoch7nVDsE3qfYgO+930jHlnxYApJGP9hZFv2Q2NVa6+99kipEYS4BY/yBDYKy6/t4kXcnBrUlNaPtdjnXcrY9esLZ7EQtkaG5VqcQVIBaLJKGF5Q7Aufj5nCFaZ6hZDF1Bi/AbmIbVWFyiT+22i8DZK6YwenECckyzoWkl+bEhYepWsgBKh/BDgPBAmPWKHgU5V4apDaGqZBhF7FP6H02AdZYYuCwl47jyakqvWLZW7oDmorL+HsWG5HQ3m0tMT2ywdbwNOiD39tiPPXjsvROh5ys9vL6NzQvxILCeEOnzcZrFuxi2LGEZfnlqRIjkh1llUAvNc3mOycRLWDOwVQa2+U59qDRXCSY2RD+MOfcdFUGengVujTMaAPMBUa3E33/ZIOOKJtR5TIajYZvd9B2uDlz02QfvTK+hrTaNYJjRZ8WCaeSM/CIKdoLw+29MNO6eqtchw0/vNvM8c9EkhrhMQKcY04OecVhmZkemFhd4SD5l92VX3z3xSxLkmazfNkj3CigWDXNxfDd2ORoGjA46Pga8RM=
@@ -20,5 +19,3 @@ install:
 - bash ./scripts/travis_install.sh
 script:
 - bash ./scripts/travis_script.sh
-after_success:
-- bash ./scripts/travis_after_success.sh

+ 0 - 1
README.md

@@ -103,7 +103,6 @@ and you may participate in development discussions or get live help on [Gitter](
 ## Resources
 
 - [Reporting Issues](https://github.com/jupyterlab/jupyterlab/issues)
-- [API Docs](http://jupyterlab.github.io/jupyterlab/)
 - [Architecture tutorial](https://jupyterlab-tutorial.readthedocs.io/en/latest/index.html)
 - [Documentation for Project Jupyter](https://jupyter.readthedocs.io/en/latest/index.html) | [PDF](https://media.readthedocs.org/pdf/jupyter/latest/jupyter.pdf)
 - [Project Jupyter website](https://jupyter.org)

+ 4 - 4
package.json

@@ -16,10 +16,10 @@
     "clean:examples": "lerna run clean --scope \"@jupyterlab/example-*\"",
     "clean:src": "lerna run clean --scope \"@jupyterlab/!(test-|example-)*\"",
     "clean:tests": "lerna run clean --scope \"@jupyterlab/test-*\"",
-    "test": "lerna run test --scope \"@jupyterlab/test-*\"",
-    "test:chrome": "lerna run test:chrome --scope \"@jupyterlab/test-*\"",
-    "test:firefox": "lerna run test:firefox --scope \"@jupyterlab/test-*\"",
-    "test:ie": "lerna run test:ie --concurrency 1 --scope \"@jupyterlab/test-*\"",
+    "test": "lerna run test --stream --scope \"@jupyterlab/test-*\"",
+    "test:chrome": "lerna run test:chrome --stream --scope \"@jupyterlab/test-*\"",
+    "test:firefox": "lerna run test:firefox --streamn--scope \"@jupyterlab/test-*\"",
+    "test:ie": "lerna run test:ie --concurrency 1 --stream --scope \"@jupyterlab/test-*\"",
     "publish": "npm run clean && npm run build && lerna publish -m \"Publish\""
   }
 }

+ 1 - 24
scripts/travis_script.sh

@@ -11,12 +11,8 @@ export PATH="$HOME/miniconda/bin:$PATH"
 
 if [[ $GROUP == tests ]]; then
 
-    # Test against a clean npm build
-    npm run clean
-    npm run build:all
+    # Run the JS and python tests
     npm test
-
-    # Run the python tests
     py.test
 
     # Make sure we have CSS that can be converted with postcss
@@ -41,23 +37,4 @@ if [[ $GROUP == coverage_and_docs ]]; then
     # Run the link check
     pip install -q pytest-check-links
     py.test --check-links -k .md .
-
-    # Build the docs
-    npm run docs
-    cp jupyter-plugins-demo.gif docs
-
-    # Verify docs build
-    pushd tutorial
-    conda env create -n test_docs -f environment.yml
-    source activate test_docs
-    make linkcheck
-    make html
-    source deactivate
-    popd
-fi
-
-
-if [[ $GROUP == examples ]]; then
-    # Make sure the examples build
-    npm run build:examples
 fi

+ 1 - 1
setup.py

@@ -108,7 +108,7 @@ except ImportError:
     pass
 
 
-#setup_args['cmdclass'] = cmdclass
+setup_args['cmdclass'] = cmdclass
 
 
 setuptools_args = {}

+ 2 - 1
setupbase.py

@@ -131,7 +131,8 @@ class NPM(Command):
         log.info("Installing build dependencies with npm. This may take a while...")
         run(['npm', 'install'], cwd=here)
         run(['npm', 'run', 'clean'], cwd=here)
-        run(['npm', 'run', 'build:all'], cwd=here)
+        run(['npm', 'run', 'install'], cwd=here)
+        run(['npm', 'run', 'build'], cwd=here)
 
         for t in self.targets:
             if not os.path.exists(t):

+ 2 - 2
test/src/renderers/latex.spec.ts

@@ -80,7 +80,7 @@ describe('jupyter-ui', () => {
       \\\\\), there`;
       let { text, math } = removeMath(input);
       expect(text).to.be('hello, @@0@@, there');
-      expect(math).to.eql(['\\\\(\n          /alpha\n      \\\\)']);
+      expect(math).to.eql(['\\\\(\n          /alpha \n      \\\\)']);
     });
 
     it('should handle `\\\\\[` delimiters for math', () => {
@@ -89,7 +89,7 @@ describe('jupyter-ui', () => {
       \\\\\], there`;
       let { text, math } = removeMath(input);
       expect(text).to.be('hello, @@0@@, there');
-      expect(math).to.eql(['\\\\[\n          /alpha\n      \\\\]']);
+      expect(math).to.eql(['\\\\[\n          /alpha \n      \\\\]']);
     });
 
   });