summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2023-02-05 11:42:16 -0800
committerGitHub <noreply@github.com>2023-02-05 11:42:16 -0800
commit463416cc9f9f7d177f963c31ac33ec8acf199e6e (patch)
treeba5684f9d21058dd4b7e1e89d1313bd839152ac4
parent3725e4eeaf0dfc2a13496e5b78d44846e1a6a555 (diff)
parent4d098a56628f519e806c0c1ceceb1ce1b6e0d11c (diff)
downloadsimplejson-463416cc9f9f7d177f963c31ac33ec8acf199e6e.tar.gz
Merge pull request #311 from simplejson/test-sdist
Test the sdist
-rw-r--r--.github/workflows/build-and-deploy.yml8
-rw-r--r--CHANGES.txt5
-rw-r--r--conf.py2
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
5 files changed, 16 insertions, 3 deletions
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index bf0cb11..5f0f4f2 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -76,6 +76,14 @@ jobs:
- name: Build wheel
run: DISABLE_SPEEDUPS=1 python setup.py bdist_wheel
+ - name: Test sdist
+ run: |
+ mkdir tmp
+ cd tmp
+ tar zxf ../dist/simplejson-*.tar.gz
+ cd simplejson-*
+ REQUIRE_SPEEDUPS=1 python setup.py build build_ext -i test
+
- uses: actions/upload-artifact@v2
if: "github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')"
with:
diff --git a/CHANGES.txt b/CHANGES.txt
index e1185d7..c798b8f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+Version 3.18.4 released 2023-XX-XX
+
+* Test the sdist to prevent future regressions
+ https://github.com/simplejson/simplejson/pull/311
+
Version 3.18.3 released 2023-02-05
* Fix regression in sdist archive
diff --git a/conf.py b/conf.py
index e3b892b..921bbef 100644
--- a/conf.py
+++ b/conf.py
@@ -44,7 +44,7 @@ copyright = '2023, Bob Ippolito'
# The short X.Y version.
version = '3.18'
# The full version, including alpha/beta/rc tags.
-release = '3.18.3'
+release = '3.18.4'
# 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 8209f88..3ed60f7 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.3'
+VERSION = '3.18.4'
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 993d64d..47e49a3 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.3'
+__version__ = '3.18.4'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',