summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2023-02-05 10:20:08 -0800
committerGitHub <noreply@github.com>2023-02-05 10:20:08 -0800
commit3725e4eeaf0dfc2a13496e5b78d44846e1a6a555 (patch)
treeddedff4267629f4e10441a45126bfc62077def53
parent64f12484892079e175c7636d006cd74f04e26461 (diff)
parent08991e091d314e0a200711e0b7b401fb6970d868 (diff)
downloadsimplejson-3725e4eeaf0dfc2a13496e5b78d44846e1a6a555.tar.gz
Merge pull request #310 from simplejson/fix-sdistv3.18.3
Build sdist without any overrides
-rw-r--r--.github/workflows/build-and-deploy.yml7
-rw-r--r--CHANGES.txt5
-rw-r--r--conf.py4
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
5 files changed, 14 insertions, 6 deletions
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index d6b8004..bf0cb11 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -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/')"
diff --git a/CHANGES.txt b/CHANGES.txt
index 6302c01..e1185d7 100644
--- a/CHANGES.txt
+++ b/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
diff --git a/conf.py b/conf.py
index ab6884b..e3b892b 100644
--- a/conf.py
+++ b/conf.py
@@ -36,7 +36,7 @@ master_doc = 'index'
# 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.
@@ -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.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:
diff --git a/setup.py b/setup.py
index 9bd1dd3..8209f88 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
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:
diff --git a/simplejson/__init__.py b/simplejson/__init__.py
index 11294ee..993d64d 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.2'
+__version__ = '3.18.3'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',