From 8d80924ba8e507d8815b6cd1a5e2086c138db69c Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 9 Jan 2016 20:13:29 -0700 Subject: [PATCH] Remove gjslint.py --- .travis.yml | 4 +--- DEVELOPING.md | 15 ++------------- Makefile | 11 +---------- requirements.txt | 1 - test/spec/ol/geom/linestring.test.js | 3 +-- test/spec/ol/geom/multilinestring.test.js | 3 +-- test/spec/ol/geom/multipoint.test.js | 3 +-- test/spec/ol/geom/multipolygon.test.js | 3 +-- test/spec/ol/geom/point.test.js | 3 +-- test/spec/ol/geom/polygon.test.js | 3 +-- test/spec/ol/tilerange.test.js | 4 +--- 11 files changed, 11 insertions(+), 42 deletions(-) delete mode 100644 requirements.txt diff --git a/.travis.yml b/.travis.yml index 25d4ca8bb1..cfd58c07b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ -sudo: required -dist: trusty +sudo: false language: node_js @@ -14,7 +13,6 @@ env: before_install: - "npm prune" - - "sudo pip install -r requirements.txt" before_script: - "rm src/ol/renderer/webgl/*shader.js" diff --git a/DEVELOPING.md b/DEVELOPING.md index 1627ca25c9..769d01e66e 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -26,10 +26,10 @@ The minimum requirements are: * GNU Make * Git * [Node.js](http://nodejs.org/) (0.10.x or higher) -* Python 2.6 or 2.7 with a couple of extra modules (see below) +* Python 2.6 or 2.7 * Java 7 (JRE and JDK) -The executables `git`, `node`, `python` and `java` should be in your `PATH`. +The executables `git`, `node`, and `java` should be in your `PATH`. You can check your configuration by running: @@ -39,17 +39,6 @@ To install the Node.js dependencies run $ npm install -To install the extra Python modules, run: - - $ sudo pip install -r requirements.txt -or - - $ cat requirements.txt | sudo xargs easy_install - -depending on your OS and Python installation. - -(You can also install the Python modules in a Python virtual environment if you want to.) - ## Working with the build tool As an ol3 developer you will use `make` to run build targets defined in the diff --git a/Makefile b/Makefile index b8d3db1ce9..b97a2653f4 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,6 @@ compile-examples: build/compiled-examples/all.combined.js .PHONY: clean clean: - rm -f build/timestamps/gjslint-timestamp rm -f build/timestamps/eslint-timestamp rm -f build/timestamps/check-*-timestamp rm -f build/ol.css @@ -120,8 +119,7 @@ examples: $(BUILD_EXAMPLES) install: build/timestamps/node-modules-timestamp .PHONY: lint -lint: build/timestamps/gjslint-timestamp \ - build/timestamps/eslint-timestamp \ +lint: build/timestamps/eslint-timestamp \ build/timestamps/check-requires-timestamp \ build/timestamps/check-whitespace-timestamp @@ -232,13 +230,6 @@ build/timestamps/jsdoc-$(BRANCH)-timestamp: config/jsdoc/api/index.md \ ./node_modules/.bin/jsdoc config/jsdoc/api/index.md -c config/jsdoc/api/conf.json -d $(BUILD_HOSTED)/apidoc @touch $@ -build/timestamps/gjslint-timestamp: $(SRC_JS) $(SPEC_JS) $(SPEC_RENDERING_JS) \ - $(EXAMPLES_JS) - @mkdir -p $(@D) - @echo "Running gjslint..." - @gjslint --jslint_error=all --disable 0110 --custom_jsdoc_tags=event,fires,function,classdesc,api,observable --strict $? - @touch $@ - $(BUILD_HOSTED_EXAMPLES_JS): $(BUILD_HOSTED)/examples/%.js: build/examples/%.js @mkdir -p $(@D) @python bin/split-example.py $< $(@D) diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 51ef3c38d5..0000000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -http://closure-linter.googlecode.com/files/closure_linter-latest.tar.gz diff --git a/test/spec/ol/geom/linestring.test.js b/test/spec/ol/geom/linestring.test.js index 9c9719907e..36c79dddfe 100644 --- a/test/spec/ol/geom/linestring.test.js +++ b/test/spec/ol/geom/linestring.test.js @@ -5,8 +5,7 @@ describe('ol.geom.LineString', function() { it('can be constructed with a null geometry', function() { expect(function() { - var lineString = new ol.geom.LineString(null); - lineString = lineString; // suppress gjslint warning + return new ol.geom.LineString(null); }).not.to.throwException(); }); diff --git a/test/spec/ol/geom/multilinestring.test.js b/test/spec/ol/geom/multilinestring.test.js index ba989e30f7..f05fe1f937 100644 --- a/test/spec/ol/geom/multilinestring.test.js +++ b/test/spec/ol/geom/multilinestring.test.js @@ -5,8 +5,7 @@ describe('ol.geom.MultiLineString', function() { it('can be constructed with a null geometry', function() { expect(function() { - var multiLineString = new ol.geom.MultiLineString(null); - multiLineString = multiLineString; // suppress gjslint warning + return new ol.geom.MultiLineString(null); }).not.to.throwException(); }); diff --git a/test/spec/ol/geom/multipoint.test.js b/test/spec/ol/geom/multipoint.test.js index b4f866e47a..dfb89d3c31 100644 --- a/test/spec/ol/geom/multipoint.test.js +++ b/test/spec/ol/geom/multipoint.test.js @@ -5,8 +5,7 @@ describe('ol.geom.MultiPoint', function() { it('can be constructed with a null geometry', function() { expect(function() { - var multiPoint = new ol.geom.MultiPoint(null); - multiPoint = multiPoint; // suppress gjslint warning + return new ol.geom.MultiPoint(null); }).not.to.throwException(); }); diff --git a/test/spec/ol/geom/multipolygon.test.js b/test/spec/ol/geom/multipolygon.test.js index 6143d0dc43..606b411c45 100644 --- a/test/spec/ol/geom/multipolygon.test.js +++ b/test/spec/ol/geom/multipolygon.test.js @@ -5,8 +5,7 @@ describe('ol.geom.MultiPolygon', function() { it('can be constructed with a null geometry', function() { expect(function() { - var multiPolygon = new ol.geom.MultiPolygon(null); - multiPolygon = multiPolygon; // suppress gjslint warning + return new ol.geom.MultiPolygon(null); }).not.to.throwException(); }); diff --git a/test/spec/ol/geom/point.test.js b/test/spec/ol/geom/point.test.js index 78fe361c4a..9ae2b23a0d 100644 --- a/test/spec/ol/geom/point.test.js +++ b/test/spec/ol/geom/point.test.js @@ -5,8 +5,7 @@ describe('ol.geom.Point', function() { it('can be constructed with a null geometry', function() { expect(function() { - var point = new ol.geom.Point(null); - point = point; // suppress gjslint warning + return new ol.geom.Point(null); }).not.to.throwException(); }); diff --git a/test/spec/ol/geom/polygon.test.js b/test/spec/ol/geom/polygon.test.js index 7eeb87635e..e895c6e546 100644 --- a/test/spec/ol/geom/polygon.test.js +++ b/test/spec/ol/geom/polygon.test.js @@ -5,8 +5,7 @@ describe('ol.geom.Polygon', function() { it('can be constructed with a null geometry', function() { expect(function() { - var polygon = new ol.geom.Polygon(null); - polygon = polygon; // suppress gjslint warning + return new ol.geom.Polygon(null); }).not.to.throwException(); }); diff --git a/test/spec/ol/tilerange.test.js b/test/spec/ol/tilerange.test.js index 7fa685874c..4fbf2d8f08 100644 --- a/test/spec/ol/tilerange.test.js +++ b/test/spec/ol/tilerange.test.js @@ -59,9 +59,7 @@ describe('ol.TileRange', function() { describe('with mixed z', function() { expect(function() { - var tileRange = new ol.TileRange.boundingTileRange( - [3, 1, 3], [4, 2, 0]); - tileRange = tileRange; // suppress gjslint warning about unused variable + return new ol.TileRange.boundingTileRange([3, 1, 3], [4, 2, 0]); }).to.throwException(); }); });