This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12316

rust: enable Python 3 support unconditionally
ClosedPublic

Authored by SimonSapin on Mar 3 2022, 2:13 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG649ff7f86f96: rust: enable Python 3 support unconditionally
Summary

Note: cpython/python3-sys is a default feature.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

SimonSapin created this revision.Mar 3 2022, 2:13 AM
SimonSapin added inline comments.Mar 3 2022, 2:17 AM
rust/hg-cpython/Cargo.toml
12

https://github.com/dgrunwald/rust-cpython/blob/0.7.0/Cargo.toml#L71-L74 documents the extension-module feature:

[…] so that the module can also be used with statically linked python interpreters.

This "also" means that enable this feature unconditionally does not break cargo test executables that do not involve an actual extension module.

Alphare accepted this revision.Mar 3 2022, 4:41 AM
This revision is now accepted and ready to land.Mar 3 2022, 4:41 AM
SimonSapin added a commit: rHG649ff7f86f96: rust: enable Python 3 support unconditionally.Mar 3 2022, 6:06 AM
Closed by commit rHG649ff7f86f96: rust: enable Python 3 support unconditionally (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
MMakefile (5 lines)
Mrust/README.rst (4 lines)
Mrust/hg-cpython/Cargo.toml (12 lines)
Msetup.py (8 lines)

Diff 32443

Makefile

testpy-%: testpy-%:
@echo Looking for Python $* in $(HGPYTHONS) @echo Looking for Python $* in $(HGPYTHONS)
[ -e $(HGPYTHONS)/$*/bin/python ] || ( \ [ -e $(HGPYTHONS)/$*/bin/python ] || ( \
cd $$(mktemp --directory --tmpdir) && \ cd $$(mktemp --directory --tmpdir) && \
$(MAKE) -f $(HGROOT)/contrib/Makefile.python PYTHONVER=$* PREFIX=$(HGPYTHONS)/$* python ) $(MAKE) -f $(HGROOT)/contrib/Makefile.python PYTHONVER=$* PREFIX=$(HGPYTHONS)/$* python )
cd tests && $(HGPYTHONS)/$*/bin/python run-tests.py $(TESTFLAGS) cd tests && $(HGPYTHONS)/$*/bin/python run-tests.py $(TESTFLAGS)
rust-tests: py_feature = $(shell $(PYTHON) -c \
'import sys; print(["python27-bin", "python3-bin"][sys.version_info[0] >= 3])')
rust-tests: rust-tests:
cd $(HGROOT)/rust/hg-cpython \ cd $(HGROOT)/rust/hg-cpython \
&& $(CARGO) test --quiet --all \ && $(CARGO) test --quiet --all --features "$(HG_RUST_FEATURES)"
--no-default-features --features "$(py_feature) $(HG_RUST_FEATURES)"
check-code: check-code:
hg manifest | xargs python contrib/check-code.py hg manifest | xargs python contrib/check-code.py
format-c: format-c:
clang-format --style file -i \ clang-format --style file -i \
`hg files 'set:(**.c or **.cc or **.h) and not "listfile:contrib/clang-format-ignorelist"'` `hg files 'set:(**.c or **.cc or **.h) and not "listfile:contrib/clang-format-ignorelist"'`

rust/README.rst

extension will be used by default unless ``--no-rust``. extension will be used by default unless ``--no-rust``.
One day we may use this environment variable to switch to new experimental One day we may use this environment variable to switch to new experimental
binding crates like a hypothetical ``HGWITHRUSTEXT=hpy``. binding crates like a hypothetical ``HGWITHRUSTEXT=hpy``.
Special features Special features
================ ================
You might want to check the `features` section in ``hg-cpython/Cargo.toml``. In the future, compile-time opt-ins may be added
It may contain features that might be interesting to try out. to the `features` section in ``hg-cpython/Cargo.toml``.
To use features from the Makefile, use the `HG_RUST_FEATURES` environment To use features from the Makefile, use the `HG_RUST_FEATURES` environment
variable: for instance `HG_RUST_FEATURES="some-feature other-feature"` variable: for instance `HG_RUST_FEATURES="some-feature other-feature"`
Profiling Profiling
========= =========
Setting the environment variable ``RUST_LOG=trace`` will make hg print Setting the environment variable ``RUST_LOG=trace`` will make hg print

rust/hg-cpython/Cargo.toml

[package] [package]
name = "hg-cpython" name = "hg-cpython"
version = "0.1.0" version = "0.1.0"
authors = ["Georges Racinet <gracinet@anybox.fr>"] authors = ["Georges Racinet <gracinet@anybox.fr>"]
edition = "2018" edition = "2018"
[lib] [lib]
name='rusthg' name='rusthg'
crate-type = ["cdylib"] crate-type = ["cdylib"]
[features]
default = ["python3"]
# Features to build an extension module:
python3 = ["cpython/python3-sys", "cpython/extension-module"]
# Enable this feature to build a test executable linked to libpython:
# e.g. cargo test --no-default-features --features python3-bin
python3-bin = ["cpython/python3-sys"]
[dependencies] [dependencies]
cpython = { version = "0.7.0", default-features = false } cpython = { version = "0.7.0", features = ["extension-module"] }
SimonSapinAuthorUnsubmitted
Done

https://github.com/dgrunwald/rust-cpython/blob/0.7.0/Cargo.toml#L71-L74 documents the extension-module feature:

[…] so that the module can also be used with statically linked python interpreters.

This "also" means that enable this feature unconditionally does not break cargo test executables that do not involve an actual extension module.

SimonSapin: https://github.com/dgrunwald/rust-cpython/blob/0.7.0/Cargo.toml#L71-L74 documents the…
crossbeam-channel = "0.4" crossbeam-channel = "0.4"
hg-core = { path = "../hg-core"} hg-core = { path = "../hg-core"}
libc = "0.2" libc = "0.2"
log = "0.4.8" log = "0.4.8"
env_logger = "0.7.1" env_logger = "0.7.1"
stable_deref_trait = "1.2.0" stable_deref_trait = "1.2.0"
vcsgraph = "0.2.0" vcsgraph = "0.2.0"

setup.py

# Unix only fix (os.path.expanduser not really reliable if # Unix only fix (os.path.expanduser not really reliable if
# HOME is shadowed like this) # HOME is shadowed like this)
import pwd import pwd
env['HOME'] = pwd.getpwuid(os.getuid()).pw_dir env['HOME'] = pwd.getpwuid(os.getuid()).pw_dir
cargocmd = ['cargo', 'rustc', '--release'] cargocmd = ['cargo', 'rustc', '--release']
feature_flags = ['python3']
cargocmd.append('--no-default-features')
rust_features = env.get("HG_RUST_FEATURES") rust_features = env.get("HG_RUST_FEATURES")
if rust_features: if rust_features:
feature_flags.append(rust_features) cargocmd.extend(('--features', rust_features))
cargocmd.extend(('--features', " ".join(feature_flags)))
cargocmd.append('--') cargocmd.append('--')
if sys.platform == 'darwin': if sys.platform == 'darwin':
cargocmd.extend( cargocmd.extend(
("-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup") ("-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup")
) )
try: try:
subprocess.check_call(cargocmd, env=env, cwd=self.rustsrcdir) subprocess.check_call(cargocmd, env=env, cwd=self.rustsrcdir)