Move to src directory (#6506)

psf · Aug 13, 2023 · d63e94f · d63e94f
1 parent e9fa2e2
commit d63e94f
Show file tree

Hide file tree

Showing 22 changed files with 11 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -1,23 +1,23 @@
 .PHONY: docs
 init:
-	pip install -r requirements-dev.txt
+	python -m pip install -r requirements-dev.txt
 test:
 	# This runs all of the tests on all supported Python versions.
 	tox -p
 ci:
-	pytest tests --junitxml=report.xml
+	python -m pytest tests --junitxml=report.xml
 
 test-readme:
 	python setup.py check --restructuredtext --strict && ([ $$? -eq 0 ] && echo "README.rst and HISTORY.rst ok") || echo "Invalid markup in README.rst or HISTORY.rst!"
 
 flake8:
-	flake8 --ignore=E501,F401,E128,E402,E731,F821 requests
+	python -m flake8 src/requests
 
 coverage:
-	pytest --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=requests tests
+	python -m pytest --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=src/requests tests
 
 publish:
-	pip install 'twine>=1.5.0'
+	python -m pip install 'twine>=1.5.0'
 	python setup.py sdist bdist_wheel
 	twine upload dist/*
 	rm -fr build dist .egg requests.egg-info

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,13 +1,10 @@
 [tool.isort]
 profile = "black"
-src_paths = ["requests", "test"]
+src_paths = ["src/requests", "test"]
 honor_noqa = true
 
 [tool.pytest.ini_options]
 addopts = "--doctest-modules"
 doctest_optionflags = "NORMALIZE_WHITESPACE ELLIPSIS"
 minversion = "6.2"
-testpaths = [
-    "requests",
-    "tests",
-]
+testpaths = ["tests"]
diff --git a/setup.cfg b/setup.cfg
@@ -12,6 +12,6 @@ requires-dist =
 [flake8]
 ignore = E203, E501, W503
 per-file-ignores =
-    requests/__init__.py:E402, F401
-    requests/compat.py:E402, F401
+    src/requests/__init__.py:E402, F401
+    src/requests/compat.py:E402, F401
     tests/compat.py:F401
diff --git a/setup.py b/setup.py
@@ -75,7 +75,7 @@ def run_tests(self):
 
 about = {}
 here = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(here, "requests", "__version__.py"), "r", "utf-8") as f:
+with open(os.path.join(here, "src", "requests", "__version__.py"), "r", "utf-8") as f:
     exec(f.read(), about)
 
 with open("README.md", "r", "utf-8") as f:
@@ -92,7 +92,7 @@ def run_tests(self):
     url=about["__url__"],
     packages=["requests"],
     package_data={"": ["LICENSE", "NOTICE"]},
-    package_dir={"requests": "requests"},
+    package_dir={"": "src"},
     include_package_data=True,
     python_requires=">=3.7",
     install_requires=requires,

diff --git a/requests/__init__.py → src/requests/__init__.py b/requests/__init__.py → src/requests/__init__.py
diff --git a/requests/__version__.py → src/requests/__version__.py b/requests/__version__.py → src/requests/__version__.py
diff --git a/requests/_internal_utils.py → src/requests/_internal_utils.py b/requests/_internal_utils.py → src/requests/_internal_utils.py
diff --git a/requests/adapters.py → src/requests/adapters.py b/requests/adapters.py → src/requests/adapters.py
diff --git a/requests/api.py → src/requests/api.py b/requests/api.py → src/requests/api.py
diff --git a/requests/auth.py → src/requests/auth.py b/requests/auth.py → src/requests/auth.py
diff --git a/requests/certs.py → src/requests/certs.py b/requests/certs.py → src/requests/certs.py
diff --git a/requests/compat.py → src/requests/compat.py b/requests/compat.py → src/requests/compat.py
diff --git a/requests/cookies.py → src/requests/cookies.py b/requests/cookies.py → src/requests/cookies.py
diff --git a/requests/exceptions.py → src/requests/exceptions.py b/requests/exceptions.py → src/requests/exceptions.py
diff --git a/requests/help.py → src/requests/help.py b/requests/help.py → src/requests/help.py
diff --git a/requests/hooks.py → src/requests/hooks.py b/requests/hooks.py → src/requests/hooks.py
diff --git a/requests/models.py → src/requests/models.py b/requests/models.py → src/requests/models.py
diff --git a/requests/packages.py → src/requests/packages.py b/requests/packages.py → src/requests/packages.py
diff --git a/requests/sessions.py → src/requests/sessions.py b/requests/sessions.py → src/requests/sessions.py
diff --git a/requests/status_codes.py → src/requests/status_codes.py b/requests/status_codes.py → src/requests/status_codes.py
diff --git a/requests/structures.py → src/requests/structures.py b/requests/structures.py → src/requests/structures.py
diff --git a/requests/utils.py → src/requests/utils.py b/requests/utils.py → src/requests/utils.py