Skip to content

Commit

Permalink
Merge pull request #310 from simplejson/fix-sdist
Browse files Browse the repository at this point in the history
Build sdist without any overrides
  • Loading branch information
etrepum committed Feb 5, 2023
2 parents 64f1248 + 08991e0 commit 3725e4e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 6 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/build-and-deploy.yml
Expand Up @@ -70,8 +70,11 @@ jobs:
- 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
- name: Build sdist
run: python setup.py sdist

- name: Build wheel
run: DISABLE_SPEEDUPS=1 python setup.py bdist_wheel

- uses: actions/upload-artifact@v2
if: "github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')"
Expand Down
5 changes: 5 additions & 0 deletions CHANGES.txt
@@ -1,3 +1,8 @@
Version 3.18.3 released 2023-02-05

* Fix regression in sdist archive
https://github.com/simplejson/simplejson/pull/310

Version 3.18.2 released 2023-02-04

* Distribute a pure python wheel for Pyodide
Expand Down
4 changes: 2 additions & 2 deletions conf.py
Expand Up @@ -36,15 +36,15 @@

# General substitutions.
project = 'simplejson'
copyright = '2022, Bob Ippolito'
copyright = '2023, Bob Ippolito'

# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
#
# The short X.Y version.
version = '3.18'
# The full version, including alpha/beta/rc tags.
release = '3.18.2'
release = '3.18.3'

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -12,7 +12,7 @@
DistutilsPlatformError

IS_PYPY = hasattr(sys, 'pypy_translation_info')
VERSION = '3.18.2'
VERSION = '3.18.3'
DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python"

with open('README.rst', 'r') as f:
Expand Down
2 changes: 1 addition & 1 deletion simplejson/__init__.py
Expand Up @@ -118,7 +118,7 @@
"""
from __future__ import absolute_import
__version__ = '3.18.2'
__version__ = '3.18.3'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',
Expand Down

0 comments on commit 3725e4e

Please sign in to comment.