Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to conda 23.10.0, conda-libmamba-solver 23.11.0, libmambapy 1.5.3 and constructor 3.5.0 #48

Merged
merged 5 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@ Remember to update the hyperlinks at the bottom.

[//]: # (current developments)

## 23.10.0 (2023-11-14)

### Enhancements

* Update to `conda` 23.10.0, `conda-libmamba-solver` 23.11.0, `libmambapy` 1.5.3 and `constructor` 3.5.0 (#48)

### Contributors

* @jaimergp



## 23.9.0 (2023-10-04)

### Enhancements
Expand Down
12 changes: 6 additions & 6 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% set conda_version = "23.9.0" %}
{% set conda_libmamba_solver_version = "23.9.1" %}
{% set libmambapy_version = "1.5.1" %}
{% set constructor_version = "3.4.5" %}
{% set conda_version = "23.10.0" %}
{% set conda_libmamba_solver_version = "23.11.0" %}
{% set libmambapy_version = "1.5.3" %}
{% set constructor_version = "3.5.0" %}
{% set python_version = "3.9.15" %}
{% set pyver = "".join(python_version.split(".")[:2]) %}

Expand All @@ -12,15 +12,15 @@ package:
source:
- path: ../
- url: https://github.com/conda/conda/archive/{{ conda_version }}.tar.gz
sha256: 423aaa6f4af0b04c2608b63230ccdf60012896e7888ad0ddba06ab197ec44014
sha256: 273d49db8ea723426b87866381daf2df27c7bca2c3474196460d637b62de2a1c
folder: conda_src
patches:
- ../src/conda_patches/0001-Rename-and-replace-entrypoint-stub-exe.patch
- ../src/conda_patches/0002-Manipulate-PATH-directly-instead-of-_call_ing-conda.patch
- ../src/conda_patches/0003-Return-unknown-module-in-deprecations.patch

- url: https://github.com/conda/constructor/archive/{{ constructor_version }}.tar.gz # [win]
sha256: 8483b2b4a4d136ce7d750a3f0d6eb964d5e6295436fab74c7d855ca70f9b6c33 # [win]
sha256: 787ffd85e9414bdf70fe531f01eab3987a040e3f6a6ac3a01409f4d332f7de9e # [win]
folder: constructor_src # [win]

build:
Expand Down
26 changes: 23 additions & 3 deletions src/conda.exe.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# -*- mode: python ; coding: utf-8 -*-
import os
import site
import sys

# __file__ is not defined in the pyinstaller context,
Expand All @@ -12,12 +13,31 @@ else:
HERE = os.path.join(os.path.getcwd(), "src")

block_cipher = None
sitepackages = os.environ.get(
"SP_DIR", # site-packages in conda-build's host environment
# if not defined, get running Python's site-packages
# Windows puts sys.prefix in this list first
next(
path for path in site.getsitepackages()
if path.endswith("site-packages")
)
)


extra_exe_kwargs = {}
datas = []
datas = [
(os.path.join(sitepackages, 'archspec', 'json', 'COPYRIGHT'), 'archspec/json'),
(os.path.join(sitepackages, 'archspec', 'json', 'NOTICE'), 'archspec/json'),
(os.path.join(sitepackages, 'archspec', 'json', 'LICENSE-APACHE'), 'archspec/json'),
(os.path.join(sitepackages, 'archspec', 'json', 'LICENSE-MIT'), 'archspec/json'),
(os.path.join(sitepackages, 'archspec', 'json', 'cpu', 'microarchitectures.json'), 'archspec/json/cpu'),
(os.path.join(sitepackages, 'archspec', 'json', 'cpu', 'microarchitectures_schema.json'), 'archspec/json/cpu'),
]
if sys.platform == "win32":
datas = [(os.path.join(os.getcwd(), 'constructor_src', 'constructor', 'nsis', '_nsis.py'), 'Lib'),
(os.path.join(os.getcwd(), 'entry_point_base.exe'), '.')]
datas += [
(os.path.join(os.getcwd(), 'constructor_src', 'constructor', 'nsis', '_nsis.py'), 'Lib'),
(os.path.join(os.getcwd(), 'entry_point_base.exe'), '.')]

elif sys.platform == "darwin":
extra_exe_kwargs["entitlements_file"] = os.path.join(HERE, "entitlements.plist")

Expand Down
Loading