Patchwork D6083: packaging: establish hgpackaging package

login
register
mail settings
Submitter phabricator
Date March 8, 2019, 12:50 a.m.
Message ID <differential-rev-PHID-DREV-vrb7225c2wzl6vubhuw2-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/39134/
State Superseded
Headers show

Comments

phabricator - March 8, 2019, 12:50 a.m.
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION 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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6083

AFFECTED FILES
  contrib/packaging/__init__.py
  contrib/packaging/hgpackaging/__init__.py
  contrib/packaging/hgpackaging/util.py
  contrib/packaging/inno/build.py
  contrib/packaging/packagingutil.py
  tests/test-check-code.t
  tests/test-check-module-imports.t
  tests/test-check-py3-compat.t

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t
--- a/tests/test-check-py3-compat.t
+++ b/tests/test-check-py3-compat.t
@@ -5,8 +5,8 @@ 
 
 #if no-py3
   $ testrepohg files 'set:(**.py)' \
+  > -X contrib/packaging/hgpackaging/ \
   > -X contrib/packaging/inno/ \
-  > -X contrib/packaging/packagingutil.py \
   > -X hgdemandimport/demandimportpy2.py \
   > -X mercurial/thirdparty/cbor \
   > | sed 's|\\|/|g' | xargs "$PYTHON" contrib/check-py3-compat.py
diff --git a/tests/test-check-module-imports.t b/tests/test-check-module-imports.t
--- a/tests/test-check-module-imports.t
+++ b/tests/test-check-module-imports.t
@@ -21,8 +21,8 @@ 
   > -X contrib/debugshell.py \
   > -X contrib/hgweb.fcgi \
   > -X contrib/packaging/hg-docker \
+  > -X contrib/packaging/hgpackaging/ \
   > -X contrib/packaging/inno/ \
-  > -X contrib/packaging/packagingutil.py \
   > -X contrib/python-zstandard/ \
   > -X contrib/win32/hgwebdir_wsgi.py \
   > -X contrib/perf-utils/perf-revlog-write-plot.py \
diff --git a/tests/test-check-code.t b/tests/test-check-code.t
--- a/tests/test-check-code.t
+++ b/tests/test-check-code.t
@@ -12,8 +12,8 @@ 
   > -X hgext/fsmonitor/pywatchman \
   > -X mercurial/thirdparty \
   > | 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/packagingutil.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 tests/badserverext.py it has no-che?k-code (glob)
diff --git a/contrib/packaging/inno/build.py b/contrib/packaging/inno/build.py
--- a/contrib/packaging/inno/build.py
+++ b/contrib/packaging/inno/build.py
@@ -87,7 +87,7 @@ 
     for finding the Python 2.7 toolchain. So, we require the environment
     to already be configured with an active toolchain.
     """
-    from packagingutil import (
+    from hgpackaging.util import (
         download_entry,
         extract_tar_to_directory,
         extract_zip_to_directory,
diff --git a/contrib/packaging/packagingutil.py b/contrib/packaging/hgpackaging/util.py
rename from contrib/packaging/packagingutil.py
rename to contrib/packaging/hgpackaging/util.py
--- a/contrib/packaging/packagingutil.py
+++ b/contrib/packaging/hgpackaging/util.py
@@ -1,4 +1,4 @@ 
-# packagingutil.py - Common packaging utility code.

+# util.py - Common packaging utility code.

 #
 # Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com>
 #
diff --git a/contrib/packaging/__init__.py b/contrib/packaging/hgpackaging/__init__.py
rename from contrib/packaging/__init__.py
rename to contrib/packaging/hgpackaging/__init__.py