Skip to content

Commit

Permalink
Merge with upstream (#8)
Browse files Browse the repository at this point in the history
* Convert requirements from exact to minimum

Fixes swaroopch#40

* Bump version to 0.5.13

* LICENSE: bump year

* Fix ambiguous variable name (swaroopch#44)

* Add a Changelog

* Fix parsing of exact-precision floats with a negative exposant (swaroopch#47)

* Accept missing printable ASCII chars (swaroopch#45)

* Add a sort_sets optional keyword argument to dump (swaroopch#42)

* add failing unit test

* add ImmutableList

* use ImmutableList on code

* fix latin

* conform to flake8

* add test

* add placeholder file

* workaround for limitation on the image downstream

* remove conda.txt file

* add docstring

* descend from Sequence instead of MutableSequence

* copy explicitly

* remove MutableSequence tests

* bump version

* fix formatting

* use copy.copy()

as .copy() is not available for lists on python2

* remove redundant tests

* simplify condition

* Raise custom exceptions on syntax errors (swaroopch#46)

* Add CONTRIBUTING.md (swaroopch#48)

* Handle fractions

edn-format/edn#64

* Handle #_

Fixes #4.

Note it doesn’t support top-level #_ usage such as in:

    foo #_ bar

* Add tests for #_

* Tweak README regarding caveats + mention @bfontaine contributor

* Bump version to 0.6.0

Thanks @bfontaine and @konr!

* Add v0.6.0 to the Changelog

* Run Travis tests on latest Python 3.7

* Use dist: xenial

* Use mutable data structures to improve parsing time

Previously a list was used to hold the intermediate results during
parsing of "expressions", but each expression was prepended by
copying, Fixing this takes parsing from quadratic to linear time.

* Bump version to 0.6.1

* Update setup.py to 0.6.1

* Various code simplifications (swaroopch#53)

* Parse nil and booleans as symbols (swaroopch#54)

* Add Vagrantfile for local dev

* Use collections.abc instead of collections

Fixes swaroopch#55

* Fix build issues

https://travis-ci.org/swaroopch/edn_format/jobs/475411817

* Fix Python 2.x compatibility

https://travis-ci.org/swaroopch/edn_format/jobs/475413453

* Bump version to 0.6.2

* DRY the requirements

Move from setup.py to only requirements.txt

* Add badge for PyPI version

* add support for unicode char literals

* fixed indentation in test_sort_keys

* combined version_info checks in edn_format/edn_lex.py

Co-Authored-By: LeXofLeviafan <lexofleviafan@gmail.com>

* fixed comment in char token definition

* made changes according to flake8 demands

* Bump version to 0.6.3

* Travis : Upgrade Ubuntu version to latest LTS, bionic

* Use tag signing

* Add an edn_parse.tag decorator, + docs and tests on tags (swaroopch#59)

* Contributor Notes: replace the deprecated commands

* Version 0.6.4

* Move contributor notes in CONTRIBUTING.md (swaroopch#61)

* Add edn_format.loads_all to parse all expressions in a string (swaroopch#60)

* Parse hexadecimal notation

Fixes swaroopch#62.

* Disallow 0-prefixed integers

From the spec:

> No integer other than 0 may begin with 0.

* Release v0.6.5

* Merge with upstream

* Remove repeated tests

* Undo some changes after the merge

* Fix regex for t_FLOAT

* Add more test cases

* Refactor t_FLOAT regex
  • Loading branch information
Guilherme Beltramini committed Nov 27, 2019
1 parent bbeee89 commit 568dc71
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 0 additions & 2 deletions edn_format/edn_dump.py
Expand Up @@ -94,8 +94,6 @@ def udump(obj,
return '({})'.format(seq(obj, **kwargs))
elif isinstance(obj, (list, ImmutableList)):
return '[{}]'.format(seq(obj, **kwargs))
elif isinstance(obj, ImmutableList):
return '[{}]'.format(seq(obj, **kwargs))
elif isinstance(obj, set) or isinstance(obj, frozenset):
if sort_sets:
obj = sorted(obj)
Expand Down
16 changes: 9 additions & 7 deletions setup.py
Expand Up @@ -3,20 +3,22 @@
except ImportError:
from distutils.core import setup

try:
from pip.req import parse_requirements
except ImportError:
from pip._internal.req import parse_requirements

requirements = [str(ir.req) for ir in parse_requirements('requirements.txt', session=False)]

setup(name="edn_format",
version="0.6.6-nu",
author="Swaroop C H",
author_email="swaroop@swaroopch.com",
description="EDN format reader and writer in Python",
long_description=open('README.md').read(),
long_description_content_type='text/markdown',
url="https://github.com/swaroopch/edn_format",
install_requires=[
"pytz>=2016.10",
"pyRFC3339>=1.0,<2",
"ply>=3.10,<4",
"pytest",
"pytest-xdist"
],
install_requires=requirements,
license="Apache 2.0",
packages=['edn_format'],
# http://pypi.python.org/pypi?%3Aaction=list_classifiers
Expand Down
File renamed without changes.
Empty file removed tests/__init__.py
Empty file.

0 comments on commit 568dc71

Please sign in to comment.