diff options
author | Bob Ippolito <bob@redivi.com> | 2023-02-04 16:14:39 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-04 16:14:39 -0800 |
commit | 64f12484892079e175c7636d006cd74f04e26461 (patch) | |
tree | 423c9bde714beb0dcc8649a3336031e1c19183c7 | |
parent | c891b95f40711e3dcd23bd4180b5665dce3a2032 (diff) | |
parent | fb7f4004788aa939af4e766262a02b9bad0f70a9 (diff) | |
download | simplejson-64f12484892079e175c7636d006cd74f04e26461.tar.gz |
Merge pull request #308 from simplejson/pure-python-wheelv3.18.2
Build pure python wheel
-rw-r--r-- | .github/workflows/build-and-deploy.yml | 11 | ||||
-rw-r--r-- | CHANGES.txt | 5 | ||||
-rw-r--r-- | conf.py | 2 | ||||
-rw-r--r-- | setup.py | 4 | ||||
-rw-r--r-- | simplejson/__init__.py | 2 |
5 files changed, 17 insertions, 7 deletions
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 7f60e04..d6b8004 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -67,13 +67,18 @@ jobs: with: python-version: '3.11' - - name: Build sdist - run: python setup.py sdist + - name: Install dependencies + run: python -m pip install --upgrade pip setuptools wheel + + - name: Build sdist and wheel + run: DISABLE_SPEEDUPS=1 python setup.py sdist bdist_wheel - uses: actions/upload-artifact@v2 if: "github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')" with: - path: dist/*.tar.gz + path: | + dist/*.tar.gz + dist/*-none-any.whl upload_pypi: needs: [build_wheels, build_sdist] diff --git a/CHANGES.txt b/CHANGES.txt index fcf2f8d..6302c01 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +Version 3.18.2 released 2023-02-04 + +* Distribute a pure python wheel for Pyodide + https://github.com/simplejson/simplejson/pull/308 + Version 3.18.1 released 2023-01-03 * Remove unnecessary `i` variable from encoder module namespace @@ -44,7 +44,7 @@ copyright = '2022, Bob Ippolito' # The short X.Y version. version = '3.18' # The full version, including alpha/beta/rc tags. -release = '3.18.1' +release = '3.18.2' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: @@ -12,7 +12,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \ DistutilsPlatformError IS_PYPY = hasattr(sys, 'pypy_translation_info') -VERSION = '3.18.1' +VERSION = '3.18.2' DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python" with open('README.rst', 'r') as f: @@ -118,7 +118,7 @@ def run_setup(with_binary): **kw) try: - run_setup(not IS_PYPY) + run_setup(not IS_PYPY and os.environ.get('DISABLE_SPEEDUPS') != '1') except BuildFailed: if os.environ.get('REQUIRE_SPEEDUPS') or os.environ.get('CIBUILDWHEEL', '0') == '1': raise diff --git a/simplejson/__init__.py b/simplejson/__init__.py index b3e8a81..11294ee 100644 --- a/simplejson/__init__.py +++ b/simplejson/__init__.py @@ -118,7 +118,7 @@ Serializing multiple objects to JSON lines (newline-delimited JSON):: """ from __future__ import absolute_import -__version__ = '3.18.1' +__version__ = '3.18.2' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', |