Move tests folder to root folder (#61)

Kludex · Feb 28, 2023 · 3929f8e · 3929f8e
1 parent 4ccfb3a
commit 3929f8e
Show file tree

Hide file tree

Showing 52 changed files with 14 additions and 25 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -5,7 +5,7 @@
 branch = False
 # branch = True
 omit =
-    multipart/tests/*
+    tests/*
 
 [report]
 # Regexes for lines to exclude from consideration

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -10,7 +10,7 @@ name: Upload Python Package
 
 on:
   push:
-    tags:        
+    tags:
       - '[0-9]+.[0-9]+.[0-9]+.*'           # Run on every git tag with semantic versioning. i.e: 1.5.0 or 1.5.0rc1
 
 permissions:

diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/multipart/__init__.py b/multipart/__init__.py
@@ -1,15 +1,15 @@
 # This is the canonical package information.
-__author__    = 'Andrew Dunham'
-__license__   = 'Apache'
+__author__ = "Andrew Dunham"
+__license__ = "Apache"
 __copyright__ = "Copyright (c) 2012-2013, Andrew Dunham"
-__version__   = "0.0.6"
+__version__ = "0.0.6"
 
 
 from .multipart import (
     FormParser,
     MultipartParser,
-    QuerystringParser,
     OctetStreamParser,
+    QuerystringParser,
     create_form_parser,
     parse_form,
 )
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,9 +9,7 @@ description = "A streaming multipart parser for Python"
 readme = "README.rst"
 license = "Apache-2.0"
 requires-python = ">=3.7"
-authors = [
-    { name = "Andrew Dunham", email = "andrew@du.nham.ca" },
-]
+authors = [{ name = "Andrew Dunham", email = "andrew@du.nham.ca" }]
 classifiers = [
     'Development Status :: 5 - Production/Stable',
     'Environment :: Web Environment',
@@ -56,10 +54,7 @@ Source = "https://github.com/andrew-d/python-multipart"
 path = "multipart/__init__.py"
 
 [tool.hatch.build.targets.wheel]
-packages = [
-    "multipart",
-]
+packages = ["multipart"]
+
 [tool.hatch.build.targets.sdist]
-include = [
-    "/multipart",
-]
+include = ["/multipart", "/tests"]
diff --git a/tasks.py b/tasks.py
@@ -28,7 +28,7 @@ def test(ctx, all=False):
         test_cmd.append('-m "not slow_test"')
 
     # Test in this directory
-    test_cmd.append(os.path.join("multipart", "tests"))
+    test_cmd.append("tests")
 
     # Run the command.
     # TODO: why does this fail with pty=True?

diff --git a/multipart/tests/__init__.py → tests/__init__.py b/multipart/tests/__init__.py → tests/__init__.py
diff --git a/multipart/tests/compat.py → tests/compat.py b/multipart/tests/compat.py → tests/compat.py
diff --git a/...rt/tests/test_data/http/CR_in_header.http → tests/test_data/http/CR_in_header.http b/...rt/tests/test_data/http/CR_in_header.http → tests/test_data/http/CR_in_header.http
diff --git a/...rt/tests/test_data/http/CR_in_header.yaml → tests/test_data/http/CR_in_header.yaml b/...rt/tests/test_data/http/CR_in_header.yaml → tests/test_data/http/CR_in_header.yaml
diff --git a/...ts/test_data/http/CR_in_header_value.http → tests/test_data/http/CR_in_header_value.http b/...ts/test_data/http/CR_in_header_value.http → tests/test_data/http/CR_in_header_value.http
diff --git a/...ts/test_data/http/CR_in_header_value.yaml → tests/test_data/http/CR_in_header_value.yaml b/...ts/test_data/http/CR_in_header_value.yaml → tests/test_data/http/CR_in_header_value.yaml
diff --git a/...test_data/http/almost_match_boundary.http → ...test_data/http/almost_match_boundary.http b/...test_data/http/almost_match_boundary.http → ...test_data/http/almost_match_boundary.http
diff --git a/...test_data/http/almost_match_boundary.yaml → ...test_data/http/almost_match_boundary.yaml b/...test_data/http/almost_match_boundary.yaml → ...test_data/http/almost_match_boundary.yaml
diff --git a/...ttp/almost_match_boundary_without_CR.http → ...ttp/almost_match_boundary_without_CR.http b/...ttp/almost_match_boundary_without_CR.http → ...ttp/almost_match_boundary_without_CR.http
diff --git a/...ttp/almost_match_boundary_without_CR.yaml → ...ttp/almost_match_boundary_without_CR.yaml b/...ttp/almost_match_boundary_without_CR.yaml → ...ttp/almost_match_boundary_without_CR.yaml
diff --git a/...ttp/almost_match_boundary_without_LF.http → ...ttp/almost_match_boundary_without_LF.http b/...ttp/almost_match_boundary_without_LF.http → ...ttp/almost_match_boundary_without_LF.http
diff --git a/...ttp/almost_match_boundary_without_LF.yaml → ...ttp/almost_match_boundary_without_LF.yaml b/...ttp/almost_match_boundary_without_LF.yaml → ...ttp/almost_match_boundary_without_LF.yaml
diff --git a/..._match_boundary_without_final_hyphen.http → ..._match_boundary_without_final_hyphen.http b/..._match_boundary_without_final_hyphen.http → ..._match_boundary_without_final_hyphen.http
diff --git a/..._match_boundary_without_final_hyphen.yaml → ..._match_boundary_without_final_hyphen.yaml b/..._match_boundary_without_final_hyphen.yaml → ..._match_boundary_without_final_hyphen.yaml
diff --git a/...ts/test_data/http/bad_end_of_headers.http → tests/test_data/http/bad_end_of_headers.http b/...ts/test_data/http/bad_end_of_headers.http → tests/test_data/http/bad_end_of_headers.http
diff --git a/...ts/test_data/http/bad_end_of_headers.yaml → tests/test_data/http/bad_end_of_headers.yaml b/...ts/test_data/http/bad_end_of_headers.yaml → tests/test_data/http/bad_end_of_headers.yaml
diff --git a/...tests/test_data/http/bad_header_char.http → tests/test_data/http/bad_header_char.http b/...tests/test_data/http/bad_header_char.http → tests/test_data/http/bad_header_char.http
diff --git a/...tests/test_data/http/bad_header_char.yaml → tests/test_data/http/bad_header_char.yaml b/...tests/test_data/http/bad_header_char.yaml → tests/test_data/http/bad_header_char.yaml
diff --git a/.../test_data/http/bad_initial_boundary.http → .../test_data/http/bad_initial_boundary.http b/.../test_data/http/bad_initial_boundary.http → .../test_data/http/bad_initial_boundary.http
diff --git a/.../test_data/http/bad_initial_boundary.yaml → .../test_data/http/bad_initial_boundary.yaml b/.../test_data/http/bad_initial_boundary.yaml → .../test_data/http/bad_initial_boundary.yaml
diff --git a/...tests/test_data/http/base64_encoding.http → tests/test_data/http/base64_encoding.http b/...tests/test_data/http/base64_encoding.http → tests/test_data/http/base64_encoding.http
diff --git a/...tests/test_data/http/base64_encoding.yaml → tests/test_data/http/base64_encoding.yaml b/...tests/test_data/http/base64_encoding.yaml → tests/test_data/http/base64_encoding.yaml
diff --git a/...rt/tests/test_data/http/empty_header.http → tests/test_data/http/empty_header.http b/...rt/tests/test_data/http/empty_header.http → tests/test_data/http/empty_header.http
diff --git a/...rt/tests/test_data/http/empty_header.yaml → tests/test_data/http/empty_header.yaml b/...rt/tests/test_data/http/empty_header.yaml → tests/test_data/http/empty_header.yaml
diff --git a/...tests/test_data/http/multiple_fields.http → tests/test_data/http/multiple_fields.http b/...tests/test_data/http/multiple_fields.http → tests/test_data/http/multiple_fields.http
diff --git a/...tests/test_data/http/multiple_fields.yaml → tests/test_data/http/multiple_fields.yaml b/...tests/test_data/http/multiple_fields.yaml → tests/test_data/http/multiple_fields.yaml
diff --git a/.../tests/test_data/http/multiple_files.http → tests/test_data/http/multiple_files.http b/.../tests/test_data/http/multiple_files.http → tests/test_data/http/multiple_files.http
diff --git a/.../tests/test_data/http/multiple_files.yaml → tests/test_data/http/multiple_files.yaml b/.../tests/test_data/http/multiple_files.yaml → tests/test_data/http/multiple_files.yaml
diff --git a/..._data/http/quoted_printable_encoding.http → ..._data/http/quoted_printable_encoding.http b/..._data/http/quoted_printable_encoding.http → ..._data/http/quoted_printable_encoding.http
diff --git a/..._data/http/quoted_printable_encoding.yaml → ..._data/http/quoted_printable_encoding.yaml b/..._data/http/quoted_printable_encoding.yaml → ..._data/http/quoted_printable_encoding.yaml
diff --git a/...rt/tests/test_data/http/single_field.http → tests/test_data/http/single_field.http b/...rt/tests/test_data/http/single_field.http → tests/test_data/http/single_field.http
diff --git a/...rt/tests/test_data/http/single_field.yaml → tests/test_data/http/single_field.yaml b/...rt/tests/test_data/http/single_field.yaml → tests/test_data/http/single_field.yaml
diff --git a/...s/test_data/http/single_field_blocks.http → ...s/test_data/http/single_field_blocks.http b/...s/test_data/http/single_field_blocks.http → ...s/test_data/http/single_field_blocks.http
diff --git a/...s/test_data/http/single_field_blocks.yaml → ...s/test_data/http/single_field_blocks.yaml b/...s/test_data/http/single_field_blocks.yaml → ...s/test_data/http/single_field_blocks.yaml
diff --git a/...s/test_data/http/single_field_longer.http → ...s/test_data/http/single_field_longer.http b/...s/test_data/http/single_field_longer.http → ...s/test_data/http/single_field_longer.http
diff --git a/...s/test_data/http/single_field_longer.yaml → ...s/test_data/http/single_field_longer.yaml b/...s/test_data/http/single_field_longer.yaml → ...s/test_data/http/single_field_longer.yaml
diff --git a/...t_data/http/single_field_single_file.http → ...t_data/http/single_field_single_file.http b/...t_data/http/single_field_single_file.http → ...t_data/http/single_field_single_file.http
diff --git a/...t_data/http/single_field_single_file.yaml → ...t_data/http/single_field_single_file.yaml b/...t_data/http/single_field_single_file.yaml → ...t_data/http/single_field_single_file.yaml
diff --git a/...p/single_field_with_leading_newlines.http → ...p/single_field_with_leading_newlines.http b/...p/single_field_with_leading_newlines.http → ...p/single_field_with_leading_newlines.http
diff --git a/...p/single_field_with_leading_newlines.yaml → ...p/single_field_with_leading_newlines.yaml b/...p/single_field_with_leading_newlines.yaml → ...p/single_field_with_leading_newlines.yaml
diff --git a/...art/tests/test_data/http/single_file.http → tests/test_data/http/single_file.http b/...art/tests/test_data/http/single_file.http → tests/test_data/http/single_file.http
diff --git a/...art/tests/test_data/http/single_file.yaml → tests/test_data/http/single_file.yaml b/...art/tests/test_data/http/single_file.yaml → tests/test_data/http/single_file.yaml
diff --git a/...t/tests/test_data/http/utf8_filename.http → tests/test_data/http/utf8_filename.http b/...t/tests/test_data/http/utf8_filename.http → tests/test_data/http/utf8_filename.http
diff --git a/...t/tests/test_data/http/utf8_filename.yaml → tests/test_data/http/utf8_filename.yaml b/...t/tests/test_data/http/utf8_filename.yaml → tests/test_data/http/utf8_filename.yaml
diff --git a/multipart/tests/test_multipart.py → tests/test_multipart.py b/multipart/tests/test_multipart.py → tests/test_multipart.py
@@ -1,8 +1,6 @@
 import os
 import sys
-import glob
 import yaml
-import base64
 import random
 import tempfile
 import unittest
@@ -12,9 +10,9 @@
     slow_test,
 )
 from io import BytesIO
-from unittest.mock import MagicMock, Mock, patch
+from unittest.mock import Mock
 
-from ..multipart import *
+from multipart.multipart import *
 
 
 # Get the current directory for our later test cases.

diff --git a/tox.ini b/tox.ini
@@ -8,4 +8,4 @@ deps=
     pytest-timeout
     PyYAML
 commands=
-    pytest --cov-report term-missing --cov-config .coveragerc --cov multipart --timeout=30 multipart/tests
+    pytest --cov-report term-missing --cov-config .coveragerc --cov multipart --timeout=30 tests