( )⚙ D6083 packaging: establish hgpackaging package

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6083

packaging: establish hgpackaging package
ClosedPublic

Authored by indygreg on Mar 7 2019, 7:49 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9da97f49d4f4: packaging: establish hgpackaging package
Summary

Previously, contrib/packaging behaved as a root to a
package directory and we had a "packagingutil" module. As I
work more on packaging code, we'll want to have more code
shared between different packaging tools. I think it makes
sense to have a single package containing multiple modules
than multiple top-level modules.

This commit establishes an "hgpackaging" package by moving
the existing packagingutil code to it.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Mar 7 2019, 7:49 PM
Closed by commit rHG9da97f49d4f4: packaging: establish hgpackaging package (authored by indygreg). · Explain WhyMar 9 2019, 8:50 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 14390

contrib/packaging/__init__.py

  • This file was moved to contrib/packaging/hgpackaging/__init__.py.

contrib/packaging/hgpackaging/__init__.py

  • This file was moved from contrib/packaging/__init__.py.

contrib/packaging/hgpackaging/util.py

  • This file was moved from contrib/packaging/packagingutil.py.
# packagingutil.py - Common packaging utility code. # util.py - Common packaging utility code.
# #
# Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com> # Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
# no-check-code because Python 3 native. # no-check-code because Python 3 native.

contrib/packaging/inno/build.py

"""Build the Inno installer. """Build the Inno installer.
Build files will be placed in ``build_dir``. Build files will be placed in ``build_dir``.
py2exe's setup.py doesn't use setuptools. It doesn't have modern logic py2exe's setup.py doesn't use setuptools. It doesn't have modern logic
for finding the Python 2.7 toolchain. So, we require the environment for finding the Python 2.7 toolchain. So, we require the environment
to already be configured with an active toolchain. to already be configured with an active toolchain.
""" """
from packagingutil import ( from hgpackaging.util import (
download_entry, download_entry,
extract_tar_to_directory, extract_tar_to_directory,
extract_zip_to_directory, extract_zip_to_directory,
) )
if not iscc.exists(): if not iscc.exists():
raise Exception('%s does not exist' % iscc) raise Exception('%s does not exist' % iscc)

contrib/packaging/packagingutil.py

  • This file was moved to contrib/packaging/hgpackaging/util.py.

tests/test-check-code.t

#require test-repo #require test-repo
$ . "$TESTDIR/helpers-testrepo.sh" $ . "$TESTDIR/helpers-testrepo.sh"
$ check_code="$TESTDIR"/../contrib/check-code.py $ check_code="$TESTDIR"/../contrib/check-code.py
$ cd "$TESTDIR"/.. $ cd "$TESTDIR"/..
New errors are not allowed. Warnings are strongly discouraged. New errors are not allowed. Warnings are strongly discouraged.
(The writing "no-che?k-code" is for not skipping this file when checking.) (The writing "no-che?k-code" is for not skipping this file when checking.)
$ testrepohg locate \ $ testrepohg locate \
> -X contrib/python-zstandard \ > -X contrib/python-zstandard \
> -X hgext/fsmonitor/pywatchman \ > -X hgext/fsmonitor/pywatchman \
> -X mercurial/thirdparty \ > -X mercurial/thirdparty \
> | sed 's-\\-/-g' | "$check_code" --warnings --per-file=0 - || false > | sed 's-\\-/-g' | "$check_code" --warnings --per-file=0 - || false
Skipping contrib/packaging/hgpackaging/util.py it has no-che?k-code (glob)
Skipping contrib/packaging/inno/build.py it has no-che?k-code (glob) Skipping contrib/packaging/inno/build.py it has no-che?k-code (glob)
Skipping contrib/packaging/packagingutil.py it has no-che?k-code (glob)
Skipping i18n/polib.py it has no-che?k-code (glob) Skipping i18n/polib.py it has no-che?k-code (glob)
Skipping mercurial/statprof.py it has no-che?k-code (glob) Skipping mercurial/statprof.py it has no-che?k-code (glob)
Skipping tests/badserverext.py it has no-che?k-code (glob) Skipping tests/badserverext.py it has no-che?k-code (glob)
@commands in debugcommands.py should be in alphabetical order. @commands in debugcommands.py should be in alphabetical order.
>>> import re >>> import re
>>> commands = [] >>> commands = []

tests/test-check-module-imports.t

$ testrepohg locate 'set:**.py or grep(r"^#!.*?python")' \ $ testrepohg locate 'set:**.py or grep(r"^#!.*?python")' \
> 'tests/**.t' \ > 'tests/**.t' \
> -X hgweb.cgi \ > -X hgweb.cgi \
> -X setup.py \ > -X setup.py \
> -X contrib/debugshell.py \ > -X contrib/debugshell.py \
> -X contrib/hgweb.fcgi \ > -X contrib/hgweb.fcgi \
> -X contrib/packaging/hg-docker \ > -X contrib/packaging/hg-docker \
> -X contrib/packaging/hgpackaging/ \
> -X contrib/packaging/inno/ \ > -X contrib/packaging/inno/ \
> -X contrib/packaging/packagingutil.py \
> -X contrib/python-zstandard/ \ > -X contrib/python-zstandard/ \
> -X contrib/win32/hgwebdir_wsgi.py \ > -X contrib/win32/hgwebdir_wsgi.py \
> -X contrib/perf-utils/perf-revlog-write-plot.py \ > -X contrib/perf-utils/perf-revlog-write-plot.py \
> -X doc/gendoc.py \ > -X doc/gendoc.py \
> -X doc/hgmanpage.py \ > -X doc/hgmanpage.py \
> -X i18n/posplit \ > -X i18n/posplit \
> -X mercurial/thirdparty \ > -X mercurial/thirdparty \
> -X tests/hypothesishelpers.py \ > -X tests/hypothesishelpers.py \
> -X tests/test-check-interfaces.py \ > -X tests/test-check-interfaces.py \
> -X tests/test-demandimport.py \ > -X tests/test-demandimport.py \
> -X tests/test-imports-checker.t \ > -X tests/test-imports-checker.t \
> -X tests/test-verify-repo-operations.py \ > -X tests/test-verify-repo-operations.py \
> | sed 's-\\-/-g' | "$PYTHON" "$import_checker" - > | sed 's-\\-/-g' | "$PYTHON" "$import_checker" -

tests/test-check-py3-compat.t

#require test-repo #require test-repo
$ . "$TESTDIR/helpers-testrepo.sh" $ . "$TESTDIR/helpers-testrepo.sh"
$ cd "$TESTDIR"/.. $ cd "$TESTDIR"/..
#if no-py3 #if no-py3
$ testrepohg files 'set:(**.py)' \ $ testrepohg files 'set:(**.py)' \
> -X contrib/packaging/hgpackaging/ \
> -X contrib/packaging/inno/ \ > -X contrib/packaging/inno/ \
> -X contrib/packaging/packagingutil.py \
> -X hgdemandimport/demandimportpy2.py \ > -X hgdemandimport/demandimportpy2.py \
> -X mercurial/thirdparty/cbor \ > -X mercurial/thirdparty/cbor \
> | sed 's|\\|/|g' | xargs "$PYTHON" contrib/check-py3-compat.py > | sed 's|\\|/|g' | xargs "$PYTHON" contrib/check-py3-compat.py
contrib/python-zstandard/setup.py not using absolute_import contrib/python-zstandard/setup.py not using absolute_import
contrib/python-zstandard/setup_zstd.py not using absolute_import contrib/python-zstandard/setup_zstd.py not using absolute_import
contrib/python-zstandard/tests/common.py not using absolute_import contrib/python-zstandard/tests/common.py not using absolute_import
contrib/python-zstandard/tests/test_buffer_util.py not using absolute_import contrib/python-zstandard/tests/test_buffer_util.py not using absolute_import
contrib/python-zstandard/tests/test_compressor.py not using absolute_import contrib/python-zstandard/tests/test_compressor.py not using absolute_import