Merge pull request #103 from pallets/src

Move to src directory

11 files changed, 48 insertions, 46 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index 253126a..b05238e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -3,6 +3,8 @@ environment:
     TOXENV: py
 
   matrix:
+    - PYTHON: C:\Python37-x64
+    - PYTHON: C:\Python37
     - PYTHON: C:\Python36-x64
     - PYTHON: C:\Python36
     - PYTHON: C:\Python35-x64
@@ -16,12 +18,13 @@ init:
   - SET PATH=%PYTHON%;%PATH%
 
 install:
-  - python -m pip install -U pip setuptools wheel tox
+  - python -m pip install -IU pip
+  - python -m pip install -IU setuptools wheel tox
 
 build: false
 
 test_script:
-  - python -m tox
+  - python -m tox --skip-missing-interpreters=false
 
 after_test:
   - python setup.py release bdist_wheel
@@ -33,4 +36,7 @@ artifacts:
 branches:
   only:
     - master
-    - /^.*-maintenance$/
+    - /^.*\.x$/
+
+cache:
+  - '%LOCALAPPDATA%\pip\Cache'
diff --git a/.travis.yml b/.travis.yml
index ccdc19f..4ab5fc6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +1,41 @@
 os: linux
 sudo: false
 language: python
+python:
+  - "3.6"
+  - "3.5"
+  - "3.4"
+  - "2.7"
+  - "nightly"
+  - "pypy3"
+env: TOXENV=py,codecov
 
 matrix:
   include:
-    - python: 3.6
-      env: TOXENV=py,codecov
-    - python: 3.6
-      env: TOXENV=docs-html
-    - python: 3.5
-      env: TOXENV=py,codecov
-    - python: 3.4
-      env: TOXENV=py,codecov
-    - python: 2.7
-      env: TOXENV=py,codecov
-    - python: pypy
-      env: TOXENV=py,codecov
-    - python: nightly
-      env: TOXENV=py
+    - dist: xenial
+      sudo: required
+      python: "3.7"
+    - env: TOXENV=docs-html
   allow_failures:
-    - python: nigthly
-      env: TOXENV=py
+    - python: nightly
+    - python: pypy3
+  fast_finish: true
 
 install:
   - pip install tox
 
 script:
-  - tox
+  - tox --skip-missing-interpreters=false
 
 cache:
-  - pip
+  directories:
+    - $HOME/.cache/pip
+    - $HOME/.cache/pre-commit
 
 branches:
   only:
     - master
-    - /^.*-maintenance$/
+    - /^.*\.x$/
 
 notifications:
   email: false
diff --git a/MANIFEST.in b/MANIFEST.in
index 7e6029d..e4855b7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include AUTHORS.rst CHANGES.rst LICENSE.rst tox.ini
-recursive-include markupsafe *.c
+recursive-include src/markupsafe *.c
 graft tests
diff --git a/setup.cfg b/setup.cfg
index 3c5e533..0c425b8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,6 @@ source =
 
 [coverage:paths]
 source =
-    markupsafe
+    src/markupsafe
     .tox/*/lib/python*/site-packages/markupsafe
-    .tox/pypy/site-packages/markupsafe
+    .tox/*/site-packages/markupsafe
diff --git a/setup.py b/setup.py
index cbc8905..0839504 100644
--- a/setup.py
+++ b/setup.py
@@ -11,20 +11,20 @@ from distutils.errors import (
     DistutilsPlatformError
 )
 
-from setuptools import Extension, setup
+from setuptools import Extension, setup, find_packages
 from setuptools.command.build_ext import build_ext
 
 with io.open('README.rst', 'rt', encoding='utf8') as f:
     readme = f.read()
 
-with io.open('markupsafe/__init__.py', 'rt', encoding='utf8') as f:
+with io.open('src/markupsafe/__init__.py', 'rt', encoding='utf8') as f:
     version = re.search(r'__version__ = \'(.*?)\'', f.read()).group(1)
 
 is_jython = 'java' in sys.platform
 is_pypy = hasattr(sys, 'pypy_version_info')
 
 ext_modules = [
-    Extension('markupsafe._speedups', ['markupsafe/_speedups.c']),
+    Extension('markupsafe._speedups', ['src/markupsafe/_speedups.c']),
 ]
 
 
@@ -100,7 +100,8 @@ def run_setup(with_binary):
                 'pallets-sphinx-themes',
             ],
         },
-        packages=['markupsafe'],
+        packages=find_packages("src"),
+        package_dir={"": "src"},
         include_package_data=True,
         zip_safe=False,
         cmdclass={'build_ext': ve_build_ext},
diff --git a/markupsafe/__init__.py b/src/markupsafe/__init__.py
index 0bd6fd2..0bd6fd2 100644
--- a/markupsafe/__init__.py
+++ b/src/markupsafe/__init__.py
diff --git a/markupsafe/_compat.py b/src/markupsafe/_compat.py
index 4d2e2cd..4d2e2cd 100644
--- a/markupsafe/_compat.py
+++ b/src/markupsafe/_compat.py
diff --git a/markupsafe/_constants.py b/src/markupsafe/_constants.py
index ea6ac2f..ea6ac2f 100644
--- a/markupsafe/_constants.py
+++ b/src/markupsafe/_constants.py
diff --git a/markupsafe/_native.py b/src/markupsafe/_native.py
index 801f285..801f285 100644
--- a/markupsafe/_native.py
+++ b/src/markupsafe/_native.py
diff --git a/markupsafe/_speedups.c b/src/markupsafe/_speedups.c
index 22a604d..22a604d 100644
--- a/markupsafe/_speedups.c
+++ b/src/markupsafe/_speedups.c
diff --git a/tox.ini b/tox.ini
index efd0163..a193134 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,44 +1,38 @@
 [tox]
 envlist =
-    py{36,35,34,27,py}
+    py{37,36,35,34,27,py3,py}
     docs-html
     coverage-report
+skip_missing_interpreters = true
 
 [testenv]
-passenv = LANG
+setenv =
+    COVERAGE_FILE = .coverage.{envname}
 deps =
     pytest-cov
-commands = pytest --cov={envsitepackagesdir}/markupsafe --cov-config=tox.ini --cov-report='' --cov-append {posargs}
+commands = pytest --cov --cov-report= {posargs}
 
 [testenv:docs-html]
 deps = -r docs/requirements.txt
 commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
 
 [testenv:coverage-report]
+setenv =
+    COVERAGE_FILE = .coverage
 deps = coverage
 skip_install = true
 commands =
     coverage combine
-    coverage report
     coverage html
+    coverage report
 
 [testenv:codecov]
 passenv = CI TRAVIS TRAVIS_*
+setenv =
+    COVERAGE_FILE = .coverage
 deps = codecov
 skip_install = true
 commands =
     coverage combine
-    coverage report
     codecov
-
-[coverage:run]
-branch = True
-parallel = True
-source =
-    markupsafe
-
-[coverage:paths]
-source =
-    markupsafe
-    .tox/*/lib/python*/site-packages/markupsafe
-    .tox/pypy/site-packages/markupsafe
+    coverage report