Merge branch 'master' into fix-importlib-deprecation

Author: edschofield

.github/SECURITY.md

@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+Security updates are applied only to the latest release.
+
+## Reporting a Vulnerability
+
+If you have discovered a security vulnerability in this project, please report it privately. **Do not disclose it as a public issue.** This gives us time to work with you to fix the issue before public exposure, reducing the chance that the exploit will be used before a patch is released.
+
+Please disclose it at [security advisory](https://github.com/PythonCharmers/python-future/security/advisories/new).
+
+This project is maintained by a team of volunteers on a reasonable-effort basis. As such, please give us at least 90 days to work on a fix before public exposure.

.github/workflows/ci.yml

@@ -0,0 +1,46 @@
+name: CI
+
+on:
+ pull_request:
+ push:
+
+concurrency:
+ group: ${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+
+jobs:
+ test:
+ strategy:
+ fail-fast: false
+ matrix:
+ versions:
+ - python: "2.6"
+ - python: "2.7"
+ - python: "3.3"
+ - python: "3.4"
+ - python: "3.5"
+ - python: "3.6"
+ - python: "3.7"
+ - python: "3.8"
+ - python: "3.9"
+
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - if: ${{ matrix.versions.python != '2.6' }}
+ run: |
+ docker build \
+ . \
+ --build-arg PYTHON_VERSION=${{ matrix.versions.python }} \
+ -t jmadler/python-future-builder:${{ matrix.versions.python }}
+ - if: ${{ matrix.versions.python == '2.6' }}
+ run: |
+ docker build \
+ . \
+ -f 2.6.Dockerfile \
+ -t jmadler/python-future-builder:${{ matrix.versions.python }}
+ - run: |
+ docker run \
+ -e PYTHON_VERSION=${{ matrix.versions.python }} \
+ jmadler/python-future-builder:${{ matrix.versions.python }} \
+ /root/python-future/test.sh

.gitignore

@@ -21,6 +21,8 @@ develop-eggs
 .installed.cfg
 lib
 lib64
+MANIFEST
+MANIFEST.in
 
 # Backup files
 *.bak

.travis.yml

@@ -0,0 +1,26 @@
+FROM mrupgrade/deadsnakes:2.6
+
+RUN mkdir -p ~/.pip/ && echo '[global] \n\
+trusted-host = pypi.python.org\n\
+ pypi.org\n\
+ files.pythonhosted.org\n\
+' >> ~/.pip/pip.conf
+
+RUN apt-get update && \
+ apt-get install -y curl
+
+RUN mkdir -p /root/pip && \
+ cd /root/pip && \
+ curl -O https://files.pythonhosted.org/packages/8a/e9/8468cd68b582b06ef554be0b96b59f59779627131aad48f8a5bce4b13450/wheel-0.29.0-py2.py3-none-any.whl && \
+ curl -O https://files.pythonhosted.org/packages/31/77/3781f65cafe55480b56914def99022a5d2965a4bb269655c89ef2f1de3cd/importlib-1.0.4.zip && \
+ curl -O https://files.pythonhosted.org/packages/ef/41/d8a61f1b2ba308e96b36106e95024977e30129355fd12087f23e4b9852a1/pytest-3.2.5-py2.py3-none-any.whl && \
+ curl -O https://files.pythonhosted.org/packages/f2/94/3af39d34be01a24a6e65433d19e107099374224905f1e0cc6bbe1fd22a2f/argparse-1.4.0-py2.py3-none-any.whl && \
+ curl -O https://files.pythonhosted.org/packages/72/20/7f0f433060a962200b7272b8c12ba90ef5b903e218174301d0abfd523813/unittest2-1.1.0-py2.py3-none-any.whl && \
+ curl -O https://files.pythonhosted.org/packages/53/67/9620edf7803ab867b175e4fd23c7b8bd8eba11cb761514dcd2e726ef07da/py-1.4.34-py2.py3-none-any.whl && \
+ curl -O https://files.pythonhosted.org/packages/53/25/ef88e8e45db141faa9598fbf7ad0062df8f50f881a36ed6a0073e1572126/ordereddict-1.1.tar.gz && \
+ curl -O https://files.pythonhosted.org/packages/17/0a/6ac05a3723017a967193456a2efa0aa9ac4b51456891af1e2353bb9de21e/traceback2-1.4.0-py2.py3-none-any.whl && \
+ curl -O https://files.pythonhosted.org/packages/65/26/32b8464df2a97e6dd1b656ed26b2c194606c16fe163c695a992b36c11cdf/six-1.13.0-py2.py3-none-any.whl && \
+ curl -O https://files.pythonhosted.org/packages/c7/a3/c5da2a44c85bfbb6eebcfc1dde24933f8704441b98fdde6528f4831757a6/linecache2-1.0.0-py2.py3-none-any.whl
+
+WORKDIR /root/python-future
+ADD . /root/python-future

2.6.Dockerfile

@@ -0,0 +1,7 @@
+ARG PYTHON_VERSION
+FROM python:${PYTHON_VERSION}-slim
+
+ENV LC_ALL=C.UTF-8
+
+WORKDIR /root/python-future
+ADD . /root/python-future

Dockerfile

@@ -3,6 +3,12 @@
 Overview: Easy, clean, reliable Python 2/3 compatibility
 ========================================================
 
+.. image:: https://github.com/PythonCharmers/python-future/actions/workflows/ci.yml/badge.svg?branch=master
+ :target: https://github.com/PythonCharmers/python-future/actions/workflows/ci.yml?query=branch%3Amaster
+
+.. image:: https://readthedocs.org/projects/python-future/badge/?version=latest
+ :target: https://python-future.readthedocs.io/en/latest/?badge=latest
+
 ``python-future`` is the missing compatibility layer between Python 2 and
 Python 3. It allows you to use a single, clean Python 3.x-compatible
 codebase to support both Python 2 and Python 3 with minimal overhead.
@@ -22,9 +28,6 @@ are `Mezzanine <http://mezzanine.jupo.org/>`_ and `ObsPy
 Features
 --------
 
-.. image:: https://travis-ci.org/PythonCharmers/python-future.svg?branch=master
- :target: https://travis-ci.org/PythonCharmers/python-future
-
 - ``future.builtins`` package (also available as ``builtins`` on Py2) provides
  backports and remappings for 20 builtins with different semantics on Py3
  versus Py2

README.rst

@@ -1,13 +1,11 @@
-Currently the tests are passing on OS X and Linux on Python 2.7 and 3.4.
+A docker image, python-future-builder, is used to do testing and building. The test suite can be run with: 
 
-The test suite can be run with:
-
- $ tox
+ $ bash build.sh
 
 which tests the module under a number of different python versions, where available, or with:
 
  $ py.test
 
 To execute a single test:
 
- $ pytest -k test_chained_exceptions_stacktrace
+ $ pytest -k test_chained_exceptions_stacktrace

TESTING.txt

@@ -85,7 +85,7 @@ def encode_filename(filename):
 
 def with_metaclass(meta, *bases):
  # This requires a bit of explanation: the basic idea is to make a
- # dummy metaclass for one level of class instanciation that replaces
+ # dummy metaclass for one level of class instantiation that replaces
  # itself with the actual metaclass. Because of internal type checks
  # we also need to make sure that we downgrade the custom metaclass
  # for one level to something closer to type (that's why __call__ and

docs/3rd-party-py3k-compat-code/jinja2_compat.py

@@ -63,7 +63,7 @@
  "collapsed": false,
  "input": [
  "# Py3-style iterators written as new-style classes (subclasses of\n",
- "# future.builtins.object) are backward compatibile with Py2:\n",
+ "# future.builtins.object) are backward compatible with Py2:\n",
  "class Upper(object):\n",
  " def __init__(self, iterable):\n",
  " self._iter = iter(iterable)\n",