diff --git a/defs.bzl b/defs.bzl index 5823be4bf..564f1989a 100644 --- a/defs.bzl +++ b/defs.bzl @@ -2,13 +2,13 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") load("@bazel_skylib//lib:versions.bzl", "versions") load("@rules_rust//rust:repositories.bzl", "rust_repositories") load("@ankidesktop//cargo:crates.bzl", "raze_fetch_remote_crates") -load(":python.bzl", "setup_local_python") +load("//python:python.bzl", "setup_local_python") load("//proto:protobuf.bzl", "setup_protobuf_binary") load("//proto:clang_format.bzl", "setup_clang_format") load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install") load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories") -load("//pip/pyqt5:defs.bzl", "install_pyqt5") -load("//pip/pyqt6:defs.bzl", "install_pyqt6") +load("//python/pyqt5:defs.bzl", "install_pyqt5") +load("//python/pyqt6:defs.bzl", "install_pyqt6") load("@rules_python//python:pip.bzl", "pip_parse") anki_version = "2.1.49" @@ -35,7 +35,7 @@ def setup_deps(): pip_parse( name = "py_deps", - requirements_lock = "@ankidesktop//pip:requirements.txt", + requirements_lock = "@ankidesktop//python:requirements.txt", python_interpreter_target = "@python//:python", ) diff --git a/pylib/BUILD.bazel b/pylib/BUILD.bazel index 8c791286f..478387b45 100644 --- a/pylib/BUILD.bazel +++ b/pylib/BUILD.bazel @@ -20,14 +20,14 @@ py_test( args = [ "anki", "$(location mypy.ini)", - "$(location //pip/stubs:extendsitepkgs)", + "$(location //python/stubs:extendsitepkgs)", ], data = [ "mypy.ini", - "//pip/stubs", - "//pip/stubs:extendsitepkgs", + "//python/stubs", + "//python/stubs:extendsitepkgs", ], - env = {"EXTRA_SITE_PACKAGES": "$(location //pip/stubs)"}, + env = {"EXTRA_SITE_PACKAGES": "$(location //python/stubs)"}, main = "tests/run_mypy.py", deps = [ "//pylib/anki", diff --git a/pip/BUILD.bazel b/python/BUILD.bazel similarity index 100% rename from pip/BUILD.bazel rename to python/BUILD.bazel diff --git a/pip/README.md b/python/README.md similarity index 100% rename from pip/README.md rename to python/README.md diff --git a/pip/binary.bzl b/python/binary.bzl similarity index 100% rename from pip/binary.bzl rename to python/binary.bzl diff --git a/pip/licenses.json b/python/licenses.json similarity index 100% rename from pip/licenses.json rename to python/licenses.json diff --git a/pip/licenses.sh b/python/licenses.sh similarity index 100% rename from pip/licenses.sh rename to python/licenses.sh diff --git a/pip/pyqt5/BUILD.bazel b/python/pyqt5/BUILD.bazel similarity index 100% rename from pip/pyqt5/BUILD.bazel rename to python/pyqt5/BUILD.bazel diff --git a/pip/pyqt5/defs.bzl b/python/pyqt5/defs.bzl similarity index 95% rename from pip/pyqt5/defs.bzl rename to python/pyqt5/defs.bzl index 8845e8c49..2c29480e7 100644 --- a/pip/pyqt5/defs.bzl +++ b/python/pyqt5/defs.bzl @@ -30,7 +30,7 @@ If the label is specified it will overwrite the python_interpreter attribute. """), "_script": attr.label( executable = True, - default = Label("//pip/pyqt5:install_pyqt5.py"), + default = Label("//python/pyqt5:install_pyqt5.py"), cfg = "host", ), "quiet": attr.bool( diff --git a/pip/pyqt5/install_pyqt5.py b/python/pyqt5/install_pyqt5.py similarity index 100% rename from pip/pyqt5/install_pyqt5.py rename to python/pyqt5/install_pyqt5.py diff --git a/pip/pyqt6/BUILD.bazel b/python/pyqt6/BUILD.bazel similarity index 100% rename from pip/pyqt6/BUILD.bazel rename to python/pyqt6/BUILD.bazel diff --git a/pip/pyqt6/defs.bzl b/python/pyqt6/defs.bzl similarity index 95% rename from pip/pyqt6/defs.bzl rename to python/pyqt6/defs.bzl index 01b4071b1..70a4a8f5b 100644 --- a/pip/pyqt6/defs.bzl +++ b/python/pyqt6/defs.bzl @@ -30,7 +30,7 @@ If the label is specified it will overwrite the python_interpreter attribute. """), "_script": attr.label( executable = True, - default = Label("//pip/pyqt6:install_pyqt6.py"), + default = Label("//python/pyqt6:install_pyqt6.py"), cfg = "host", ), "quiet": attr.bool( diff --git a/pip/pyqt6/install_pyqt6.py b/python/pyqt6/install_pyqt6.py similarity index 100% rename from pip/pyqt6/install_pyqt6.py rename to python/pyqt6/install_pyqt6.py diff --git a/python.bzl b/python/python.bzl similarity index 100% rename from python.bzl rename to python/python.bzl diff --git a/pip/requirements.in b/python/requirements.in similarity index 100% rename from pip/requirements.in rename to python/requirements.in diff --git a/pip/requirements.txt b/python/requirements.txt similarity index 100% rename from pip/requirements.txt rename to python/requirements.txt diff --git a/pip/stubs/BUILD.bazel b/python/stubs/BUILD.bazel similarity index 100% rename from pip/stubs/BUILD.bazel rename to python/stubs/BUILD.bazel diff --git a/pip/stubs/README.md b/python/stubs/README.md similarity index 100% rename from pip/stubs/README.md rename to python/stubs/README.md diff --git a/pip/stubs/extendsitepkgs.py b/python/stubs/extendsitepkgs.py similarity index 100% rename from pip/stubs/extendsitepkgs.py rename to python/stubs/extendsitepkgs.py diff --git a/pip/stubs/gatherstubs.py b/python/stubs/gatherstubs.py similarity index 100% rename from pip/stubs/gatherstubs.py rename to python/stubs/gatherstubs.py diff --git a/pip/stubs/stubs.bzl b/python/stubs/stubs.bzl similarity index 100% rename from pip/stubs/stubs.bzl rename to python/stubs/stubs.bzl diff --git a/pip/update.py b/python/update.py similarity index 100% rename from pip/update.py rename to python/update.py diff --git a/qt/BUILD.bazel b/qt/BUILD.bazel index 467b04aae..0344f763c 100644 --- a/qt/BUILD.bazel +++ b/qt/BUILD.bazel @@ -46,15 +46,15 @@ py_test( "aqt", "$(location mypy.ini)", "$(location @pyqt6//:__init__.py)", - "$(location //pip/stubs:extendsitepkgs)", + "$(location //python/stubs:extendsitepkgs)", ], data = [ "mypy.ini", - "//pip/stubs", - "//pip/stubs:extendsitepkgs", + "//python/stubs", + "//python/stubs:extendsitepkgs", "@pyqt6//:__init__.py", ], - env = {"EXTRA_SITE_PACKAGES": "$(location //pip/stubs)"}, + env = {"EXTRA_SITE_PACKAGES": "$(location //python/stubs)"}, main = "tests/run_mypy.py", deps = [ "//pylib/anki", @@ -155,11 +155,11 @@ py_binary( ], data = [ # ensure the binary's been built - "//pip:dmypy", - "//pip/stubs", - "//pip/stubs:extendsitepkgs", + "//python:dmypy", + "//python/stubs", + "//python/stubs:extendsitepkgs", ], - env = {"EXTRA_SITE_PACKAGES": "$(location //pip/stubs)"}, + env = {"EXTRA_SITE_PACKAGES": "$(location //python/stubs)"}, imports = ["."], tags = ["manual"], deps = [ diff --git a/scripts/copyright_headers.py b/scripts/copyright_headers.py index 4173c542d..cf50238a4 100644 --- a/scripts/copyright_headers.py +++ b/scripts/copyright_headers.py @@ -6,8 +6,8 @@ import sys from pathlib import Path nonstandard_header = { - "pip/pyqt5/install_pyqt5.py", - "pip/pyqt6/install_pyqt6.py", + "python/pyqt5/install_pyqt5.py", + "python/pyqt6/install_pyqt6.py", "pylib/anki/importing/pauker.py", "pylib/anki/importing/supermemo_xml.py", "pylib/anki/statsbg.py",