[med-svn] [Git][med-team/conda-package-handling][upstream] New upstream version 1.8.1

Nilesh Patra (@nilesh) gitlab at salsa.debian.org
Sat May 28 09:52:29 BST 2022



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


Commits:
ff43fd8a by Nilesh Patra at 2022-05-28T14:18:32+05:30
New upstream version 1.8.1
- - - - -


14 changed files:

- .authors.yml
- + .github/ISSUE_TEMPLATE/epic.yml
- .github/workflows/boards.yml
- .github/workflows/issues.yml
- .github/workflows/labels.yml
- + .github/workflows/lock.yml
- + .github/workflows/stale.yml
- .mailmap
- AUTHORS.rst
- CHANGELOG.rst
- src/conda_package_handling/_version.py
- src/conda_package_handling/api.py
- tests/data/cph_test_data-0.0.1-0.tar.bz2
- tests/recipes/cph_test_data/build.sh


Changes:

=====================================
.authors.yml
=====================================
@@ -54,8 +54,10 @@
   first_commit: 2021-04-12 11:49:45
 - name: conda-bot
   email: ad-team+condabot at anaconda.com
-  num_commits: 2
+  num_commits: 3
   first_commit: 2022-01-25 21:32:39
+  alternate_emails:
+  - 18747875+conda-bot at users.noreply.github.com
 - name: Cheng H. Lee
   email: clee at anaconda.com
   alternate_emails:
@@ -81,5 +83,9 @@
   first_commit: 2022-02-09 01:00:38
 - name: Jannis Leidel
   email: jannis at leidel.info
-  num_commits: 5
+  num_commits: 6
   first_commit: 2021-09-17 21:51:27
+- name: Tobias "Tobi" Koch
+  email: tkoch at anaconda.com
+  num_commits: 1
+  first_commit: 2022-03-31 19:54:23


=====================================
.github/ISSUE_TEMPLATE/epic.yml
=====================================
@@ -0,0 +1,24 @@
+name: Epic
+description: (for conda-core team only) A collection of smaller related tickets
+labels: [epic]
+body:
+  - type: textarea
+    attributes:
+      label: Summary
+      description: >-
+        Define the highlevel objectives accomplished in this epic. Include the
+        bigger picture of what is changing and/or the user story for why the
+        changes are desired/necessary.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Linked Issues & PRs
+      description: List all issues related to this epic.
+      value: |
+        - #
+        - #
+        - #
+        ...
+    validations:
+      required: true


=====================================
.github/workflows/boards.yml
=====================================
@@ -1,6 +1,8 @@
 name: Automate Boards
 
 on:
+  # NOTE: github.event context is issues payload:
+  # https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#issues
   issues:
     types: [opened, labeled, unlabeled]
 


=====================================
.github/workflows/issues.yml
=====================================
@@ -1,11 +1,12 @@
 name: Automate Issues
 
 on:
+  # NOTE: github.event is issue_comment payload:
+  # https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#issue_comment
   issue_comment:
     types: [created]
 
 env:
-  # labels
   FEEDBACK_LBL: pending::feedback
   SUPPORT_LBL: pending::support
 
@@ -17,7 +18,8 @@ jobs:
   pending_support:
     # if [pending::feedback] and the author responds
     if: >-
-      github.event_name == 'issue_comment'
+      !github.event.repository.fork
+      && github.event_name == 'issue_comment'
       && github.event.action == 'created'
       && !github.event.issue.pull_request
       && contains(github.event.issue.labels.*.name, 'pending::feedback')


=====================================
.github/workflows/labels.yml
=====================================
@@ -1,15 +1,19 @@
 name: Sync Labels
 
 on:
+  # NOTE: github.event is workflow_dispatch payload:
+  # https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#workflow_dispatch
   workflow_dispatch:
     inputs:
       dryrun:
         description: "dryrun: Preview changes to labels without editing them (true|false)"
         required: true
-        default: "true"
+        type: boolean
+        default: true
 
 jobs:
   sync:
+    if: '!github.event.repository.fork'
     runs-on: ubuntu-latest
     env:
       GLOBAL: https://raw.githubusercontent.com/conda/infra/main/.github/global.yml


=====================================
.github/workflows/lock.yml
=====================================
@@ -0,0 +1,59 @@
+name: Lock
+
+on:
+  # NOTE: github.event is workflow_dispatch payload:
+  # https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#workflow_dispatch
+  workflow_dispatch:
+    # inputs:
+    #   dryrun:
+    #     description: "dryrun: Preview locking issues/prs without marking them (true|false)"
+    #     required: true
+    #     type: boolean
+    #     default: true
+
+  schedule:
+    - cron: 0 6 * * *
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  lock:
+    if: '!github.event.repository.fork'
+    runs-on: ubuntu-latest
+    steps:
+      - id: read_yaml
+        uses: conda/actions/read-yaml at v22.2.1
+        with:
+          path: https://raw.githubusercontent.com/conda/infra/main/.github/messages.yml
+      - uses: dessant/lock-threads at v2
+        with:
+          # Number of days of inactivity before a closed issue is locked
+          issue-lock-inactive-days: 365
+          # Do not lock issues created before a given timestamp, value must follow ISO 8601
+          issue-exclude-created-before: ''
+          # Do not lock issues with these labels, value must be a comma separated list of labels or ''
+          issue-exclude-labels: ''
+          # Labels to add before locking an issue, value must be a comma separated list of labels or ''
+          issue-lock-labels: 'locked'
+          # Comment to post before locking an issue
+          issue-lock-comment: ${{ fromJSON(steps.read_yaml.outputs.value)['lock-issue'] }}
+          # Reason for locking an issue, value must be one of resolved, off-topic, too heated, spam or ''
+          issue-lock-reason: 'resolved'
+
+          # Number of days of inactivity before a closed pull request is locked
+          pr-lock-inactive-days: 365
+          # Do not lock pull requests created before a given timestamp, value must follow ISO 8601
+          pr-exclude-created-before: ''
+          # Do not lock pull requests with these labels, value must be a comma separated list of labels or ''
+          pr-exclude-labels: ''
+          # Labels to add before locking a pull request, value must be a comma separated list of labels or ''
+          pr-lock-labels: 'locked'
+          # Comment to post before locking a pull request
+          pr-lock-comment: ${{ fromJSON(steps.read_yaml.outputs.value)['lock-pr'] }}
+          # Reason for locking a pull request, value must be one of resolved, off-topic, too heated, spam or ''
+          pr-lock-reason: 'resolved'
+
+          # Limit locking to only issues or pull requests, value must be one of issues, prs or ''
+          process-only: ''


=====================================
.github/workflows/stale.yml
=====================================
@@ -0,0 +1,89 @@
+name: Stale
+
+on:
+  # NOTE: github.event is workflow_dispatch payload:
+  # https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#workflow_dispatch
+  workflow_dispatch:
+    inputs:
+      dryrun:
+        description: "dryrun: Preview stale issues/prs without marking them (true|false)"
+        required: true
+        type: boolean
+        default: true
+
+  schedule:
+    - cron: 0 4 * * *
+
+jobs:
+  stale:
+    if: '!github.event.repository.fork'
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # The issues labeled "support" have a more aggressive stale/close timeline from the rest
+        only-issue-labels: ['type::support', '']
+    steps:
+      - id: read_yaml
+        uses: conda/actions/read-yaml at v22.2.1
+        with:
+          path: https://raw.githubusercontent.com/conda/infra/main/.github/messages.yml
+      - uses: actions/stale at v4
+        id: stale
+        with:
+          # Idle number of days before marking issues stale (default: 60)
+          days-before-issue-stale: ${{ matrix.only-issue-labels && 21 || 365 }}
+          # Idle number of days before closing stale issues/PRs (default: 7)
+          days-before-issue-close: ${{ matrix.only-issue-labels && 7 || 90 }}
+          # Idle number of days before marking PRs stale (default: 60)
+          days-before-pr-stale: 365
+          # Idle number of days before closing stale PRs (default: 7)
+          days-before-pr-close: 30
+
+          # Comment on the staled issues
+          stale-issue-message: ${{ fromJSON(steps.read_yaml.outputs.value)['stale-issue'] }}
+          # Comment on the staled issues while closed
+          close-issue-message: ${{ fromJSON(steps.read_yaml.outputs.value)['close-issue'] }}
+          # Comment on the staled PRs
+          stale-pr-message: ${{ fromJSON(steps.read_yaml.outputs.value)['stale-pr'] }}
+          # Comment on the staled PRs while closed
+          close-pr-message: ${{ fromJSON(steps.read_yaml.outputs.value)['close-pr'] }}
+          # Label to apply on staled issues
+          stale-issue-label: 'stale'
+          # Label to apply on closed issues
+          close-issue-label: 'stale::closed'
+          # Label to apply on staled PRs
+          stale-pr-label: 'stale'
+          # Label to apply on closed PRs
+          close-pr-label: 'stale::closed'
+
+          # Issues with these labels will never be considered stale
+          exempt-issue-labels: 'stale::recovered,good-first-issue,help-wanted,severity::1,source::partner,¡important!,¡security!,type::tech-debt,epic,priority-high'
+          # Issues with these labels will never be considered stale
+          exempt-pr-labels: 'stale::recovered,good-first-issue,help-wanted,severity::1,source::partner,¡important!,¡security!,type::tech-debt,epic,priority-high'
+          # Only issues with these labels are checked whether they are stale
+          only-issue-labels: ${{ matrix.only-issue-labels }}
+
+          # Max number of operations per run
+          operations-per-run: ${{ secrets.STALE_OPERATIONS_PER_RUN || 100 }}
+          # Remove stale label from issues/PRs on updates/comments
+          remove-stale-when-updated: true
+
+          # Add specified labels to issues/PRs when they become unstale
+          labels-to-add-when-unstale: 'stale::recovered'
+          labels-to-remove-when-unstale: 'stale,stale::closed'
+
+          # Dry-run (default: false)
+          debug-only: ${{ github.event.inputs.dryrun || false }}
+          # Order to get issues/PRs (default: false)
+          ascending: true
+          # Delete branch after closing a stale PR (default: false)
+          delete-branch: false
+
+          # Exempt all issues/PRs with milestones from stale
+          exempt-all-milestones: true
+
+          # Assignees on issues/PRs exempted from stale
+          exempt-assignees: mingwandroid
+
+      - name: Print outputs
+        run: echo ${{ join(steps.stale.outputs.*, ',') }}


=====================================
.mailmap
=====================================
@@ -18,12 +18,13 @@ Jannis Leidel <jannis at leidel.info>
 Nehal J Wani <nehaljw.kkd1 at gmail.com>
 Alan Du <alanhdu at gmail.com>
 Cheng H. Lee <clee at anaconda.com> Cheng H. Lee <chenghlee at users.noreply.github.com>
+conda-bot <ad-team+condabot at anaconda.com> conda-bot <18747875+conda-bot at users.noreply.github.com>
 Matthew R. Becker <beckermr at users.noreply.github.com>
 Daniel Bast <2790401+dbast at users.noreply.github.com>
-conda-bot <ad-team+condabot at anaconda.com>
 Daniel Holth <dholth at anaconda.com>
 Christopher Barber <christopher.barber at analog.com>
 ossdev07 <ossdev at puresoftware.com>
 Eli Uriegas <seemethere101 at gmail.com>
 Chris Burr <chrisburr at users.noreply.github.com>
 vz-x <77290357+vz-x at users.noreply.github.com>
+Tobias "Tobi" Koch <tkoch at anaconda.com>


=====================================
AUTHORS.rst
=====================================
@@ -9,12 +9,13 @@ Authors are sorted by number of commits.
 * Nehal J Wani
 * Alan Du
 * Cheng H. Lee
+* conda-bot
 * Matthew R. Becker
 * Daniel Bast
-* conda-bot
 * Daniel Holth
 * Christopher Barber
 * ossdev07
 * Eli Uriegas
 * Chris Burr
 * vz-x
+* Tobias "Tobi" Koch


=====================================
CHANGELOG.rst
=====================================
@@ -1,5 +1,20 @@
 .. current developments
 
+2022-04-01 1.8.1:
+==================
+
+Bug fixes:
+----------
+
+* Don't drop empty directories that happen to be prefixes of something else (#99)
+
+Contributors:
+-------------
+
+* @tobijk
+* @conda-bot
+* @chenghlee
+
 2022-03-12 1.8.0:
 ==================
 


=====================================
src/conda_package_handling/_version.py
=====================================
@@ -25,9 +25,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.8.0)"
-    git_full = "7e3d7494f96adee79ca121eeeeca139381f2a74c"
-    git_date = "2022-03-15 11:11:44 +0100"
+    git_refnames = " (tag: 1.8.1)"
+    git_full = "336e2dd72e8502ebe528e8bb8cafe19b1c527c6e"
+    git_date = "2022-04-01 11:26:46 -0500"
     keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
     return keywords
 


=====================================
src/conda_package_handling/api.py
=====================================
@@ -23,7 +23,7 @@ def _collect_paths(prefix):
             file_paths.append(_os.path.relpath(_os.path.join(dp, f), prefix))
         dir_paths.extend(_os.path.relpath(_os.path.join(dp, _), prefix) for _ in dn)
     file_list = file_paths + [dp for dp in dir_paths
-                              if not any(f.startswith(dp) for f in file_paths)]
+                              if not any(f.startswith(dp + _os.sep) for f in file_paths)]
     return file_list
 
 


=====================================
tests/data/cph_test_data-0.0.1-0.tar.bz2
=====================================
Binary files a/tests/data/cph_test_data-0.0.1-0.tar.bz2 and b/tests/data/cph_test_data-0.0.1-0.tar.bz2 differ


=====================================
tests/recipes/cph_test_data/build.sh
=====================================
@@ -2,6 +2,7 @@ cd "${PREFIX}"
 umask 022
 
 mkdir -p bin lib libexec share/terminfo
+mkdir -p lib/{python3.10,alibrary}
 
 echo -e '#/bin/sh\necho hello world' > bin/hello-1.0
 chmod 755 bin/hello-1.0
@@ -9,6 +10,8 @@ chmod 755 bin/hello-1.0
 echo -n "" >share/terminfo/xterm.dat
 chmod 644 share/terminfo/xterm.dat
 
+echo -n "" >lib/alibrary/alib.lib
+echo -n "" >lib/python3.10/amodule.py
 
 # Tests for symlink...
 pushd bin >/dev/null
@@ -24,6 +27,8 @@ ln -sn terminfo termcap                 # ...to subdir in same dir
 popd >/dev/null
 
 pushd lib >/dev/null
+ln -sn alibrary alib                    # ...to subdir in same dir
+ln -sn python3.10 python3.1             # ...to subdir in same dir
 ln -sn ../share/terminfo terminfo       # ...to subdir of another dir
 ln -sn libdangle.lib.1 libdangle.lib    # ...dangling link
 popd >/dev/null



View it on GitLab: https://salsa.debian.org/med-team/conda-package-handling/-/commit/ff43fd8aff648c64db711cc4cce33e1171bc23b1

-- 
View it on GitLab: https://salsa.debian.org/med-team/conda-package-handling/-/commit/ff43fd8aff648c64db711cc4cce33e1171bc23b1
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/20220528/ccf673a5/attachment-0001.htm>


More information about the debian-med-commit mailing list