[med-svn] [Git][med-team/conda-package-handling][master] 9 commits: routine-update: New upstream version

Nilesh Patra gitlab at salsa.debian.org
Tue Oct 27 19:09:12 GMT 2020



Nilesh Patra pushed to branch master at Debian Med / conda-package-handling


Commits:
55d85ad2 by Nilesh Patra at 2020-10-27T18:08:28+00:00
routine-update: New upstream version

- - - - -
6f49bea0 by Nilesh Patra at 2020-10-27T18:08:29+00:00
New upstream version 1.7.2
- - - - -
d48d410d by Nilesh Patra at 2020-10-27T18:08:30+00:00
Update upstream source from tag 'upstream/1.7.2'

Update to upstream version '1.7.2'
with Debian dir 5d3e087815a15cc01aa00ded86d206532a9bb11f
- - - - -
0d5cc64b by Nilesh Patra at 2020-10-27T18:08:40+00:00
routine-update: Add salsa-ci file

- - - - -
6a18b2d8 by Nilesh Patra at 2020-10-27T18:08:40+00:00
routine-update: Rules-Requires-Root: no

- - - - -
f46345aa by Nilesh Patra at 2020-10-27T18:08:44+00:00
Set upstream metadata fields: Bug-Submit.

Changes-By: lintian-brush
Fixes: lintian: upstream-metadata-missing-bug-tracking
See-also: https://lintian.debian.org/tags/upstream-metadata-missing-bug-tracking.html

- - - - -
fd8eb54b by Nilesh Patra at 2020-10-28T00:29:20+05:30
Add autopkgtest

- - - - -
a7d7b883 by Nilesh Patra at 2020-10-28T00:32:04+05:30
Add patch to remove regression in the new version

- - - - -
50754122 by Nilesh Patra at 2020-10-28T00:36:05+05:30
Update changelog

- - - - -


18 changed files:

- .authors.yml
- .mailmap
- AUTHORS.txt
- CHANGELOG.md
- debian/changelog
- debian/control
- + debian/examples
- + debian/patches/fix-out-dir.patch
- debian/patches/series
- + debian/salsa-ci.yml
- + debian/tests/control
- + debian/tests/run-unit-test
- debian/upstream/metadata
- − news/fix_null_pointer
- src/conda_package_handling/_version.py
- src/conda_package_handling/api.py
- src/conda_package_handling/cli.py
- src/conda_package_handling/validate.py


Changes:

=====================================
.authors.yml
=====================================
@@ -6,11 +6,11 @@
   - msarahan at anaconda.com
   aliases:
   - Mike Sarahan
-  num_commits: 96
+  num_commits: 98
   first_commit: 2019-01-03 20:00:40
 - name: Nehal J Wani
   email: nehaljw.kkd1 at gmail.com
-  num_commits: 2
+  num_commits: 4
   first_commit: 2019-05-01 08:25:27
   github: nehaljwani
 - name: Jonathan J. Helmus
@@ -18,3 +18,17 @@
   num_commits: 10
   first_commit: 2019-08-02 14:19:54
   github: jjhelmus
+- name: Alan Du
+  email: alanhdu at gmail.com
+  num_commits: 4
+  first_commit: 2019-11-07 05:49:27
+  github: alanhdu
+- name: Ray Donnelly
+  email: mingw.android at gmail.com
+  num_commits: 7
+  first_commit: 2020-05-06 10:49:55
+- name: ossdev07
+  email: ossdev at puresoftware.com
+  num_commits: 1
+  first_commit: 2020-01-06 10:18:31
+  github: ossdev07


=====================================
.mailmap
=====================================
@@ -12,4 +12,7 @@
 Michael Sarahan <msarahan at gmail.com> Mike Sarahan <msarahan at continuum.io>
 Michael Sarahan <msarahan at gmail.com> Mike Sarahan <msarahan at anaconda.com>
 Jonathan J. Helmus <jjhelmus at gmail.com>
+Ray Donnelly <mingw.android at gmail.com>
 Nehal J Wani <nehaljw.kkd1 at gmail.com>
+Alan Du <alanhdu at gmail.com>
+ossdev07 <ossdev at puresoftware.com>


=====================================
AUTHORS.txt
=====================================
@@ -3,4 +3,7 @@ Authors are sorted by number of commits.
 
 * Michael Sarahan
 * Jonathan J. Helmus
+* Ray Donnelly
 * Nehal J Wani
+* Alan Du
+* ossdev07


=====================================
CHANGELOG.md
=====================================
@@ -1,4 +1,26 @@
 # current developments
+
+2020-10-16 1.7.2:
+------------------
+
+Enhancements:
+-------------
+
+* add --force to transmute
+
+Bug fixes:
+----------
+
+* Do not report symlinks as missing files
+* Fixes for --process and --out-folder  #68
+* --out-folder: Normalise, expand user-ify and ensure it ends with os.sep
+
+Contributors:
+-------------
+
+* @mingwandroid
+* @nehaljwani
+
 2019-09-20 1.6.0:
 ------------------
 


=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+conda-package-handling (1.7.2-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream version
+  * Add salsa-ci file (routine-update)
+  * Rules-Requires-Root: no (routine-update)
+  * Set upstream metadata fields: Bug-Submit.
+  * Add autopkgtest
+  * Add patch to remove regression in the new version
+
+ -- Nilesh Patra <npatra974 at gmail.com>  Tue, 27 Oct 2020 18:08:28 +0000
+
 conda-package-handling (1.7.0-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/control
=====================================
@@ -16,6 +16,7 @@ Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/conda-package-handling
 Vcs-Git: https://salsa.debian.org/med-team/conda-package-handling.git
 Homepage: https://github.com/conda/conda-package-handling
+Rules-Requires-Root: no
 
 Package: conda-package-handling
 Architecture: any


=====================================
debian/examples
=====================================
@@ -0,0 +1 @@
+tests/data/*


=====================================
debian/patches/fix-out-dir.patch
=====================================
@@ -0,0 +1,34 @@
+Description: This seems like a regression in the new release hence adapted this function to the previous release.
+ More details here: https://github.com/conda/conda-package-handling/issues/72
+ Remove this patch if fixed in the next release.
+Author: Nilesh Patra <npatra974 at gmail.com>
+Forwarded: no
+Last-Update: 2020-10-28
+--- a/src/conda_package_handling/cli.py
++++ b/src/conda_package_handling/cli.py
+@@ -73,8 +73,6 @@
+ 
+ def main(args=None):
+     args = parse_args(args)
+-    if args.out_folder:
+-        args.out_folder = os.path.abspath(os.path.normpath(os.path.expanduser(args.out_folder))) + os.sep
+     if args.subparser_name in ('extract', 'x'):
+         if args.info:
+             api.extract(args.archive_path, args.dest, components='info', prefix=args.prefix)
+@@ -83,7 +81,7 @@
+     elif args.subparser_name in ('create', 'c'):
+         api.create(args.prefix, args.file_list, args.out_fn, args.out_folder)
+     elif args.subparser_name in ('transmute', 't'):
+-        failed_files = api.transmute(args.in_file, args.out_ext, args.out_folder, args.processes or 1, force=args.force)
++        failed_files = api.transmute(args.in_file, args.out_ext, args.out_folder, args.processes)
+         if failed_files:
+             print("failed files:")
+             pprint(failed_files)
+@@ -96,6 +94,7 @@
+             sys.exit(1)
+     else:
+         raise NotImplementedError("Command {} is not implemented".format(args.subparser_name))
++ 
+ 
+ 
+ if __name__ == "__main__":


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 fix_linking.patch
 fix_test.patch
+fix-out-dir.patch


=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,4 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml


=====================================
debian/tests/control
=====================================
@@ -0,0 +1,3 @@
+Tests: run-unit-test
+Depends: @, tree
+Restrictions: allow-stderr, needs-root


=====================================
debian/tests/run-unit-test
=====================================
@@ -0,0 +1,34 @@
+#!/bin/bash
+set -e
+
+pkg="conda-package-handling"
+
+if [ "$AUTOPKGTEST_TMP" = "" ] ; then
+  AUTOPKGTEST_TMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
+  trap "rm -rf $AUTOPKGTEST_TMP" 0 INT QUIT ABRT PIPE TERM
+fi
+
+cp -a /usr/share/doc/${pkg}/examples/* $AUTOPKGTEST_TMP
+
+cd $AUTOPKGTEST_TMP
+gunzip -r *
+
+echo "Test 1"
+cph transmute mock-2.0.0-py37_1000.tar.bz2 .conda
+[ -s *.conda ]
+echo "PASS"
+
+echo "Test 2"
+mkdir -p mkl-b
+time cph extract *.conda --dest mkl-b
+tree mkl-b
+rm -rf mkl-b
+echo "PASS"
+
+echo "Test 3"
+mkdir -p tmp
+cph create ./tmp *.conda
+tree ./tmp
+rm -rf ./tmp *.conda
+echo "PASS"
+


=====================================
debian/upstream/metadata
=====================================
@@ -1,3 +1,4 @@
 Bug-Database: https://github.com/conda/conda-package-handling/issues
+Bug-Submit: https://github.com/conda/conda-package-handling/issues/new
 Repository: https://github.com/conda/conda-package-handling.git
 Repository-Browse: https://github.com/conda/conda-package-handling


=====================================
news/fix_null_pointer deleted
=====================================
@@ -1,4 +0,0 @@
-Bug fixes:
-----------
-
-* Avoid segfaulting on incomplete archives


=====================================
src/conda_package_handling/_version.py
=====================================
@@ -23,9 +23,9 @@ def get_keywords():
     # setup.py/versioneer.py will grep for the variable names, so they must
     # each be defined on a line of their own. _version.py will just call
     # get_keywords().
-    git_refnames = " (HEAD -> master, tag: 1.7.0, tag: 1.6.1)"
-    git_full = "7c4a4717a6d3a15fd41058d8864df2a750b20322"
-    git_date = "2020-05-06 10:49:55 +0200"
+    git_refnames = " (HEAD -> master, tag: 1.7.2)"
+    git_full = "29b05daaa51ff8c790fa31c401ce372f3a68514a"
+    git_date = "2020-10-16 19:02:10 +0200"
     keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
     return keywords
 


=====================================
src/conda_package_handling/api.py
=====================================
@@ -96,7 +96,7 @@ def _convert(fn, out_ext, out_folder, **kw):
         return
     out_fn = _os.path.join(out_folder, basename + out_ext)
     errors = ""
-    if not _os.path.lexists(out_fn):
+    if not _os.path.lexists(out_fn) or ('force' in kw and kw['force']):
         with _TemporaryDirectory(prefix=out_folder) as tmp:
             try:
                 extract(fn, dest_dir=tmp)
@@ -104,7 +104,7 @@ def _convert(fn, out_ext, out_folder, **kw):
 
                 create(tmp, file_list, _os.path.basename(out_fn), out_folder=out_folder, **kw)
                 _, missing_files, mismatching_sizes = validate_converted_files_match(
-                    tmp, _os.path.join(out_folder, fn))
+                    tmp, out_fn)
                 if missing_files or mismatching_sizes:
                     errors = str(ConversionError(missing_files, mismatching_sizes))
             except Exception as e:


=====================================
src/conda_package_handling/cli.py
=====================================
@@ -55,7 +55,7 @@ def parse_args(parse_this=None):
     verify_parser.add_argument("--reference-ext", "-r", help="file extension to consider as "
                                "'ground truth' in comparison.  Use this with the --all flag.",
                                default=".tar.bz2")
-    verify_parser.add_argument("--processes", help="Max number of processes to use.  If "
+    verify_parser.add_argument("--processes", type=int, help="Max number of processes to use.  If "
                                "not set, defaults to your CPU count.")
 
     convert_parser = sp.add_parser('transmute', help='convert from one package type to another',
@@ -65,13 +65,16 @@ def parse_args(parse_this=None):
     convert_parser.add_argument('out_ext', help="extension of file to convert to.  "
                                 "Examples: .tar.bz2, .conda")
     convert_parser.add_argument("--out-folder", help="Folder to dump final archive to")
-    convert_parser.add_argument("--processes", help="Max number of processes to use.  If "
+    convert_parser.add_argument("--force",  action='store_true', help="Force overwrite existing package")
+    convert_parser.add_argument("--processes", type=int, help="Max number of processes to use.  If "
                                 "not set, defaults to your CPU count.")
     return parser.parse_args(parse_this)
 
 
 def main(args=None):
     args = parse_args(args)
+    if args.out_folder:
+        args.out_folder = os.path.abspath(os.path.normpath(os.path.expanduser(args.out_folder))) + os.sep
     if args.subparser_name in ('extract', 'x'):
         if args.info:
             api.extract(args.archive_path, args.dest, components='info', prefix=args.prefix)
@@ -80,7 +83,7 @@ def main(args=None):
     elif args.subparser_name in ('create', 'c'):
         api.create(args.prefix, args.file_list, args.out_fn, args.out_folder)
     elif args.subparser_name in ('transmute', 't'):
-        failed_files = api.transmute(args.in_file, args.out_ext, args.out_folder, args.processes)
+        failed_files = api.transmute(args.in_file, args.out_ext, args.out_folder, args.processes or 1, force=args.force)
         if failed_files:
             print("failed files:")
             pprint(failed_files)


=====================================
src/conda_package_handling/validate.py
=====================================
@@ -22,8 +22,9 @@ def validate_converted_files_match(src_file_or_folder, subject, reference_ext=""
                 absfile = os.path.join(root, f)
                 rp = os.path.relpath(absfile, src_folder)
                 destpath = os.path.join(converted_folder, rp)
-                if not os.path.isfile(destpath):
-                    missing_files.add(rp)
-                elif os.stat(absfile).st_size != os.stat(destpath).st_size:
-                    mismatch_size.add(rp)
+                if not os.path.islink(destpath):
+                    if not os.path.isfile(destpath):
+                        missing_files.add(rp)
+                    elif os.stat(absfile).st_size != os.stat(destpath).st_size:
+                        mismatch_size.add(rp)
     return src_file_or_folder, missing_files, mismatch_size



View it on GitLab: https://salsa.debian.org/med-team/conda-package-handling/-/compare/be0017096a2e52ffe12be7723c726e34dac7dd10...507541229d44626e1f9cf2f253a20617641ae376

-- 
View it on GitLab: https://salsa.debian.org/med-team/conda-package-handling/-/compare/be0017096a2e52ffe12be7723c726e34dac7dd10...507541229d44626e1f9cf2f253a20617641ae376
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201027/ffa98a67/attachment-0001.html>


More information about the debian-med-commit mailing list