Skip to content

Commit def1826

Browse files
kenodegardkenodegard
authored
Merge branch 'main' into drop-pytz
2 parents 27f50b8 + da72aa8 commit def1826

27 files changed

+511
-106
lines changed

‎.github/workflows/builds-review.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ jobs:
4848
4949
# Clean checkout of specific git ref needed for package metadata version
5050
# which needs env vars GIT_DESCRIBE_TAG and GIT_BUILD_STR:
51-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
51+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5252
with:
5353
ref: ${{ github.ref }}
5454
clean: true
5555
fetch-depth: 0
5656

5757
- name: Create and upload review build
58-
uses: conda/actions/canary-release@f05161c6e6e37a49b17c8e0b436197b53830318a # v25.9.2
58+
uses: conda/actions/canary-release@7f6830b1428a9bd47f0b068892c77eae95207037 # v26.1.0
5959
with:
6060
package-name: ${{ github.event.repository.name }}
6161
subdir: ${{ matrix.subdir }}

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
if: '!github.event.repository.fork'
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
25+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626
with:
2727
fetch-depth: 0
2828
- name: Setup

‎.github/workflows/stale.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
with:
3939
path: https://raw.githubusercontent.com/conda/infra/main/.github/messages.yml
4040

41-
- uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
41+
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
4242
id: stale
4343
with:
4444
# Only issues with these labels are checked whether they are stale

‎.github/workflows/tests.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
code: ${{ steps.filter.outputs.code }}
4646
steps:
4747
- name: Checkout Source
48-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
48+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4949
# dorny/paths-filter needs git clone for non-PR events
5050
# https://github.com/dorny/paths-filter#supported-workflows
5151
if: github.event_name != 'pull_request'
@@ -105,7 +105,7 @@ jobs:
105105

106106
steps:
107107
- name: Free Disk Space
108-
uses: endersonmenezes/free-disk-space@6c4664f43348c8c7011b53488d5ca65e9fc5cd1a # v3.0.0
108+
uses: endersonmenezes/free-disk-space@e6ed9b02e683a3b55ed0252f1ee469ce3b39a885 # v3.1.0
109109
with:
110110
remove_android: true
111111
remove_dotnet: true
@@ -139,21 +139,21 @@ jobs:
139139
testing: false
140140

141141
- name: Checkout Source
142-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
142+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
143143
with:
144144
fetch-depth: 0
145145

146146
- name: Hash + Timestamp
147147
run: echo "HASH=${{ runner.os }}-${{ runner.arch }}-Py${{ matrix.python-version }}-${{ matrix.conda-version }}-${{ matrix.test-type }}-$(date -u "+%Y%m")" >> $GITHUB_ENV
148148

149149
- name: Cache Conda
150-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
150+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
151151
with:
152152
path: ~/conda_pkgs_dir
153153
key: cache-${{ env.HASH }}
154154

155155
- name: Setup Miniconda
156-
uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
156+
uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
157157
with:
158158
condarc-file: .github/condarc
159159
run-post: false # skip post cleanup
@@ -189,13 +189,13 @@ jobs:
189189
-m "${{ env.PYTEST_MARKER }}"
190190
191191
- name: Upload Coverage
192-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
192+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
193193
with:
194194
flags: ${{ runner.os }},${{ runner.arch }},${{ matrix.python-version }},${{ matrix.test-type }}
195195

196196
- name: Upload Test Results
197197
if: '!cancelled()'
198-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4.4.0
198+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v4.4.0
199199
with:
200200
name: test-results-${{ env.HASH }}
201201
path: |
@@ -221,21 +221,21 @@ jobs:
221221

222222
steps:
223223
- name: Checkout Source
224-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
224+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
225225
with:
226226
fetch-depth: 0
227227

228228
- name: Hash + Timestamp
229229
run: echo "HASH=${{ runner.os }}-${{ runner.arch }}-Py${{ matrix.python-version }}-benchmark-$(date -u "+%Y%m")" >> $GITHUB_ENV
230230

231231
- name: Cache Conda
232-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
232+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
233233
with:
234234
path: ~/conda_pkgs_dir
235235
key: cache-${{ env.HASH }}
236236

237237
- name: Setup Miniconda
238-
uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
238+
uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
239239
with:
240240
condarc-file: .github/condarc
241241
run-post: false # skip post cleanup
@@ -265,7 +265,7 @@ jobs:
265265
run: conda list --show-channel-urls
266266

267267
- name: Run Benchmarks
268-
uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
268+
uses: CodSpeedHQ/action@2ac572851726409c88c02a307f1ea2632a9ea59b # v4.11.0
269269
with:
270270
token: ${{ secrets.CODSPEED_TOKEN }}
271271
run: $CONDA/envs/test/bin/pytest --codspeed
@@ -299,7 +299,7 @@ jobs:
299299

300300
steps:
301301
- name: Checkout Source
302-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
302+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
303303
with:
304304
fetch-depth: 0
305305

@@ -308,15 +308,15 @@ jobs:
308308
run: echo "HASH=${{ runner.os }}-${{ runner.arch }}-Py${{ matrix.python-version }}-${{ matrix.conda-version }}-${{ matrix.test-type }}-$(date -u "+%Y%m")" >> $GITHUB_ENV
309309

310310
- name: Cache Conda
311-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
311+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
312312
with:
313313
# Use faster GNU tar for all runners
314314
enableCrossOsArchive: true
315315
path: D:\conda_pkgs_dir
316316
key: cache-${{ env.HASH }}
317317

318318
- name: Setup Miniconda
319-
uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
319+
uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
320320
with:
321321
condarc-file: .github\condarc
322322
run-post: false # skip post cleanup
@@ -359,13 +359,13 @@ jobs:
359359
-m "${{ env.PYTEST_MARKER }}"
360360
361361
- name: Upload Coverage
362-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
362+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
363363
with:
364364
flags: ${{ runner.os }},${{ runner.arch }},${{ matrix.python-version }},${{ matrix.test-type }}
365365

366366
- name: Upload Test Results
367367
if: '!cancelled()'
368-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4.4.0
368+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v4.4.0
369369
with:
370370
name: test-results-${{ env.HASH }}
371371
path: |
@@ -408,23 +408,23 @@ jobs:
408408

409409
steps:
410410
- name: Checkout Source
411-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
411+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
412412
with:
413413
fetch-depth: 0
414414

415415
- name: Hash + Timestamp
416416
run: echo "HASH=${{ runner.os }}-${{ runner.arch }}-Py${{ matrix.python-version }}-${{ matrix.conda-version }}-${{ matrix.test-type }}-$(date -u "+%Y%m")" >> $GITHUB_ENV
417417

418418
- name: Cache Conda
419-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
419+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
420420
with:
421421
path: |
422422
~/conda_pkgs_dir
423423
~/macosx_sdks
424424
key: cache-${{ env.HASH }}
425425

426426
- name: Setup Miniconda
427-
uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
427+
uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
428428
with:
429429
condarc-file: .github/condarc
430430
run-post: false # skip post cleanup
@@ -478,13 +478,13 @@ jobs:
478478
CONDA_BUILD_SYSROOT: ${{ env.MACOSX_SDK_ROOT }}
479479

480480
- name: Upload Coverage
481-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
481+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
482482
with:
483483
flags: ${{ runner.os }},${{ runner.arch }},${{ matrix.python-version }},${{ matrix.test-type }}
484484

485485
- name: Upload Test Results
486486
if: '!cancelled()'
487-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4.4.0
487+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v4.4.0
488488
with:
489489
name: test-results-${{ env.HASH }}
490490
path: |
@@ -506,11 +506,11 @@ jobs:
506506
runs-on: ubuntu-latest
507507
steps:
508508
- name: Download Artifacts
509-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
509+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
510510

511511
- name: Upload Combined Test Results
512512
# provides one downloadable archive of all matrix run test results for further analysis
513-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4.4.0
513+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v4.4.0
514514
with:
515515
name: test-results-${{ github.sha }}-all
516516
path: test-results-*
@@ -565,15 +565,15 @@ jobs:
565565
# Clean checkout of specific git ref needed for package metadata version
566566
# which needs env vars GIT_DESCRIBE_TAG and GIT_BUILD_STR:
567567
- name: Checkout Source
568-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
568+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
569569
with:
570570
ref: ${{ github.ref }}
571571
clean: true
572572
fetch-depth: 0
573573

574574
# Explicitly use Python 3.12 since each of the OSes has a different default Python
575575
- name: Setup Python
576-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
576+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
577577
with:
578578
python-version: '3.13'
579579

@@ -612,7 +612,7 @@ jobs:
612612
Path(environ["GITHUB_ENV"]).write_text("\n".join(f"{name}={value}" for name, value in envs.items()))
613613
614614
- name: Create & Upload
615-
uses: conda/actions/canary-release@f05161c6e6e37a49b17c8e0b436197b53830318a # v25.9.2
615+
uses: conda/actions/canary-release@7f6830b1428a9bd47f0b068892c77eae95207037 # v26.1.0
616616
with:
617617
package-name: ${{ github.event.repository.name }}
618618
subdir: ${{ matrix.subdir }}

‎.github/workflows/upload.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
ARCHIVE_NAME: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}
2828
steps:
2929
- name: Checkout Source
30-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
30+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3131

3232
- name: Create Release Directory
3333
run: mkdir -p release

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ repos:
5858
# auto format Python codes within docstrings
5959
- id: blacken-docs
6060
- repo: https://github.com/astral-sh/ruff-pre-commit
61-
rev: v0.14.14
61+
rev: v0.15.7
6262
hooks:
6363
# lint & attempt to correct failures (e.g. pyupgrade)
6464
- id: ruff-check
@@ -87,7 +87,7 @@ repos:
8787
tests/
8888
)
8989
- repo: https://github.com/python-jsonschema/check-jsonschema
90-
rev: 0.36.1
90+
rev: 0.37.0
9191
hooks:
9292
# verify github syntaxes
9393
- id: check-github-workflows

‎.readthedocs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ sphinx:
44
configuration: docs/source/conf.py
55

66
build:
7-
os: ubuntu-22.04
7+
os: ubuntu-24.04
88
tools:
9-
python: '3.11'
9+
python: '3.14'
1010

1111
python:
1212
install:

‎LICENSE‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
1-
Except where noted below, conda is released under the following terms:
1+
BSD 3-Clause License
22

3-
(c) 2012 Continuum Analytics, Inc. / http://continuum.io
4-
All Rights Reserved
3+
Copyright (c) 2012, Anaconda, Inc.
54

65
Redistribution and use in source and binary forms, with or without
76
modification, are permitted provided that the following conditions are met:
8-
* Redistributions of source code must retain the above copyright
9-
notice, this list of conditions and the following disclaimer.
10-
* Redistributions in binary form must reproduce the above copyright
11-
notice, this list of conditions and the following disclaimer in the
12-
documentation and/or other materials provided with the distribution.
13-
* Neither the name of Continuum Analytics, Inc. nor the
14-
names of its contributors may be used to endorse or promote products
15-
derived from this software without specific prior written permission.
167

17-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20-
DISCLAIMED. IN NO EVENT SHALL CONTINUUM ANALYTICS BE LIABLE FOR ANY
21-
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24-
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8+
1. Redistributions of source code must retain the above copyright notice, this
9+
list of conditions and the following disclaimer.
2710

11+
2. Redistributions in binary form must reproduce the above copyright notice,
12+
this list of conditions and the following disclaimer in the documentation
13+
and/or other materials provided with the distribution.
2814

29-
Exceptions
30-
==========
15+
3. Neither the name of the copyright holder nor the names of its
16+
contributors may be used to endorse or promote products derived from
17+
this software without specific prior written permission.
3118

32-
versioneer.py is Public Domain
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
23+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
25+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
26+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
27+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SHELL := /bin/bash -o pipefail -o errexit
44
# ENV_NAME=dev TMPDIR=$HOME make test
55
ENV_NAME ?= conda-build
66
DOC_ENV_NAME ?= conda-build-docs
7-
PYTHON_VERSION ?= 3.11
7+
PYTHON_VERSION ?= 3.13
88
TMPDIR := $(shell if test -w $(TMPDIR); then echo $(TMPDIR); else echo ./tmp/ ; fi)conda-build-testing
99

1010
# We want to bypass the shell wrapper function and use the binary directly for conda-run specifically

‎conda_build/_rattler_build/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Copyright (C) 2014 Anaconda, Inc
2+
# SPDX-License-Identifier: BSD-3-Clause

0 commit comments

Comments
 (0)