[Python-modules-commits] [simplejson] 01/11: Import simplejson_3.8.2.orig.tar.gz

Ondřej Nový onovy-guest at moszumanska.debian.org
Thu Apr 14 20:52:48 UTC 2016


This is an automated email from the git hooks/post-receive script.

onovy-guest pushed a commit to branch master
in repository simplejson.

commit a236fe4ff484fbba9c65e84fd555cd46dc7227ed
Author: Ondřej Nový <novy at ondrej.org>
Date:   Thu Apr 14 21:33:56 2016 +0200

    Import simplejson_3.8.2.orig.tar.gz
---
 CHANGES.txt                     |  9 ++++++++
 PKG-INFO                        |  2 +-
 conf.py                         |  2 +-
 scripts/artifacts.py            | 48 +++++++++++++++++++++++++++++++++++++++++
 setup.py                        |  2 +-
 simplejson.egg-info/PKG-INFO    |  2 +-
 simplejson.egg-info/SOURCES.txt |  1 +
 simplejson/__init__.py          |  2 +-
 simplejson/_speedups.c          |  2 +-
 9 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index af8e566..e657176 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,12 @@
+Version 3.8.2 released 2016-02-14
+
+* Fix implicit cast compiler warning in _speedups.c
+* simplejson is now available as wheels for OS X and Windows thanks to Travis-CI
+  and AppVeyor respectively! Many thanks to @aebrahim for getting this party
+  started.
+  https://github.com/simplejson/simplejson/pull/130
+  https://github.com/simplejson/simplejson/issues/122
+
 Version 3.8.1 released 2015-10-27
 
 * Fix issue with iterable_as_array and indent option
diff --git a/PKG-INFO b/PKG-INFO
index b244932..87a3dbc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: simplejson
-Version: 3.8.1
+Version: 3.8.2
 Summary: Simple, fast, extensible JSON encoder/decoder for Python
 Home-page: http://github.com/simplejson/simplejson
 Author: Bob Ippolito
diff --git a/conf.py b/conf.py
index d83bca4..8a6a391 100644
--- a/conf.py
+++ b/conf.py
@@ -44,7 +44,7 @@ copyright = '2015, Bob Ippolito'
 # The short X.Y version.
 version = '3.8'
 # The full version, including alpha/beta/rc tags.
-release = '3.8.1'
+release = '3.8.2'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
diff --git a/scripts/artifacts.py b/scripts/artifacts.py
new file mode 100644
index 0000000..4be1ea3
--- /dev/null
+++ b/scripts/artifacts.py
@@ -0,0 +1,48 @@
+try:
+    from urllib.request import urlopen
+except ImportError:
+    from urllib import urlopen
+
+import io
+import json
+import subprocess
+
+
+def get_json(url):
+    return json.loads(urlopen(url).read().decode('utf-8'))
+
+
+def download_file(src_url, dest_path):
+    print(dest_path)
+    subprocess.call(
+        ['curl', '-L', '-#', '-o', dest_path, src_url])
+
+
+def download_appveyor_artifacts():
+    api_url = 'https://ci.appveyor.com/api'
+    builds = get_json(
+        '{}/projects/etrepum/simplejson'.format(api_url))
+
+    for job in builds['build']['jobs']:
+        url = '{api_url}/buildjobs/{jobId}/artifacts'.format(
+            api_url=api_url, **job)
+        for artifact in get_json(url):
+            download_file(
+                '{url}/{fileName}'.format(url=url, **artifact),
+                artifact['fileName'])
+
+
+def download_github_artifacts():
+    release = get_json(
+        'https://api.github.com/repos/simplejson/simplejson/releases/latest')
+    for asset in release['assets']:
+        download_file(asset['url'], 'dist/{name}'.format(**asset))
+
+
+def main():
+    download_appveyor_artifacts()
+    download_github_artifacts()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/setup.py b/setup.py
index a5d3500..1a92c2f 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
 
 IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '3.8.1'
+VERSION = '3.8.2'
 DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python"
 
 with open('README.rst', 'r') as f:
diff --git a/simplejson.egg-info/PKG-INFO b/simplejson.egg-info/PKG-INFO
index b244932..87a3dbc 100644
--- a/simplejson.egg-info/PKG-INFO
+++ b/simplejson.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: simplejson
-Version: 3.8.1
+Version: 3.8.2
 Summary: Simple, fast, extensible JSON encoder/decoder for Python
 Home-page: http://github.com/simplejson/simplejson
 Author: Bob Ippolito
diff --git a/simplejson.egg-info/SOURCES.txt b/simplejson.egg-info/SOURCES.txt
index 4b75657..305d038 100644
--- a/simplejson.egg-info/SOURCES.txt
+++ b/simplejson.egg-info/SOURCES.txt
@@ -5,6 +5,7 @@ README.rst
 conf.py
 index.rst
 setup.py
+scripts/artifacts.py
 scripts/make_docs.py
 simplejson/__init__.py
 simplejson/_speedups.c
diff --git a/simplejson/__init__.py b/simplejson/__init__.py
index c448742..b7fe828 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -97,7 +97,7 @@ Using simplejson.tool from the shell to validate and pretty-print::
     Expecting property name: line 1 column 3 (char 2)
 """
 from __future__ import absolute_import
-__version__ = '3.8.1'
+__version__ = '3.8.2'
 __all__ = [
     'dump', 'dumps', 'load', 'loads',
     'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',
diff --git a/simplejson/_speedups.c b/simplejson/_speedups.c
index 173c5e1..9976464 100644
--- a/simplejson/_speedups.c
+++ b/simplejson/_speedups.c
@@ -2654,7 +2654,7 @@ encoder_init(PyObject *self, PyObject *args, PyObject *kwds)
     if (PyInt_Check(int_as_string_bitcount) || PyLong_Check(int_as_string_bitcount)) {
         static const unsigned int long_long_bitsize = SIZEOF_LONG_LONG * 8;
         int int_as_string_bitcount_val = (int)PyLong_AsLong(int_as_string_bitcount);
-        if (int_as_string_bitcount_val > 0 && int_as_string_bitcount_val < long_long_bitsize) {
+        if (int_as_string_bitcount_val > 0 && int_as_string_bitcount_val < (int)long_long_bitsize) {
             s->max_long_size = PyLong_FromUnsignedLongLong(1ULL << int_as_string_bitcount_val);
             s->min_long_size = PyLong_FromLongLong(-1LL << int_as_string_bitcount_val);
             if (s->min_long_size == NULL || s->max_long_size == NULL) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/simplejson.git



More information about the Python-modules-commits mailing list