feature/decimal

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+name: "CodeQL"
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+  schedule:
+    - cron: '0 1 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        language: ['python']
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file. 
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.gitignore

@@ -1,13 +1,29 @@
-
+# Python files
 *.pyc
+*.pyo
+__pycache__/
 .cache
 
+# Test files
+.pytest_cache/
+temp/
+.tox
+.coverage
 .testmondata
+.benchmarks
+
+# Deb files
+debian/files
+debian/*debhelper*
+debian/*substvars
 
+# Build files
+.eggs/
+*.egg-info/
 build/
 _build/
-deb_dist/
 dist/
-*.tar.gz
-*egg-info
-MANIFEST
+venv/
+
+# Editors
+.vscode

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "JSON-Schema-Test-Suite"]
+	path = JSON-Schema-Test-Suite
+	url = https://github.com/json-schema-org/JSON-Schema-Test-Suite.git

AUTHORS

@@ -0,0 +1,11 @@
+MAINTAINER
+Michal Hořejšek <horejsekmichal@gmail.com>
+
+CONTRIBUTORS
+anentropic <ego@anentropic.com>
+Antti Jokipii <anttijokipii@gmail.com>
+bcaller <bcaller@users.noreply.github.com>
+Frederik Petersen <fp@abusix.com>
+Guillaume Desvé <guillaume.desve@surycat.com>
+Kris Molendyke <krismolendyke@users.noreply.github.com>
+David Majda <david@majda.cz>

CHANGELOG.txt

@@ -0,0 +1,155 @@
+=== 2.14.5 (2020-08-17)
+
+* Fix missing dependencies
+* Fix schema cache
+
+
+=== 2.14.4 (2020-03-19)
+
+* Fix $id property
+* Add extra properties to error message when additionalProperties are set to False
+* Better exception message when referencing schema is not valid JSON
+
+
+=== 2.14.3 (2020-02-27)
+
+* Tuple is also valid array
+
+
+=== 2.14.2 (2019-12-11)
+
+* Fix of `additionalProperties=true` for JSON schema 4
+* Use decimal for multipleOf implementation and add respective tests
+* Better escaping of definition names
+
+
+=== 2.14.1 (2019-10-09)
+
+* Fix of undefined format exception message
+
+
+=== 2.14.0 (2019-10-08)
+
+* Optimization: do not do the same type checks, keep it in one block if possible
+* More context in JsonSchemaException (value, variable_name, variable_path, definition, rule and rule_definition)
+* Possibility to pass custom formats
+* Raise JsonSchemaDefinitionException when definition of property is not valid
+* Fix of uniqueItems when used with other than array type
+* Fix of date-time regexp (time zone is required by RFC 3339)
+
+
+=== 2.13 (2019-06-10)
+
+* Resolved Python 3.7 warnings
+* Updated JSON Schema test suites
+    * Fix of date-time regexp (allow small T and Z).
+    * Fix escaping (proper handling of \n, \r or " everywhere).
+
+
+=== 2.12 (2019-05-24)
+
+* Fix of properties (local variable referenced before assignment).
+
+
+=== 2.11 (2019-04-16)
+
+* Fix of additionalProperties (colliding variable names).
+
+
+=== 2.10 (2019-04-15)
+
+* Fix pattern regexps with a space.
+
+
+=== 2.9 (2019-03-04)
+
+* Use of urllib instead of requests for smaller memory usage.
+
+
+=== 2.8 (2019-01-05)
+
+* Fix quotes in enum generating invalid code
+
+
+=== 2.7 (2018-11-16)
+
+* Fix regexps for Python 3.7
+
+
+=== 2.6 (2018-11-01)
+
+* Swap $ in regexps to \Z to follow ECMA 262 ($ matches really the end of the string, not the end or new line and the end). Because of that your regular expressions have to escape dollar when used as regular character.
+
+
+=== 2.5 (2018-10-22)
+
+* E-mail regex allows any e-mail with @
+
+
+=== 2.4 (2018-09-27)
+
+* Fix overriding variables (in pattern properties, property names, unique items and contains)
+* Fix string in const
+* Improve security: not generating code from any definition
+* Added validate function for lazy programmers
+
+
+=== 2.3 (2018-09-14) ===
+
+* Fix regex of hostname
+
+
+=== 2.2 (2018-09-12) ===
+
+* Fix code generation with long regex patterns
+* Fix regex of date-time (allow time without miliseconds)
+
+
+=== 2.1 (2018-09-12) ===
+
+* Fix code generation with regex patterns
+
+
+=== 2.0 (2018-09-07) ===
+
+* Support of draft-06
+* Support of draft-07
+* Code generation to a file
+
+
+=== 1.6 (2018-06-21) ===
+
+* Bugfixing
+
+
+=== 1.5 (2018-06-20) ===
+
+* Support of definitions
+* Support of referencies
+
+
+=== 1.4 (2018-06-11) ===
+
+* Better date-time regex
+* Support of dependencies
+
+
+=== 1.3 (2018-04-25) ===
+
+* Fix patter inside of anyOf
+
+
+=== 1.2 (2018-04-24) ===
+
+* Support of formats
+* Support of properties
+
+
+=== 1.1 (2017-01-03) ===
+
+* Support of float numbers
+
+
+=== 1.0 (2016-09-23) ===
+
+* First version

LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2018, Michal Horejsek
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+  Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+  Neither the name of the {organization} nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

MANIFEST.in

@@ -0,0 +1 @@
+include LICENSE

Makefile

@@ -1,30 +1,74 @@
+.PHONY: all venv lint jsonschemasuitcases test test-lf benchmark benchmark-save performance printcode doc upload deb clean
+SHELL=/bin/bash
+
+VENV_NAME?=venv
+VENV_BIN=$(shell pwd)/${VENV_NAME}/bin
+
+PYTHON=${VENV_BIN}/python3
+
 
 all:
-	@echo "make install - Install on local system"
 	@echo "make test - Run tests during development"
 	@echo "make performance - Run performance test of this and other implementation"
 	@echo "make doc - Make documentation"
 	@echo "make clean - Get rid of scratch and byte files"
 
 
-deb:
-	python3 setup.py --command-packages=stdeb.command bdist_deb
+venv: $(VENV_NAME)/bin/activate
+$(VENV_NAME)/bin/activate: setup.py
+	test -d $(VENV_NAME) || virtualenv -p python3 $(VENV_NAME)
+	# Some problem in latest version of setuptools during extracting translations.
+	${PYTHON} -m pip install -U pip setuptools==39.1.0
+	${PYTHON} -m pip install -e .[devel]
+	touch $(VENV_NAME)/bin/activate
+
+lint: venv
+	${PYTHON} -m pylint fastjsonschema
 
-upload:
-	python3 setup.py register sdist upload
+jsonschemasuitcases:
+	git submodule init
+	git submodule update
 
-install:
-	python3 setup.py install
+test: venv jsonschemasuitcases
+	${PYTHON} -m pytest -W default --benchmark-skip
+test-lf: venv jsonschemasuitcases
+	${PYTHON} -m pytest -W default --benchmark-skip --last-failed
 
-test:
-	python3 -m pytest tests
+# Call make benchmark-save before change and then make benchmark to compare results.
+benchmark: venv jsonschemasuitcases
+	${PYTHON} -m pytest \
+		-W default \
+		--benchmark-only \
+		--benchmark-sort=name \
+		--benchmark-group-by=fullfunc \
+		--benchmark-disable-gc \
+		--benchmark-compare \
+		--benchmark-compare-fail='min:5%'
+benchmark-save: venv jsonschemasuitcases
+	${PYTHON} -m pytest \
+		-W default \
+		--benchmark-only \
+		--benchmark-sort=name \
+		--benchmark-group-by=fullfunc \
+		--benchmark-disable-gc \
+		--benchmark-save=benchmark \
+		--benchmark-save-data
 
-performance:
-	python3 performance.py
+performance: venv
+	${PYTHON} performance.py
+
+printcode: venv
+	cat schema.json | python3 -m fastjsonschema
 
 doc:
 	cd docs; make
 
+upload: venv
+	${PYTHON} setup.py register sdist bdist_wheel upload
+
+deb: venv
+	${PYTHON} setup.py --command-packages=stdeb.command bdist_deb
+
 clean:
-	python3 setup.py clean
-	find . -name '*.pyc' -delete
+	find . -name '*.pyc' -exec rm --force {} +
+	rm -rf $(VENV_NAME) *.eggs *.egg-info dist build docs/_build .mypy_cache .cache