( )⚙ D11618 rust: Make the hg-cpython crate default to Python 3

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11618

rust: Make the hg-cpython crate default to Python 3
ClosedPublic

Authored by SimonSapin on Oct 8 2021, 5:59 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG01c3dd208c75: rust: Make the hg-cpython crate default to Python 3
Summary

This default is used when running cargo manually such as for cargo test.
setup.py and Makefile both configure the Python major version explicitly.

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.Oct 8 2021, 5:59 AM
pulkit accepted this revision.Oct 12 2021, 9:23 AM
This revision is now accepted and ready to land.Oct 12 2021, 9:23 AM
SimonSapin added a commit: rHG01c3dd208c75: rust: Make the hg-cpython crate default to Python 3.Oct 12 2021, 1:19 PM
Closed by commit rHG01c3dd208c75: rust: Make the hg-cpython crate default to Python 3 (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-cpython/Cargo.toml (2 lines)
Msetup.py (17 lines)

Diff 30743

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] [features]
default = ["python27"] default = ["python3"]
# Features to build an extension module: # Features to build an extension module:
python27 = ["cpython/python27-sys", "cpython/extension-module-2-7"] python27 = ["cpython/python27-sys", "cpython/extension-module-2-7"]
python3 = ["cpython/python3-sys", "cpython/extension-module"] python3 = ["cpython/python3-sys", "cpython/extension-module"]
# Enable one of these features to build a test executable linked to libpython: # Enable one of these features to build a test executable linked to libpython:
# e.g. cargo test --no-default-features --features python27-bin # e.g. cargo test --no-default-features --features python27-bin
python27-bin = ["cpython/python27-sys"] python27-bin = ["cpython/python27-sys"]

setup.py

"""Exception class for Rust compilation errors.""" """Exception class for Rust compilation errors."""
class RustExtension(Extension): class RustExtension(Extension):
"""Base classes for concrete Rust Extension classes.""" """Base classes for concrete Rust Extension classes."""
rusttargetdir = os.path.join('rust', 'target', 'release') rusttargetdir = os.path.join('rust', 'target', 'release')
def __init__( def __init__(self, mpath, sources, rustlibname, subcrate, **kw):
self, mpath, sources, rustlibname, subcrate, py3_features=None, **kw
):
Extension.__init__(self, mpath, sources, **kw) Extension.__init__(self, mpath, sources, **kw)
srcdir = self.rustsrcdir = os.path.join('rust', subcrate) srcdir = self.rustsrcdir = os.path.join('rust', subcrate)
self.py3_features = py3_features
# adding Rust source and control files to depends so that the extension # adding Rust source and control files to depends so that the extension
# gets rebuilt if they've changed # gets rebuilt if they've changed
self.depends.append(os.path.join(srcdir, 'Cargo.toml')) self.depends.append(os.path.join(srcdir, 'Cargo.toml'))
cargo_lock = os.path.join(srcdir, 'Cargo.lock') cargo_lock = os.path.join(srcdir, 'Cargo.lock')
if os.path.exists(cargo_lock): if os.path.exists(cargo_lock):
self.depends.append(cargo_lock) self.depends.append(cargo_lock)
for dirpath, subdir, fnames in os.walk(os.path.join(srcdir, 'src')): for dirpath, subdir, fnames in os.walk(os.path.join(srcdir, 'src')):
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 = [] feature_flags = []
if sys.version_info[0] == 3 and self.py3_features is not None:
feature_flags.append(self.py3_features)
cargocmd.append('--no-default-features') cargocmd.append('--no-default-features')
if sys.version_info[0] == 2:
feature_flags.append('python27')
elif sys.version_info[0] == 3:
feature_flags.append('python3')
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) feature_flags.append(rust_features)
cargocmd.extend(('--features', " ".join(feature_flags))) cargocmd.extend(('--features', " ".join(feature_flags)))
cargocmd.append('--') cargocmd.append('--')
extra_compile_args=common_cflags, extra_compile_args=common_cflags,
), ),
Extension( Extension(
'hgext.fsmonitor.pywatchman.bser', 'hgext.fsmonitor.pywatchman.bser',
['hgext/fsmonitor/pywatchman/bser.c'], ['hgext/fsmonitor/pywatchman/bser.c'],
extra_compile_args=common_cflags, extra_compile_args=common_cflags,
), ),
RustStandaloneExtension( RustStandaloneExtension(
'mercurial.rustext', 'hg-cpython', 'librusthg', py3_features='python3' 'mercurial.rustext',
'hg-cpython',
'librusthg',
), ),
] ]
sys.path.insert(0, 'contrib/python-zstandard') sys.path.insert(0, 'contrib/python-zstandard')
import setup_zstd import setup_zstd
zstd = setup_zstd.get_c_extension( zstd = setup_zstd.get_c_extension(