Skip to content

Commit

Permalink
WIP: Remove python toolchain changes
Browse files Browse the repository at this point in the history
  • Loading branch information
guibou committed Jun 24, 2019
1 parent d59ee7e commit 9540199
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 26 deletions.
4 changes: 4 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,12 @@ test:ci --test_output=errors
# see: https://github.com/bazelbuild/bazel/issues/7844
# This is only used in rules_haskell tests, so user won't face this
# issue
build:window --incompatible_use_python_toolchains=false
test:window --incompatible_use_python_toolchains=false

# Too complicated for now, and that's only used for tests
build --incompatible_use_python_toolchains=false

# Needed on Windows for //tests/binary-with-data
# see: https://github.com/tweag/rules_haskell/issues/647#issuecomment-459001362
test:windows --experimental_enable_runfiles
Expand Down
7 changes: 0 additions & 7 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ register_toolchains(
"//tests:c2hs-toolchain",
"//tests:doctest-toolchain",
"//tests:protobuf-toolchain",
"//tests:python_toolchain",
)

nixpkgs_cc_configure(
Expand Down Expand Up @@ -210,12 +209,6 @@ nixpkgs_package(
repository = "@nixpkgs",
)

nixpkgs_package(
name = "python3",
attribute_path = "python3",
repository = "@nixpkgs",
)

nixpkgs_package(
name = "sphinx",
attribute_path = "python36Packages.sphinx",
Expand Down
19 changes: 0 additions & 19 deletions tests/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -59,25 +59,6 @@ c2hs_toolchain(
tags = ["requires_c2hs"],
)

py_runtime(
name = "py3_runtime",
testonly = False,
interpreter = "@python3//:bin/python",
python_version = "PY3",
visibility = ["//visibility:public"],
)

py_runtime_pair(
name = "py_runtime_pair",
py3_runtime = ":py3_runtime",
)

toolchain(
name = "python_toolchain",
toolchain = ":py_runtime_pair",
toolchain_type = "@bazel_tools//tools/python:toolchain_type",
)

rule_test_exe(
name = "test-binary-simple",
size = "small",
Expand Down

0 comments on commit 9540199

Please sign in to comment.