Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
26 changes: 13 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,44 +40,44 @@ jobs:
include:
# UBUNTU
- os: ubuntu-latest
python-version: "3.9"
python-version: "3.10"
conda-standalone: conda-standalone
- os: ubuntu-latest
python-version: "3.10"
python-version: "3.11"
conda-standalone: conda-standalone-nightly
- os: ubuntu-latest
python-version: "3.11"
python-version: "3.12"
conda-standalone: micromamba
- os: ubuntu-latest
python-version: "3.12"
python-version: "3.13"
conda-standalone: conda-standalone-onedir
check-docs-schema: true
# MACOS
- os: macos-15-intel
python-version: "3.9"
python-version: "3.10"
conda-standalone: conda-standalone-nightly
- os: macos-15-intel
python-version: "3.10"
python-version: "3.11"
conda-standalone: conda-standalone-onedir
- os: macos-latest
python-version: "3.11"
python-version: "3.12"
conda-standalone: conda-standalone
- os: macos-latest
python-version: "3.12"
python-version: "3.13"
conda-standalone: micromamba
# WINDOWS
- os: windows-2022
python-version: "3.9"
python-version: "3.10"
conda-standalone: conda-standalone-nightly
- os: windows-2022
python-version: "3.10"
python-version: "3.11"
conda-standalone: conda-standalone
- os: windows-2022
python-version: "3.11"
python-version: "3.12"
# conda-standalone: micromamba
conda-standalone: conda-standalone-nightly
- os: windows-2022
python-version: "3.12"
python-version: "3.13"
# conda-standalone: micromamba
conda-standalone: conda-standalone-onedir

Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
python constructor/_schema.py
git diff --exit-code
- name: Upload the example installers as artifacts
if: github.event_name == 'pull_request' && matrix.python-version == '3.9'
if: github.event_name == 'pull_request' && matrix.python-version == '3.10'
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
with:
name: installers-${{ runner.os }}-${{ github.sha }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
Expand Down
14 changes: 7 additions & 7 deletions constructor/_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,13 @@ class LicensesBuildOutput(BaseModel):
licenses: _LicensesBuildOutputOptions


BuildOutputConfigs: TypeAlias = Union[
HashBuildOutput,
InfoJsonBuildOutput,
PkgsListBuildOutput,
LockfileBuildOutput,
LicensesBuildOutput,
]
BuildOutputConfigs: TypeAlias = (
HashBuildOutput
| InfoJsonBuildOutput
| PkgsListBuildOutput
| LockfileBuildOutput
| LicensesBuildOutput
)


class ConstructorConfiguration(BaseModel):
Expand Down
10 changes: 5 additions & 5 deletions examples/extra_envs/construct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ installer_type: all
channels:
- https://conda.anaconda.org/conda-forge
specs:
- python=3.9
- python=3.10
- conda # conda is required for extra_envs
- miniforge_console_shortcut 1.* # [win]
exclude: # [unix]
- tk # [unix]
extra_envs:
py310:
py311:
specs:
- python=3.10
- python=3.11
- pip
channels:
- conda-forge
Expand All @@ -33,10 +33,10 @@ build_outputs:
- info.json
- pkgs_list
- pkgs_list:
env: py310
env: py311
- lockfile
- lockfile:
env: py310
env: py311
- licenses:
include_text: True
text_errors: replace
Expand Down
10 changes: 5 additions & 5 deletions examples/extra_envs/test_install.bat
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
echo Added by test-install script > "%PREFIX%\test_install_sentinel.txt"

:: base env has python 3.9
:: base env has python 3.10
if not exist "%PREFIX%\conda-meta\history" exit 1
"%PREFIX%\python.exe" -c "from sys import version_info; assert version_info[:2] == (3, 9)" || goto :error
"%PREFIX%\python.exe" -c "from sys import version_info; assert version_info[:2] == (3, 10)" || goto :error

:: extra env named 'py310' has python 3.10
if not exist "%PREFIX%\envs\py310\conda-meta\history" exit 1
"%PREFIX%\envs\py310\python.exe" -c "from sys import version_info; assert version_info[:2] == (3, 10)" || goto :error
:: extra env named 'py311' has python 3.11
if not exist "%PREFIX%\envs\py311\conda-meta\history" exit 1
"%PREFIX%\envs\py311\python.exe" -c "from sys import version_info; assert version_info[:2] == (3, 11)" || goto :error

:: extra env named 'dav1d' only contains dav1d, no python
if not exist "%PREFIX%\envs\dav1d\conda-meta\history" exit 1
Expand Down
14 changes: 7 additions & 7 deletions examples/extra_envs/test_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ set -euxo pipefail
echo "Added by test-install script" > "$PREFIX/test_install_sentinel.txt"

# tests
# base environment uses python 3.9 and excludes tk
# base environment uses python 3.10 and excludes tk
test -f "$PREFIX/conda-meta/history"
"$PREFIX/bin/python" -c "from sys import version_info; assert version_info[:2] == (3, 9)"
"$PREFIX/bin/python" -c "from sys import version_info; assert version_info[:2] == (3, 10)"
# we use python -m pip instead of the pip entry point
# because the spaces break the shebang - this will be fixed
# with a new conda release, but for now this is the workaround
Expand All @@ -16,12 +16,12 @@ test -f "$PREFIX/conda-meta/history"
"$PREFIX/bin/python" -m conda list -p "$PREFIX" | jq -e '.[] | select(.name == "tk")' && exit 1
echo "Previous test failed as expected"

# extra env named 'py310' uses python 3.10, has tk, but we removed setuptools
test -f "$PREFIX/envs/py310/conda-meta/history"
"$PREFIX/envs/py310/bin/python" -c "from sys import version_info; assert version_info[:2] == (3, 10)"
# extra env named 'py311' uses python 3.11, has tk, but we removed setuptools
test -f "$PREFIX/envs/py311/conda-meta/history"
"$PREFIX/envs/py311/bin/python" -c "from sys import version_info; assert version_info[:2] == (3, 11)"
# setuptools shouldn't be listed by conda!
"$PREFIX/bin/python" -m conda list -p "$PREFIX/envs/py310" | jq -e '.[] | select(.name == "setuptools")' && exit 1
"$PREFIX/envs/py310/bin/python" -c "import setuptools" && exit 1
"$PREFIX/bin/python" -m conda list -p "$PREFIX/envs/py311" | jq -e '.[] | select(.name == "setuptools")' && exit 1
"$PREFIX/envs/py311/bin/python" -c "import setuptools" && exit 1
echo "Previous test failed as expected"

# this env only contains dav1d, no python; it should have been created with no errors,
Expand Down
2 changes: 1 addition & 1 deletion examples/from_env_yaml/env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ name: testenv
channels:
- defaults
dependencies:
- python=3.9
- python=3.10
- conda=23.3
19 changes: 0 additions & 19 deletions examples/from_explicit/explicit_osx-arm64.txt

This file was deleted.

66 changes: 0 additions & 66 deletions examples/grin/construct.yaml

This file was deleted.

24 changes: 0 additions & 24 deletions examples/grin/eula.txt

This file was deleted.

4 changes: 0 additions & 4 deletions examples/grin/goodbye.sh

This file was deleted.

5 changes: 0 additions & 5 deletions examples/grin/hello.sh

This file was deleted.

17 changes: 0 additions & 17 deletions examples/grin/pkgs.txt

This file was deleted.

1 change: 0 additions & 1 deletion examples/grin/test-post.bat

This file was deleted.

24 changes: 0 additions & 24 deletions examples/jetsonconda/EULA.txt

This file was deleted.

33 changes: 0 additions & 33 deletions examples/jetsonconda/README.md

This file was deleted.

Binary file removed examples/jetsonconda/bird.png
Binary file not shown.
23 changes: 0 additions & 23 deletions examples/jetsonconda/construct.yaml

This file was deleted.

Loading
Loading