[med-svn] [Git][med-team/conda-package-handling][upstream] New upstream version 1.7.2
Nilesh Patra
gitlab at salsa.debian.org
Tue Oct 27 19:09:17 GMT 2020
Nilesh Patra pushed to branch upstream at Debian Med / conda-package-handling
Commits:
6f49bea0 by Nilesh Patra at 2020-10-27T18:08:29+00:00
New upstream version 1.7.2
- - - - -
9 changed files:
- .authors.yml
- .mailmap
- AUTHORS.txt
- CHANGELOG.md
- − 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:
------------------
=====================================
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/-/commit/6f49bea0765ed63de4dcde2a1bf5fe71a030021d
--
View it on GitLab: https://salsa.debian.org/med-team/conda-package-handling/-/commit/6f49bea0765ed63de4dcde2a1bf5fe71a030021d
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/054e133c/attachment-0001.html>
More information about the debian-med-commit
mailing list