pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/py-mercurial py-mercurial: update to 6.3.2.
details: https://anonhg.NetBSD.org/pkgsrc/rev/bd079d18be9f
branches: trunk
changeset: 391493:bd079d18be9f
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Jan 09 10:52:34 2023 +0000
description:
py-mercurial: update to 6.3.2.
Mercurial 6.3.2
[ecfc84b956a8] tests: expect the message from 1baf0fffd82f in test-hghave.t (issue6762)
[5c095119bff4] tests: add the missing space to test-hghave.t (issue6762)
[2c346c1c75ec] tests: use an all too familiar executable in test-run-tests.t (issue6661)
[13c0e3b4fd35] tests: use test -f instead of ls to see if a file is present (issue6662)
[8ced4ca30ea1] bisect: correct message about aborting an in-progress bisect (issue6527)
filemerge: fix crash when using filesets in [partial-merge-tools]
help: fix a py3 error interpolating Set into b'%s'
match: make the FLAG_RE pattern a raw string
python-compat: adapt to Python 3.11 BC breakage with random.sample
rust-status: fix thread count ceiling
hg: show the correct message when cloning an LFS repo with extension disabled
extensions: process disabled external paths when hgext package is in-memory
emitrevision: consider ancestors revision to emit as available base
make: add a target for building pyoxidizer tests on macOS
run-tests: support --pyoxidized on macOS
packaging: add dependencies to the PyOxidizer build on macOS
Miscellaneous test fixes
diffstat:
devel/py-mercurial/Makefile | 33 +++--
devel/py-mercurial/cargo-depends.mk | 192 ------------------------------------
devel/py-mercurial/distinfo | 8 +-
devel/py-mercurial/options.mk | 38 -------
devel/py-mercurial/version.mk | 4 +-
5 files changed, 27 insertions(+), 248 deletions(-)
diffs (truncated from 312 to 300 lines):
diff -r 7fb5f12ce475 -r bd079d18be9f devel/py-mercurial/Makefile
--- a/devel/py-mercurial/Makefile Mon Jan 09 10:17:23 2023 +0000
+++ b/devel/py-mercurial/Makefile Mon Jan 09 10:52:34 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2022/11/25 11:09:07 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2023/01/09 10:52:34 wiz Exp $
#
# Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
@@ -27,22 +27,31 @@
PYTHON_SELF_CONFLICT= yes
.include "version.mk"
-.include "options.mk"
USE_TOOLS+= bash:test
-# Known test failures as of 6.3.1
-# test-run-tests.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6661
-# test-hghave.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6762
-# test-status-tracked-key.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6662
+# Known test failures as of 6.3.2
+# test-help.t
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6779
+# test-http-bad-server.t
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6780
+# various for python 3.11.1
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6781
+# test-lfs-serve-access.t
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6782
+# test-remotefilelog-gc.t
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6783
# test-patchbomb-tls.t:
# https://bz.mercurial-scm.org/show_bug.cgi?id=6727
-# test-demandimport.py:
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6680
+# test-oldcgi.t and test-newcgi.t
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6784
+# test-clone-cgi.t
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6785
+# test-hgrc.t
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6787
+# test-demandimport.py
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6786
#
-# Ran 901 tests, 82 skipped, 5 failed.
+# Ran 901 tests, 82 skipped, 22 failed.
TEST_TARGET= tests
TEST_MAKE_FLAGS+= PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
diff -r 7fb5f12ce475 -r bd079d18be9f devel/py-mercurial/cargo-depends.mk
--- a/devel/py-mercurial/cargo-depends.mk Mon Jan 09 10:17:23 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,192 +0,0 @@
-# $NetBSD: cargo-depends.mk,v 1.3 2021/05/20 09:40:23 wiz Exp $
-
-CARGO_CRATE_DEPENDS+= adler-0.2.3
-CARGO_CRATE_DEPENDS+= aho-corasick-0.7.13
-CARGO_CRATE_DEPENDS+= aho-corasick-0.7.15
-CARGO_CRATE_DEPENDS+= ansi_term-0.11.0
-CARGO_CRATE_DEPENDS+= anyhow-1.0.32
-CARGO_CRATE_DEPENDS+= arc-swap-0.4.5
-CARGO_CRATE_DEPENDS+= async-trait-0.1.30
-CARGO_CRATE_DEPENDS+= atty-0.2.14
-CARGO_CRATE_DEPENDS+= autocfg-1.0.1
-CARGO_CRATE_DEPENDS+= base64-0.10.1
-CARGO_CRATE_DEPENDS+= base64-0.12.3
-CARGO_CRATE_DEPENDS+= bitflags-1.2.1
-CARGO_CRATE_DEPENDS+= bitmaps-2.1.0
-CARGO_CRATE_DEPENDS+= byteorder-1.3.4
-CARGO_CRATE_DEPENDS+= bytes-0.5.4
-CARGO_CRATE_DEPENDS+= bytes-cast-0.1.0
-CARGO_CRATE_DEPENDS+= bytes-cast-derive-0.1.0
-CARGO_CRATE_DEPENDS+= cc-1.0.50
-CARGO_CRATE_DEPENDS+= cc-1.0.60
-CARGO_CRATE_DEPENDS+= cc-1.0.66
-CARGO_CRATE_DEPENDS+= cfg-if-0.1.10
-CARGO_CRATE_DEPENDS+= cfg-if-1.0.0
-CARGO_CRATE_DEPENDS+= charset-0.1.2
-CARGO_CRATE_DEPENDS+= chrono-0.4.19
-CARGO_CRATE_DEPENDS+= clap-2.33.3
-CARGO_CRATE_DEPENDS+= const_fn-0.4.4
-CARGO_CRATE_DEPENDS+= cpython-0.5.0
-CARGO_CRATE_DEPENDS+= cpython-0.5.2
-CARGO_CRATE_DEPENDS+= crc32fast-1.2.1
-CARGO_CRATE_DEPENDS+= crossbeam-channel-0.4.4
-CARGO_CRATE_DEPENDS+= crossbeam-channel-0.5.0
-CARGO_CRATE_DEPENDS+= crossbeam-deque-0.8.0
-CARGO_CRATE_DEPENDS+= crossbeam-epoch-0.9.1
-CARGO_CRATE_DEPENDS+= crossbeam-utils-0.7.2
-CARGO_CRATE_DEPENDS+= crossbeam-utils-0.8.1
-CARGO_CRATE_DEPENDS+= ctor-0.1.16
-CARGO_CRATE_DEPENDS+= derive_more-0.99.11
-CARGO_CRATE_DEPENDS+= difference-2.0.0
-CARGO_CRATE_DEPENDS+= either-1.6.1
-CARGO_CRATE_DEPENDS+= encoding_rs-0.8.24
-CARGO_CRATE_DEPENDS+= env_logger-0.7.1
-CARGO_CRATE_DEPENDS+= flate2-1.0.19
-CARGO_CRATE_DEPENDS+= format-bytes-0.2.2
-CARGO_CRATE_DEPENDS+= format-bytes-macros-0.3.0
-CARGO_CRATE_DEPENDS+= fs_extra-1.2.0
-CARGO_CRATE_DEPENDS+= fuchsia-cprng-0.1.1
-CARGO_CRATE_DEPENDS+= fuchsia-zircon-0.3.3
-CARGO_CRATE_DEPENDS+= fuchsia-zircon-sys-0.3.3
-CARGO_CRATE_DEPENDS+= futures-0.3.4
-CARGO_CRATE_DEPENDS+= futures-channel-0.3.4
-CARGO_CRATE_DEPENDS+= futures-core-0.3.4
-CARGO_CRATE_DEPENDS+= futures-executor-0.3.4
-CARGO_CRATE_DEPENDS+= futures-io-0.3.4
-CARGO_CRATE_DEPENDS+= futures-macro-0.3.4
-CARGO_CRATE_DEPENDS+= futures-sink-0.3.4
-CARGO_CRATE_DEPENDS+= futures-task-0.3.4
-CARGO_CRATE_DEPENDS+= futures-util-0.3.4
-CARGO_CRATE_DEPENDS+= gcc-0.3.55
-CARGO_CRATE_DEPENDS+= getrandom-0.1.15
-CARGO_CRATE_DEPENDS+= glob-0.3.0
-CARGO_CRATE_DEPENDS+= hermit-abi-0.1.17
-CARGO_CRATE_DEPENDS+= home-0.5.3
-CARGO_CRATE_DEPENDS+= humantime-1.3.0
-CARGO_CRATE_DEPENDS+= im-rc-15.0.0
-CARGO_CRATE_DEPENDS+= iovec-0.1.4
-CARGO_CRATE_DEPENDS+= itertools-0.9.0
-CARGO_CRATE_DEPENDS+= jemalloc-sys-0.3.2
-CARGO_CRATE_DEPENDS+= jemallocator-0.3.2
-CARGO_CRATE_DEPENDS+= jemallocator-global-0.3.2
-CARGO_CRATE_DEPENDS+= jobserver-0.1.21
-CARGO_CRATE_DEPENDS+= kernel32-sys-0.2.2
-CARGO_CRATE_DEPENDS+= lazy_static-1.4.0
-CARGO_CRATE_DEPENDS+= libc-0.2.69
-CARGO_CRATE_DEPENDS+= libc-0.2.78
-CARGO_CRATE_DEPENDS+= libc-0.2.81
-CARGO_CRATE_DEPENDS+= libz-sys-1.1.2
-CARGO_CRATE_DEPENDS+= log-0.4.11
-CARGO_CRATE_DEPENDS+= log-0.4.8
-CARGO_CRATE_DEPENDS+= mailparse-0.13.0
-CARGO_CRATE_DEPENDS+= maybe-uninit-2.0.0
-CARGO_CRATE_DEPENDS+= memchr-2.3.3
-CARGO_CRATE_DEPENDS+= memchr-2.3.4
-CARGO_CRATE_DEPENDS+= memmap-0.7.0
-CARGO_CRATE_DEPENDS+= memoffset-0.6.1
-CARGO_CRATE_DEPENDS+= memory-module-sys-0.3.0
-CARGO_CRATE_DEPENDS+= micro-timer-0.3.1
-CARGO_CRATE_DEPENDS+= micro-timer-macros-0.3.1
-CARGO_CRATE_DEPENDS+= miniz_oxide-0.4.3
-CARGO_CRATE_DEPENDS+= mio-0.6.21
-CARGO_CRATE_DEPENDS+= mio-named-pipes-0.1.6
-CARGO_CRATE_DEPENDS+= mio-uds-0.6.7
-CARGO_CRATE_DEPENDS+= miow-0.2.1
-CARGO_CRATE_DEPENDS+= miow-0.3.3
-CARGO_CRATE_DEPENDS+= net2-0.2.33
-CARGO_CRATE_DEPENDS+= num-integer-0.1.44
-CARGO_CRATE_DEPENDS+= num-traits-0.2.12
-CARGO_CRATE_DEPENDS+= num-traits-0.2.14
-CARGO_CRATE_DEPENDS+= num_cpus-1.13.0
-CARGO_CRATE_DEPENDS+= output_vt100-0.1.2
-CARGO_CRATE_DEPENDS+= paste-0.1.18
-CARGO_CRATE_DEPENDS+= paste-impl-0.1.18
-CARGO_CRATE_DEPENDS+= pin-project-lite-0.1.4
-CARGO_CRATE_DEPENDS+= pin-utils-0.1.0-alpha.4
-CARGO_CRATE_DEPENDS+= pkg-config-0.3.19
-CARGO_CRATE_DEPENDS+= ppv-lite86-0.2.10
-CARGO_CRATE_DEPENDS+= ppv-lite86-0.2.9
-CARGO_CRATE_DEPENDS+= pretty_assertions-0.6.1
-CARGO_CRATE_DEPENDS+= proc-macro-hack-0.5.15
-CARGO_CRATE_DEPENDS+= proc-macro-hack-0.5.18
-CARGO_CRATE_DEPENDS+= proc-macro-hack-0.5.19
-CARGO_CRATE_DEPENDS+= proc-macro-nested-0.1.4
-CARGO_CRATE_DEPENDS+= proc-macro2-1.0.10
-CARGO_CRATE_DEPENDS+= proc-macro2-1.0.24
-#CARGO_CRATE_DEPENDS+= pyembed-0.8.0-pre
-#CARGO_CRATE_DEPENDS+= python-packaging-0.1.0-pre
-#CARGO_CRATE_DEPENDS+= python-packed-resources-0.2.0-pre
-CARGO_CRATE_DEPENDS+= python27-sys-0.5.2
-CARGO_CRATE_DEPENDS+= python3-sys-0.5.0
-CARGO_CRATE_DEPENDS+= python3-sys-0.5.2
-CARGO_CRATE_DEPENDS+= quick-error-1.2.3
-CARGO_CRATE_DEPENDS+= quote-1.0.3
-CARGO_CRATE_DEPENDS+= quote-1.0.7
-CARGO_CRATE_DEPENDS+= quoted_printable-0.4.2
-CARGO_CRATE_DEPENDS+= rand-0.3.23
-CARGO_CRATE_DEPENDS+= rand-0.4.6
-CARGO_CRATE_DEPENDS+= rand-0.7.3
-CARGO_CRATE_DEPENDS+= rand_chacha-0.2.2
-CARGO_CRATE_DEPENDS+= rand_core-0.3.1
-CARGO_CRATE_DEPENDS+= rand_core-0.4.2
-CARGO_CRATE_DEPENDS+= rand_core-0.5.1
-CARGO_CRATE_DEPENDS+= rand_distr-0.2.2
-CARGO_CRATE_DEPENDS+= rand_hc-0.2.0
-CARGO_CRATE_DEPENDS+= rand_pcg-0.2.1
-CARGO_CRATE_DEPENDS+= rand_xoshiro-0.4.0
-CARGO_CRATE_DEPENDS+= rayon-1.5.0
-CARGO_CRATE_DEPENDS+= rayon-core-1.9.0
-CARGO_CRATE_DEPENDS+= rdrand-0.4.0
-CARGO_CRATE_DEPENDS+= redox_syscall-0.1.56
-CARGO_CRATE_DEPENDS+= redox_syscall-0.1.57
-CARGO_CRATE_DEPENDS+= regex-1.3.9
-CARGO_CRATE_DEPENDS+= regex-1.4.2
-CARGO_CRATE_DEPENDS+= regex-syntax-0.6.18
-CARGO_CRATE_DEPENDS+= regex-syntax-0.6.21
-CARGO_CRATE_DEPENDS+= remove_dir_all-0.5.3
-CARGO_CRATE_DEPENDS+= rust-crypto-0.2.36
-CARGO_CRATE_DEPENDS+= rustc-serialize-0.3.24
-CARGO_CRATE_DEPENDS+= same-file-1.0.6
-CARGO_CRATE_DEPENDS+= scopeguard-1.1.0
-CARGO_CRATE_DEPENDS+= signal-hook-registry-1.2.0
-CARGO_CRATE_DEPENDS+= sized-chunks-0.6.2
-CARGO_CRATE_DEPENDS+= slab-0.4.2
-CARGO_CRATE_DEPENDS+= socket2-0.3.12
-CARGO_CRATE_DEPENDS+= static_assertions-1.1.0
-CARGO_CRATE_DEPENDS+= strsim-0.8.0
-CARGO_CRATE_DEPENDS+= syn-1.0.17
-CARGO_CRATE_DEPENDS+= syn-1.0.54
-CARGO_CRATE_DEPENDS+= tempdir-0.3.7
-CARGO_CRATE_DEPENDS+= tempfile-3.1.0
-CARGO_CRATE_DEPENDS+= termcolor-1.1.2
-CARGO_CRATE_DEPENDS+= textwrap-0.11.0
-CARGO_CRATE_DEPENDS+= thread_local-1.0.1
-CARGO_CRATE_DEPENDS+= time-0.1.44
-CARGO_CRATE_DEPENDS+= tokio-0.2.18
-CARGO_CRATE_DEPENDS+= tokio-hglib-0.3.0
-CARGO_CRATE_DEPENDS+= tokio-macros-0.2.5
-CARGO_CRATE_DEPENDS+= tokio-util-0.3.1
-CARGO_CRATE_DEPENDS+= twox-hash-1.6.0
-CARGO_CRATE_DEPENDS+= typenum-1.12.0
-CARGO_CRATE_DEPENDS+= unicode-width-0.1.8
-CARGO_CRATE_DEPENDS+= unicode-xid-0.2.0
-CARGO_CRATE_DEPENDS+= unicode-xid-0.2.1
-CARGO_CRATE_DEPENDS+= users-0.11.0
-CARGO_CRATE_DEPENDS+= uuid-0.8.1
-CARGO_CRATE_DEPENDS+= vcpkg-0.2.11
-CARGO_CRATE_DEPENDS+= vec_map-0.8.2
-CARGO_CRATE_DEPENDS+= version_check-0.9.2
-CARGO_CRATE_DEPENDS+= walkdir-2.3.1
-CARGO_CRATE_DEPENDS+= wasi-0.10.0+wasi-snapshot-preview1
-CARGO_CRATE_DEPENDS+= wasi-0.9.0+wasi-snapshot-preview1
-CARGO_CRATE_DEPENDS+= winapi-0.2.8
-CARGO_CRATE_DEPENDS+= winapi-0.3.8
-CARGO_CRATE_DEPENDS+= winapi-0.3.9
-CARGO_CRATE_DEPENDS+= winapi-build-0.1.1
-CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0
-CARGO_CRATE_DEPENDS+= winapi-util-0.1.5
-CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
-CARGO_CRATE_DEPENDS+= ws2_32-sys-0.2.1
-CARGO_CRATE_DEPENDS+= zstd-0.5.3+zstd.1.4.5
-CARGO_CRATE_DEPENDS+= zstd-safe-2.0.5+zstd.1.4.5
-CARGO_CRATE_DEPENDS+= zstd-sys-1.4.17+zstd.1.4.5
diff -r 7fb5f12ce475 -r bd079d18be9f devel/py-mercurial/distinfo
--- a/devel/py-mercurial/distinfo Mon Jan 09 10:17:23 2023 +0000
+++ b/devel/py-mercurial/distinfo Mon Jan 09 10:52:34 2023 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.124 2022/11/25 11:09:07 wiz Exp $
+$NetBSD: distinfo,v 1.125 2023/01/09 10:52:34 wiz Exp $
-BLAKE2s (mercurial-6.3.1.tar.gz) = 07701198d9268a9ef6f89c1178c6414867b7e9f103ce623d72c05541a4d48411
-SHA512 (mercurial-6.3.1.tar.gz) = 99cd77c25e6c7f064ea9b631a8632b6020cb012c2f5a8c1da371ed413a4f984d04f8c293f551f890bbf084f840d7406aa25956f016ff2596173cd2f1f834873b
-Size (mercurial-6.3.1.tar.gz) = 8089720 bytes
+BLAKE2s (mercurial-6.3.2.tar.gz) = c22ce360fbfc1127c9be397258e2af2d236d06839001e2a5e14084904a08aed4
+SHA512 (mercurial-6.3.2.tar.gz) = 5ca7e448bf336c2a2d4db174c4f486f66f41eef33db14f152abb09b8d82416124d251784cb5898499580083ca104113d0763e27baa9b77feb90ba2fd96d40be5
+Size (mercurial-6.3.2.tar.gz) = 8092710 bytes
diff -r 7fb5f12ce475 -r bd079d18be9f devel/py-mercurial/options.mk
--- a/devel/py-mercurial/options.mk Mon Jan 09 10:17:23 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# $NetBSD: options.mk,v 1.6 2022/07/17 09:51:33 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.mercurial
-# 5.6.1 needs some "*-pre" crates that are not available
-# then it fails with a missing Cargo.toml file error
-PKG_SUPPORTED_OPTIONS= #rust
-PKG_SUGGESTED_OPTIONS= #rust
-
-.include "../../mk/bsd.options.mk"
-
-#PLIST_VARS+= rust
-
-.if !empty(PKG_OPTIONS:Mrust)
-#PLIST.rust= yes
-PYSETUPARGS+= --rust
-# for python3-sys
-MAKE_ENV+= PYTHON_SYS_EXECUTABLE=${PYTHONBIN}
-
-# When updating:
-# cd ${WRKSRC}
-# cat $(find .. -name Cargo.lock) > Cargo.lock
-# cd -
-# make show-cargo-depends | sort -u
-#
-# After updating, check:
-# hg debuginstall | grep -i rust
-# to validate rust is in use
-#
-# Two steps of tests work, but then fail with
-# mercurial-5.5/rust/target/debug/deps/rusthg-a55fe645bc4ab58d: Shared object "libpython3.7.so.1.0" not found
-
-.include "cargo-depends.mk"
-
-RUST_REQ+= 1.34.2
-.include "../../lang/rust/cargo.mk"
Home |
Main Index |
Thread Index |
Old Index