From 4d295d7900ed6541d214ea1f81e479f9d2880fa3 Mon Sep 17 00:00:00 2001 From: SheetJS Date: Tue, 20 Feb 2018 15:57:28 -0500 Subject: [PATCH] version bump 1.1.2: node module cleanup [ci skip] --- .npmignore | 3 +++ frac.md | 18 ++++++++++-------- frac.py | 3 +-- package.json | 15 +++++++-------- setup.py | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.npmignore b/.npmignore index 59ecd7d..e390949 100644 --- a/.npmignore +++ b/.npmignore @@ -1,3 +1,5 @@ +frac.flow.js +frac.md test_files/*.tsv ctest/ test.js @@ -7,6 +9,7 @@ Makefile node_modules/ coverage.html .travis.yml +.eslintrc .jshintrc .jscs.json .flowconfig diff --git a/frac.md b/frac.md index 41539cf..39da85d 100644 --- a/frac.md +++ b/frac.md @@ -244,21 +244,20 @@ xltestfiles.forEach(function(x) { ```json>package.json { "name": "frac", - "version": "1.1.1", + "version": "1.1.2", "author": "SheetJS", "description": "Rational approximation with bounded denominator", "keywords": [ "math", "fraction", "rational", "approximation" ], "main": "./frac", "types": "types", - "dependencies": { - "voc":"~1.0.0" - }, + "dependencies": {}, "devDependencies": { - "mocha":"~2.5.3", + "voc": "~1.1.0", + "mocha": "~2.5.3", "blanket": "~1.2.3", - "codepage":"~1.10.0", - "@sheetjs/uglify-js":"~2.7.3", - "@types/node":"^8.0.7", + "codepage": "~1.10.0", + "@sheetjs/uglify-js": "~2.7.3", + "@types/node": "^8.0.7", "dtslint": "^0.1.2", "typescript": "2.2.0" }, @@ -284,6 +283,8 @@ xltestfiles.forEach(function(x) { And to make sure that test files are not included in npm: ```>.npmignore +frac.flow.js +frac.md test_files/*.tsv ctest/ test.js @@ -293,6 +294,7 @@ Makefile node_modules/ coverage.html .travis.yml +.eslintrc .jshintrc .jscs.json .flowconfig diff --git a/frac.py b/frac.py index 356442b..f988618 100644 --- a/frac.py +++ b/frac.py @@ -49,10 +49,9 @@ def med(x, D, mixed=False): def cont(x, D, mixed=False): """Generate fraction representation using Aberth method""" B = abs(x) - I = int P_2, P_1, P, Q_2, Q_1, Q = 0, 1, 0, 1, 0, 0 while Q_1 < D: - A = I(B) + A = int(B) P = A * P_1 + P_2 Q = A * Q_1 + Q_2 if (B - A) < 0.00000005: diff --git a/package.json b/package.json index 1f7b98c..d9ee483 100644 --- a/package.json +++ b/package.json @@ -1,20 +1,19 @@ { "name": "frac", - "version": "1.1.1", + "version": "1.1.2", "author": "SheetJS", "description": "Rational approximation with bounded denominator", "keywords": [ "math", "fraction", "rational", "approximation" ], "main": "./frac", "types": "types", - "dependencies": { - "voc":"~1.0.0" - }, + "dependencies": {}, "devDependencies": { - "mocha":"~2.5.3", + "voc": "~1.1.0", + "mocha": "~2.5.3", "blanket": "~1.2.3", - "codepage":"~1.10.0", - "@sheetjs/uglify-js":"~2.7.3", - "@types/node":"^8.0.7", + "codepage": "~1.10.0", + "@sheetjs/uglify-js": "~2.7.3", + "@types/node": "^8.0.7", "dtslint": "^0.1.2", "typescript": "2.2.0" }, diff --git a/setup.py b/setup.py index 01fcde2..8787518 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup setup( name='frac', - version='1.0.5', + version='1.1.2', author='SheetJS', author_email='dev@sheetjs.com', url='http://oss.sheetjs.com/frac',