Skip to content

Commit

Permalink
Merge pull request #149 from isuruf/update
Browse files Browse the repository at this point in the history
Update default python version
  • Loading branch information
isuruf authored Apr 25, 2021
2 parents aee89b1 + 8628975 commit 948c6ad
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
9 changes: 4 additions & 5 deletions Miniforge3/construct.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = os.environ.get("MINIFORGE_VERSION", "4.9.2-0") %}
{% set version = os.environ.get("MINIFORGE_VERSION", "4.10.1-0") %}
{% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %}

name: {{ name }}
Expand All @@ -19,14 +19,13 @@ license_file: ../LICENSE

specs:
{% if name.endswith("pypy3") %}
- python 3.6.* *_pypy
- python 3.7.* *_pypy
{% else %}
- python 3.8.* # [not (osx and arm64)]
- python 3.9.* # [osx and arm64]
- python 3.9.*
{% endif %}

{% if name.startswith("Mambaforge") %}
- mamba 0.11.1
- mamba 0.11.3
{% endif %}
- conda {{ version.split("-")[0] }}

Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Miniforge installers are available here: https://github.com/conda-forge/miniforg

#### Miniforge3

Latest installers with Python 3.8 `(*)` in the base environment:
Latest installers with Python 3.9 `(*)` in the base environment:

| OS | Architecture | Download |
| --------|-----------------------|-----------|
Expand All @@ -25,14 +25,13 @@ Latest installers with Python 3.8 `(*)` in the base environment:
| OS X | arm64 (Apple Silicon) `(**)` | [Miniforge3-MacOSX-arm64](https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-arm64.sh) |
| Windows | x86_64 | [Miniforge3-Windows-x86_64](https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe) |

`(*)` OS X `arm64` will be installed with Python 3.9.
The Python version is specific only to the base environment. Conda can create new environments with different Python versions and implementations.
`(*)` The Python version is specific only to the base environment. Conda can create new environments with different Python versions and implementations.

`(**)` Apple silicon builds are experimental and haven't had testing like the other platforms.

#### Miniforge-pypy3

Latest installers with PyPy 3.6 in the base environment:
Latest installers with PyPy 3.7 in the base environment:

| OS | Architecture | Download |
| --------|-----------------------|-----------|
Expand All @@ -57,7 +56,7 @@ Latest installers with Mamba in the base environment:

#### Mambaforge-pypy3

Latest installers with Mamba and PyPy 3.6 in the base environment:
Latest installers with Mamba and PyPy 3.7 in the base environment:

| OS | Architecture | Download |
| --------|-----------------------|-----------|
Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
elif [[ "$(uname)" == MINGW* ]]; then
conda install -y "nsis=3.01" -c conda-forge -c defaults --override-channels
fi
pip install git+git://github.com/conda/constructor@8c0121d3b81846de42973b52f13135f0ffeaddda#egg=constructor --force --no-deps
pip install git+git://github.com/conda/constructor@3.2.1#egg=constructor --force --no-deps
conda list

echo "***** Make temp directory *****"
Expand Down

0 comments on commit 948c6ad

Please sign in to comment.