Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ba24955
Updating to modern Python and adding changelog.
ryanskeith Oct 24, 2025
5be0840
Forgot to add pyproject.toml.
ryanskeith Oct 24, 2025
ae6a43b
Updating flake8 to align with black.
ryanskeith Oct 24, 2025
4d12573
Adding changes that were not saved to file for the changelog.
ryanskeith Oct 24, 2025
3e4cc94
Merge branch 'main' into new_release_and_setup_tooling_update
ryanskeith Nov 3, 2025
9ce26cb
updating meta.yml in sample recipe.
ryanskeith Dec 9, 2025
76c1f4d
Assure we have conda in the testbed.
ryanskeith Dec 9, 2025
2a7aff2
Adding in TOS acceptance.
ryanskeith Dec 9, 2025
b8127e1
Modifying it again to see if we can get the CI working.
ryanskeith Dec 9, 2025
d787093
Adding default value of 0.9.0
ryanskeith Dec 9, 2025
bd86cd1
Leaving in packages for test to avoid warning.
ryanskeith Dec 10, 2025
b3fe3b8
We don't need to purge packages. This should speed things up.
ryanskeith Dec 10, 2025
5b6ce07
Augmenting tests.
ryanskeith Dec 10, 2025
750a2df
As MacOS tests pass, changing CONDA_PKGS_DIRS on the other two OS's t…
ryanskeith Dec 15, 2025
1e58bf1
tweaking set up a little more.
ryanskeith Dec 15, 2025
7653f03
Bypassing warnings for now.
ryanskeith Dec 15, 2025
f426b93
Missed the second assert in test.
ryanskeith Dec 15, 2025
0798224
Reverting to main as the problem is in the setup.
ryanskeith Dec 17, 2025
f51bce6
Fixing pyproect.toml.
ryanskeith Dec 17, 2025
5f30615
Trying to save the and use the testbed cache.
ryanskeith Dec 18, 2025
7321e2f
Reviewer feedback edits. Moving env to workflow level and removing u…
ryanskeith Dec 18, 2025
6059a6e
Small cleanup to not have to make a lint exception plus better way to…
ryanskeith Dec 18, 2025
dc92078
Adding in suggestion to improve the conda package version to be dynamic.
ryanskeith Dec 18, 2025
e249923
Update Changelog.md
ryanskeith Jan 5, 2026
73b4a01
Move flake8 config to .flake8
xhochy Jan 22, 2026
fd1d8fe
Fix CONDA_PKGS_DIRS handling for multiple directories in setup_envs.sh
xhochy Jan 22, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[flake8]
max-line-length = 100
17 changes: 14 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
pull_request:
branches:
- main

env:
CONDA_PLUGINS_AUTO_ACCEPT_TOS: yes
concurrency:
# Concurrency group that uses the workflow name and PR number if available
# or commit SHA as a fallback. If a new build is triggered under that
Expand Down Expand Up @@ -60,14 +61,18 @@ jobs:
- name: Retrieve the source code
uses: actions/checkout@v5
- uses: conda-incubator/setup-miniconda@v3.2.0
if: matrix.os == 'macos-14'
with:
auto-update-conda: true
python-version: '3.9'
- id: conda-root
name: Set CONDA_ROOT
run: |
CONDA_ROOT=$(dirname $GITHUB_WORKSPACE)/conda
echo "value=$(dirname $GITHUB_WORKSPACE)/conda" >> $GITHUB_OUTPUT
echo "CONDA_ROOT=$CONDA_ROOT" >> $GITHUB_ENV
echo "CONDA_PKGS_DIRS=$CONDA_ROOT/pkgs" >> $GITHUB_ENV
echo "CONDA_ROOT: $CONDA_ROOT"
echo "CONDA_PKGS_DIRS: $CONDA_ROOT/pkgs"
# Use a smaller cache entry to enable a quicker exit if we
# have already built the testbed. Any small file will do
- id: cache-key
Expand All @@ -84,7 +89,11 @@ jobs:
key: testbed-${{ matrix.os }}-${{ hashFiles('testing') }}-5
- name: Verify or create the testbed
if: steps.cache-key.outputs.cache-hit != 'true'
run: testing/setup_envs.sh purge-packages
run: |
source $CONDA/etc/profile.d/conda.sh
conda config --add channels conda-forge
export CONDA_EXE=$CONDA/bin/conda
testing/setup_envs.sh
tests:
defaults:
run:
Expand Down Expand Up @@ -113,7 +122,9 @@ jobs:
CONDA_ROOT=$(dirname $GITHUB_WORKSPACE)/conda
echo "value=$(dirname $GITHUB_WORKSPACE)/conda" >> $GITHUB_OUTPUT
echo "CONDA_ROOT=$CONDA_ROOT" >> $GITHUB_ENV
echo "CONDA_PKGS_DIRS=$CONDA_ROOT/pkgs" >> $GITHUB_ENV
echo "CONDA_ROOT: $CONDA_ROOT"
echo "CONDA_PKGS_DIRS: $CONDA_ROOT/pkgs"
- name: Retrieve the testbed cache
uses: actions/cache@v4
with:
Expand Down
27 changes: 27 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
## 0.9.0 (2026-01-05)

### Enhancements

* Replaced deprecated `pkg_resources` with `importlib.resources`. (#391 via #424)
* Add Simple Contribution Guide. (#416 via #415)
* Add optional progress bar to conda-unpack for better user feedback (#430)

### Bug fixes

* Fix issue with extended path format on Windows. (#398 via #432)
* Fix executables for all users. (#355 via #438)

### Other

* Update Python supported versions. (#414 via #417)
* Various dependency updates and CI improvements (#418 via #419, #420)

### Contributors

* @AidanShipperley
* @Dave-Karetnyk-TFS
* @ryanskeith
* @tan-i-ham
* @xhochy


# 0.8.1 (2024-11-15)

## What's Changed
Expand Down
8 changes: 0 additions & 8 deletions MANIFEST.in

This file was deleted.

7 changes: 5 additions & 2 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% set data = load_setup_py_data() %}
{% set version_base = environ.get("VERSION_OVERRIDE") or GIT_DESCRIBE_TAG %}

package:
name: conda-pack
version: {{ data.get('version').lstrip('v') }}
version: {{ version_base }}.{{ GIT_DESCRIBE_NUMBER }}+{{ GIT_DESCRIBE_HASH }}

source:
path: ../
Expand All @@ -19,6 +19,9 @@ requirements:
host:
- python >=3.9
- pip
- setuptools >=61.0
- wheel
- setuptools-scm >=6.2
run:
- python >=3.9
- setuptools
Expand Down
12 changes: 9 additions & 3 deletions conda_pack/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
from . import _version
from .core import CondaEnv, CondaPackException, File, pack
from importlib.metadata import version

__version__ = _version.get_versions()['version']
__version__ = version("conda-pack")

from .core import CondaEnv as CondaEnv
from .core import CondaPackException as CondaPackException
from .core import File as File
from .core import pack as pack

__all__ = ["CondaEnv", "CondaPackException", "File", "pack"]
Loading
Loading