From a6618e0981960ffb5065710efbef4e8fdbad092a Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 16 May 2024 09:00:55 +0200 Subject: [PATCH 01/81] biogeme for conda-forge --- recipes/biogeme-optimization/meta.yaml | 44 ++++++++++++++++++++++ recipes/biogeme/meta.yaml | 49 +++++++++++++++++++++++++ recipes/cythonbiogeme/meta.yaml | 51 ++++++++++++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 recipes/biogeme-optimization/meta.yaml create mode 100644 recipes/biogeme/meta.yaml create mode 100644 recipes/cythonbiogeme/meta.yaml diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml new file mode 100644 index 0000000000000..8495f701ea13b --- /dev/null +++ b/recipes/biogeme-optimization/meta.yaml @@ -0,0 +1,44 @@ +{% set name = "biogeme-optimization" %} +{% set version = "0.0.6" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme-optimization-{{ version }}.tar.gz + sha256: ad195d3ad6841d99ad8c53b118468ad7553b9a31d95d80b26614a87644c7d8d9 + +build: + noarch: python + script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + number: 0 + +requirements: + host: + - python >=3.7 + - pip + run: + - python >=3.7 + - numpy >=1.24.2 + - scipy >=1.10.1 + - matplotlib-base >=3.8.2 + +test: + imports: + - biogeme_optimization + commands: + - pip check + requires: + - pip + +about: + home: http://biogeme.epfl.ch + summary: Various optimization algorithms for teaching and research + license: MIT + license_family: MIT + license_file: LICENSE.txt + +extra: + recipe-maintainers: + - sandervancranenburgh diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml new file mode 100644 index 0000000000000..dbae9287d493d --- /dev/null +++ b/recipes/biogeme/meta.yaml @@ -0,0 +1,49 @@ +{% set name = "biogeme" %} +{% set version = "3.2.13" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme-{{ version }}.tar.gz + sha256: aa3aaa4d32e37fd98b4b23d0630259e07d4645e7ce42c28d57a96c1b4297acc7 + +build: + noarch: python + script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + number: 0 + +requirements: + host: + - python >=3.7 + - setuptools >=63.4.1 + - wheel + - pip + run: + - python >=3.7 + - pandas >=1.3.5 + - scipy >=1.7.3 + - tqdm >=4.64.1 + - tomlkit >=0.11.5 + - cythonbiogeme ==1.0.2 + - biogeme-optimization ==0.0.5 + +test: + imports: + - biogeme + commands: + - pip check + requires: + - pip + +about: + home: http://biogeme.epfl.ch + summary: Estimation and application of discrete choice models + license: MIT + license_family: MIT + license_file: LICENSE.txt + +extra: + recipe-maintainers: + - sandervancranenburgh diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml new file mode 100644 index 0000000000000..5e1527f89017f --- /dev/null +++ b/recipes/cythonbiogeme/meta.yaml @@ -0,0 +1,51 @@ +{% set name = "cythonbiogeme" %} +{% set version = "1.0.2" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/cythonbiogeme-{{ version }}.tar.gz + sha256: f139342944c849b47ce5aaa548e68aa179c195de93ab76be78353f4309684d0e + +build: + script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + number: 0 + +requirements: + build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} + - {{ stdlib("c") }} + host: + - python + - setuptools >=63.4.1 + - wheel + - numpy >=1.19.0 + - cython + - pip + run: + - python + - cython >=0.29.16 + - pandas >=1.3.5 + - {{ pin_compatible('numpy') }} + +test: + imports: + - cythonbiogeme + commands: + - pip check + requires: + - pip + +about: + home: http://biogeme.epfl.ch + summary: C++ part of the Biogeme package + license: MIT + license_family: MIT + license_file: LICENSE.txt + +extra: + recipe-maintainers: + - sandervancranenburgh From 63659a1a3945d3ca8dfa503a57306e200eead840 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 16 May 2024 09:15:40 +0200 Subject: [PATCH 02/81] biogeme for conda-forge --- recipes/biogeme-optimization/meta.yaml | 2 +- recipes/biogeme/meta.yaml | 2 +- recipes/cythonbiogeme/meta.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 8495f701ea13b..7d503ceb381ff 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -41,4 +41,4 @@ about: extra: recipe-maintainers: - - sandervancranenburgh + - FGarridoV diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index dbae9287d493d..e6cefd0870945 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -46,4 +46,4 @@ about: extra: recipe-maintainers: - - sandervancranenburgh + - FGarridoV diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index 5e1527f89017f..284c4814ddb33 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -48,4 +48,4 @@ about: extra: recipe-maintainers: - - sandervancranenburgh + - FGarridoV From 42135ffbea7936d89b7c7bd12679d71b1fba8a33 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 21 May 2024 08:35:48 +0200 Subject: [PATCH 03/81] updated cythonbiogeme --- recipes/cythonbiogeme/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index 284c4814ddb33..03ed5c59557d5 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -10,7 +10,7 @@ source: sha256: f139342944c849b47ce5aaa548e68aa179c195de93ab76be78353f4309684d0e build: - script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + script: "{{ PYTHON }} -m pip install cythonbiogeme=={{ version }} -vv --no-deps" number: 0 requirements: From 28e80ac8fdecbd5d9bb565e32aa413c1378601ff Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 21 May 2024 08:48:57 +0200 Subject: [PATCH 04/81] updated cythonbiogeme v2 --- recipes/cythonbiogeme/meta.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index 03ed5c59557d5..8eb06ad0205c2 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -10,7 +10,12 @@ source: sha256: f139342944c849b47ce5aaa548e68aa179c195de93ab76be78353f4309684d0e build: - script: "{{ PYTHON }} -m pip install cythonbiogeme=={{ version }} -vv --no-deps" + script: > + if [[ "{{ win }}" == "True" || "{{ osx }}" == "True" ]]; then + {{ PYTHON }} -m pip install cythonbiogeme=={{ version }} --only-binary=:all: -vv --no-deps + else + {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + fi number: 0 requirements: From f780af292218e38902b0852698879bcfd654c498 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 21 May 2024 09:00:00 +0200 Subject: [PATCH 05/81] new test --- recipes/biogeme-optimization/meta.yaml | 44 -------------------- recipes/cythonbiogeme/meta.yaml | 56 -------------------------- 2 files changed, 100 deletions(-) delete mode 100644 recipes/biogeme-optimization/meta.yaml delete mode 100644 recipes/cythonbiogeme/meta.yaml diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml deleted file mode 100644 index 7d503ceb381ff..0000000000000 --- a/recipes/biogeme-optimization/meta.yaml +++ /dev/null @@ -1,44 +0,0 @@ -{% set name = "biogeme-optimization" %} -{% set version = "0.0.6" %} - -package: - name: {{ name|lower }} - version: {{ version }} - -source: - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme-optimization-{{ version }}.tar.gz - sha256: ad195d3ad6841d99ad8c53b118468ad7553b9a31d95d80b26614a87644c7d8d9 - -build: - noarch: python - script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation - number: 0 - -requirements: - host: - - python >=3.7 - - pip - run: - - python >=3.7 - - numpy >=1.24.2 - - scipy >=1.10.1 - - matplotlib-base >=3.8.2 - -test: - imports: - - biogeme_optimization - commands: - - pip check - requires: - - pip - -about: - home: http://biogeme.epfl.ch - summary: Various optimization algorithms for teaching and research - license: MIT - license_family: MIT - license_file: LICENSE.txt - -extra: - recipe-maintainers: - - FGarridoV diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml deleted file mode 100644 index 8eb06ad0205c2..0000000000000 --- a/recipes/cythonbiogeme/meta.yaml +++ /dev/null @@ -1,56 +0,0 @@ -{% set name = "cythonbiogeme" %} -{% set version = "1.0.2" %} - -package: - name: {{ name|lower }} - version: {{ version }} - -source: - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/cythonbiogeme-{{ version }}.tar.gz - sha256: f139342944c849b47ce5aaa548e68aa179c195de93ab76be78353f4309684d0e - -build: - script: > - if [[ "{{ win }}" == "True" || "{{ osx }}" == "True" ]]; then - {{ PYTHON }} -m pip install cythonbiogeme=={{ version }} --only-binary=:all: -vv --no-deps - else - {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation - fi - number: 0 - -requirements: - build: - - {{ compiler('c') }} - - {{ compiler('cxx') }} - - {{ stdlib("c") }} - host: - - python - - setuptools >=63.4.1 - - wheel - - numpy >=1.19.0 - - cython - - pip - run: - - python - - cython >=0.29.16 - - pandas >=1.3.5 - - {{ pin_compatible('numpy') }} - -test: - imports: - - cythonbiogeme - commands: - - pip check - requires: - - pip - -about: - home: http://biogeme.epfl.ch - summary: C++ part of the Biogeme package - license: MIT - license_family: MIT - license_file: LICENSE.txt - -extra: - recipe-maintainers: - - FGarridoV From beb61a0e4c62f4305c455b79cfb62964ddf9fded Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 21 May 2024 09:17:08 +0200 Subject: [PATCH 06/81] biogeme v3 --- recipes/biogeme-optimization/meta.yaml | 44 ++++++++++++++++++++++ recipes/cythonbiogeme/meta.yaml | 52 ++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 recipes/biogeme-optimization/meta.yaml create mode 100644 recipes/cythonbiogeme/meta.yaml diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml new file mode 100644 index 0000000000000..b1ec282706697 --- /dev/null +++ b/recipes/biogeme-optimization/meta.yaml @@ -0,0 +1,44 @@ +{% set name = "biogeme-optimization" %} +{% set version = "0.0.6" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme-optimization-{{ version }}.tar.gz + sha256: ad195d3ad6841d99ad8c53b118468ad7553b9a31d95d80b26614a87644c7d8d9 + +build: + noarch: python + script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + number: 0 + +requirements: + host: + - python >=3.7 + - pip + run: + - python >=3.7 + - numpy >=1.24.2 + - scipy >=1.10.1 + - matplotlib-base >=3.8.2 + +test: + imports: + - biogeme_optimization + commands: + - pip check + requires: + - pip + +about: + home: http://biogeme.epfl.ch + summary: Various optimization algorithms for teaching and research + license: MIT + license_family: MIT + license_file: LICENSE.txt + +extra: + recipe-maintainers: + - FGarridoV \ No newline at end of file diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml new file mode 100644 index 0000000000000..cf851b2a6567b --- /dev/null +++ b/recipes/cythonbiogeme/meta.yaml @@ -0,0 +1,52 @@ +{% set name = "cythonbiogeme" %} +{% set version = "1.0.2" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/cythonbiogeme-{{ version }}.tar.gz + sha256: f139342944c849b47ce5aaa548e68aa179c195de93ab76be78353f4309684d0e + +build: + number: 3 + script: /bin/rm -f pyproject.toml && {{ PYTHON }} -m pip install . -vv # [unix] + skip: true # [python_impl == 'pypy'] + +requirements: + build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} + - {{ stdlib("c") }} + host: + - python + - setuptools >=63.4.1 + - wheel + - numpy >=1.19.0 + - cython + - pip + run: + - python + - cython >=0.29.16 + - pandas >=1.3.5 + - {{ pin_compatible('numpy') }} + +test: + imports: + - cythonbiogeme + commands: + - pip check + requires: + - pip + +about: + home: http://biogeme.epfl.ch + summary: C++ part of the Biogeme package + license: MIT + license_family: MIT + license_file: LICENSE.txt + +extra: + recipe-maintainers: + - FGarridoV \ No newline at end of file From f157eb32651e141414024303ab755cba977a5575 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 21 May 2024 09:28:44 +0200 Subject: [PATCH 07/81] tester v3 --- recipes/biogeme/meta.yaml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index e6cefd0870945..b1ec282706697 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -1,13 +1,13 @@ -{% set name = "biogeme" %} -{% set version = "3.2.13" %} +{% set name = "biogeme-optimization" %} +{% set version = "0.0.6" %} package: name: {{ name|lower }} version: {{ version }} source: - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme-{{ version }}.tar.gz - sha256: aa3aaa4d32e37fd98b4b23d0630259e07d4645e7ce42c28d57a96c1b4297acc7 + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme-optimization-{{ version }}.tar.gz + sha256: ad195d3ad6841d99ad8c53b118468ad7553b9a31d95d80b26614a87644c7d8d9 build: noarch: python @@ -17,21 +17,16 @@ build: requirements: host: - python >=3.7 - - setuptools >=63.4.1 - - wheel - pip run: - python >=3.7 - - pandas >=1.3.5 - - scipy >=1.7.3 - - tqdm >=4.64.1 - - tomlkit >=0.11.5 - - cythonbiogeme ==1.0.2 - - biogeme-optimization ==0.0.5 + - numpy >=1.24.2 + - scipy >=1.10.1 + - matplotlib-base >=3.8.2 test: imports: - - biogeme + - biogeme_optimization commands: - pip check requires: @@ -39,11 +34,11 @@ test: about: home: http://biogeme.epfl.ch - summary: Estimation and application of discrete choice models + summary: Various optimization algorithms for teaching and research license: MIT license_family: MIT license_file: LICENSE.txt extra: recipe-maintainers: - - FGarridoV + - FGarridoV \ No newline at end of file From 1d415c47f32bddae1c061e79b9a2b399fcec99c5 Mon Sep 17 00:00:00 2001 From: Francisco Garrido-Valenzuela Date: Tue, 21 May 2024 09:42:04 +0200 Subject: [PATCH 08/81] Update meta.yaml --- recipes/biogeme-optimization/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index b1ec282706697..7d503ceb381ff 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -41,4 +41,4 @@ about: extra: recipe-maintainers: - - FGarridoV \ No newline at end of file + - FGarridoV From a2a77a177e4780a44577e3407ede6b0c8d8bd257 Mon Sep 17 00:00:00 2001 From: Francisco Garrido-Valenzuela Date: Tue, 21 May 2024 09:42:31 +0200 Subject: [PATCH 09/81] Update meta.yaml --- recipes/biogeme/meta.yaml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index b1ec282706697..e6cefd0870945 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -1,13 +1,13 @@ -{% set name = "biogeme-optimization" %} -{% set version = "0.0.6" %} +{% set name = "biogeme" %} +{% set version = "3.2.13" %} package: name: {{ name|lower }} version: {{ version }} source: - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme-optimization-{{ version }}.tar.gz - sha256: ad195d3ad6841d99ad8c53b118468ad7553b9a31d95d80b26614a87644c7d8d9 + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme-{{ version }}.tar.gz + sha256: aa3aaa4d32e37fd98b4b23d0630259e07d4645e7ce42c28d57a96c1b4297acc7 build: noarch: python @@ -17,16 +17,21 @@ build: requirements: host: - python >=3.7 + - setuptools >=63.4.1 + - wheel - pip run: - python >=3.7 - - numpy >=1.24.2 - - scipy >=1.10.1 - - matplotlib-base >=3.8.2 + - pandas >=1.3.5 + - scipy >=1.7.3 + - tqdm >=4.64.1 + - tomlkit >=0.11.5 + - cythonbiogeme ==1.0.2 + - biogeme-optimization ==0.0.5 test: imports: - - biogeme_optimization + - biogeme commands: - pip check requires: @@ -34,11 +39,11 @@ test: about: home: http://biogeme.epfl.ch - summary: Various optimization algorithms for teaching and research + summary: Estimation and application of discrete choice models license: MIT license_family: MIT license_file: LICENSE.txt extra: recipe-maintainers: - - FGarridoV \ No newline at end of file + - FGarridoV From 77bed290d237a79a8416ed7c782d73cb8d661ee2 Mon Sep 17 00:00:00 2001 From: Francisco Garrido-Valenzuela Date: Tue, 21 May 2024 09:43:01 +0200 Subject: [PATCH 10/81] Update meta.yaml --- recipes/cythonbiogeme/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index cf851b2a6567b..ad1880fa7b0c7 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -49,4 +49,4 @@ about: extra: recipe-maintainers: - - FGarridoV \ No newline at end of file + - FGarridoV From 5966602f9b4cf7ac740bedf0a27b927f1b5c6c43 Mon Sep 17 00:00:00 2001 From: Francisco Garrido-Valenzuela Date: Thu, 23 May 2024 15:00:55 +0200 Subject: [PATCH 11/81] Update recipes/biogeme/meta.yaml Co-authored-by: Jason K. Moore --- recipes/biogeme/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index e6cefd0870945..6332ee3c2cefb 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -42,7 +42,7 @@ about: summary: Estimation and application of discrete choice models license: MIT license_family: MIT - license_file: LICENSE.txt + license_file: LICENSE extra: recipe-maintainers: From 0c9193c8d0553c84dbdb175788ce9e83781f7d43 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 23 May 2024 16:30:17 +0200 Subject: [PATCH 12/81] changes proposed by jason --- recipes/biogeme-optimization/meta.yaml | 3 --- recipes/cythonbiogeme/meta.yaml | 7 +++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 7d503ceb381ff..d3e9e43069e3e 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -35,9 +35,6 @@ test: about: home: http://biogeme.epfl.ch summary: Various optimization algorithms for teaching and research - license: MIT - license_family: MIT - license_file: LICENSE.txt extra: recipe-maintainers: diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index ad1880fa7b0c7..b680ac47ba7e3 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -10,9 +10,8 @@ source: sha256: f139342944c849b47ce5aaa548e68aa179c195de93ab76be78353f4309684d0e build: - number: 3 - script: /bin/rm -f pyproject.toml && {{ PYTHON }} -m pip install . -vv # [unix] - skip: true # [python_impl == 'pypy'] + number: 0 + script: {{ PYTHON }} -m pip install . -vv requirements: build: @@ -45,7 +44,7 @@ about: summary: C++ part of the Biogeme package license: MIT license_family: MIT - license_file: LICENSE.txt + license_file: LICENSE extra: recipe-maintainers: From 548702ce35449f0d1cea09e1e0d76d3f26f78ef0 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 23 May 2024 16:35:05 +0200 Subject: [PATCH 13/81] minor change --- recipes/biogeme-optimization/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index d3e9e43069e3e..9e7e1faf30f41 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -35,6 +35,7 @@ test: about: home: http://biogeme.epfl.ch summary: Various optimization algorithms for teaching and research + license: Unlicensed extra: recipe-maintainers: From 940b49f65dcd7f034acb7cc9d903c7a5d16692cf Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 29 May 2024 13:59:51 +0200 Subject: [PATCH 14/81] Adding a pathc for cythonbiogeme --- recipes/cythonbiogeme/meta.yaml | 3 ++- recipes/cythonbiogeme/setup.py.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 recipes/cythonbiogeme/setup.py.patch diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index b680ac47ba7e3..fbfb95ba5ccb6 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -8,7 +8,8 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/cythonbiogeme-{{ version }}.tar.gz sha256: f139342944c849b47ce5aaa548e68aa179c195de93ab76be78353f4309684d0e - + patches: + - setup.py.patch build: number: 0 script: {{ PYTHON }} -m pip install . -vv diff --git a/recipes/cythonbiogeme/setup.py.patch b/recipes/cythonbiogeme/setup.py.patch new file mode 100644 index 0000000000000..bba127a45bf08 --- /dev/null +++ b/recipes/cythonbiogeme/setup.py.patch @@ -0,0 +1,15 @@ +--- setup.py ++++ setup.py +@@ -435,12 +435,4 @@ + raise ValueError('invalid boolean string %r' % value) + + +-if platform.system() == "Darwin": +- os.environ["CC"] = "clang++" +- os.environ["CXX"] = "clang++" +-else: +- os.environ["CC"] = "g++" +- os.environ["CXX"] = "g++" +- +- + setup() \ No newline at end of file From cc80118817940901b5f2a2ccd7bbd45d2165a64d Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 29 May 2024 14:14:45 +0200 Subject: [PATCH 15/81] Adding a pathc for cythonbiogeme v2 --- recipes/cythonbiogeme/setup.py.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/cythonbiogeme/setup.py.patch b/recipes/cythonbiogeme/setup.py.patch index bba127a45bf08..cde45313509aa 100644 --- a/recipes/cythonbiogeme/setup.py.patch +++ b/recipes/cythonbiogeme/setup.py.patch @@ -12,4 +12,4 @@ - os.environ["CXX"] = "g++" - - - setup() \ No newline at end of file + setup() From 2648622e4681638983c9d9a11dc5189aee165d58 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 29 May 2024 14:58:37 +0200 Subject: [PATCH 16/81] Adding a patch for cythonbiogeme v2 --- recipes/cythonbiogeme/meta.yaml | 3 ++- recipes/cythonbiogeme/setup.cfg.patch | 11 +++++++++++ recipes/cythonbiogeme/setup.py.patch | 15 --------------- 3 files changed, 13 insertions(+), 16 deletions(-) create mode 100644 recipes/cythonbiogeme/setup.cfg.patch delete mode 100644 recipes/cythonbiogeme/setup.py.patch diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index fbfb95ba5ccb6..ae694955b79ac 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -9,7 +9,8 @@ source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/cythonbiogeme-{{ version }}.tar.gz sha256: f139342944c849b47ce5aaa548e68aa179c195de93ab76be78353f4309684d0e patches: - - setup.py.patch + - setup.cfg.patch # [win] + build: number: 0 script: {{ PYTHON }} -m pip install . -vv diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch new file mode 100644 index 0000000000000..8ed9763dbb3e7 --- /dev/null +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -0,0 +1,11 @@ +--- setup.cfg ++++ setup.cfg +@@ -108,8 +108,6 @@ + src/cythonbiogeme/cpp/bioGhFunction.cc + include_dirs = eval(__import__('numpy').get_include()) + language = c++ +-extra_compile_args = -std=c++11 +-extra_link_args = -std=c++11 + + [egg_info] + tag_build = diff --git a/recipes/cythonbiogeme/setup.py.patch b/recipes/cythonbiogeme/setup.py.patch deleted file mode 100644 index cde45313509aa..0000000000000 --- a/recipes/cythonbiogeme/setup.py.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- setup.py -+++ setup.py -@@ -435,12 +435,4 @@ - raise ValueError('invalid boolean string %r' % value) - - --if platform.system() == "Darwin": -- os.environ["CC"] = "clang++" -- os.environ["CXX"] = "clang++" --else: -- os.environ["CC"] = "g++" -- os.environ["CXX"] = "g++" -- -- - setup() From 089c7efc45ac0abd9f5a37b591f60f98dde7d536 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 29 May 2024 15:07:47 +0200 Subject: [PATCH 17/81] Adding a patch for cythonbiogeme for win and matching to 0.0.6 --- recipes/biogeme/meta.yaml | 2 +- recipes/cythonbiogeme/meta.yaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 6332ee3c2cefb..60385ab1a7bc0 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -27,7 +27,7 @@ requirements: - tqdm >=4.64.1 - tomlkit >=0.11.5 - cythonbiogeme ==1.0.2 - - biogeme-optimization ==0.0.5 + - biogeme-optimization ==0.0.6 test: imports: diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index ae694955b79ac..89a948e95fe9c 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -8,9 +8,10 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/cythonbiogeme-{{ version }}.tar.gz sha256: f139342944c849b47ce5aaa548e68aa179c195de93ab76be78353f4309684d0e - patches: + +patches: - setup.cfg.patch # [win] - + build: number: 0 script: {{ PYTHON }} -m pip install . -vv From 6e4b39195c7826a47930103d2d768c432dbd125c Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 29 May 2024 15:14:14 +0200 Subject: [PATCH 18/81] Adding a patch for cythonbiogeme for win and matching to 0.0.6 --- recipes/cythonbiogeme/meta.yaml | 2 +- recipes/cythonbiogeme/setup.py.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 recipes/cythonbiogeme/setup.py.patch diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index 89a948e95fe9c..ea94601fcf015 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -9,7 +9,7 @@ source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/cythonbiogeme-{{ version }}.tar.gz sha256: f139342944c849b47ce5aaa548e68aa179c195de93ab76be78353f4309684d0e -patches: + patches: - setup.cfg.patch # [win] build: diff --git a/recipes/cythonbiogeme/setup.py.patch b/recipes/cythonbiogeme/setup.py.patch new file mode 100644 index 0000000000000..cde45313509aa --- /dev/null +++ b/recipes/cythonbiogeme/setup.py.patch @@ -0,0 +1,15 @@ +--- setup.py ++++ setup.py +@@ -435,12 +435,4 @@ + raise ValueError('invalid boolean string %r' % value) + + +-if platform.system() == "Darwin": +- os.environ["CC"] = "clang++" +- os.environ["CXX"] = "clang++" +-else: +- os.environ["CC"] = "g++" +- os.environ["CXX"] = "g++" +- +- + setup() From dce48f75a4212f59975a5a1f96330d3041a0fbae Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 12 Jun 2024 15:39:41 +0200 Subject: [PATCH 19/81] updated patches --- recipes/cythonbiogeme/setup.cfg.patch | 2 +- recipes/cythonbiogeme/setup.py.patch | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index 8ed9763dbb3e7..b3bcaac782f73 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -4,7 +4,7 @@ src/cythonbiogeme/cpp/bioGhFunction.cc include_dirs = eval(__import__('numpy').get_include()) language = c++ --extra_compile_args = -std=c++11 +-extra_compile_args = -std=c++11 -DMS_WIN64 -extra_link_args = -std=c++11 [egg_info] diff --git a/recipes/cythonbiogeme/setup.py.patch b/recipes/cythonbiogeme/setup.py.patch index cde45313509aa..acc2568e9db51 100644 --- a/recipes/cythonbiogeme/setup.py.patch +++ b/recipes/cythonbiogeme/setup.py.patch @@ -10,6 +10,5 @@ -else: - os.environ["CC"] = "g++" - os.environ["CXX"] = "g++" -- -- + setup() From e66ddfffdd511acb4030dbdd73c012f6b06c0f95 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 12 Jun 2024 16:04:19 +0200 Subject: [PATCH 20/81] Updated optimization to 0.0.5 and reverted patch modification --- recipes/biogeme-optimization/meta.yaml | 4 ++-- recipes/biogeme/meta.yaml | 2 +- recipes/cythonbiogeme/setup.cfg.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 9e7e1faf30f41..53ac9f36db767 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -1,5 +1,5 @@ {% set name = "biogeme-optimization" %} -{% set version = "0.0.6" %} +{% set version = "0.0.5" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme-optimization-{{ version }}.tar.gz - sha256: ad195d3ad6841d99ad8c53b118468ad7553b9a31d95d80b26614a87644c7d8d9 + sha256: c202fb1b5eaecffdca04f98201ac39cc813dee2c3bb4c98cf079a868bda1c6bb build: noarch: python diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 60385ab1a7bc0..f0a27e8ae009a 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -27,7 +27,7 @@ requirements: - tqdm >=4.64.1 - tomlkit >=0.11.5 - cythonbiogeme ==1.0.2 - - biogeme-optimization ==0.0.6 + - biogeme-optimization == 0.0.5 test: imports: diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index b3bcaac782f73..8ed9763dbb3e7 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -4,7 +4,7 @@ src/cythonbiogeme/cpp/bioGhFunction.cc include_dirs = eval(__import__('numpy').get_include()) language = c++ --extra_compile_args = -std=c++11 -DMS_WIN64 +-extra_compile_args = -std=c++11 -extra_link_args = -std=c++11 [egg_info] From 2b807c24825c46a11c684a73365367dbc3f0c614 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 12 Jun 2024 16:07:18 +0200 Subject: [PATCH 21/81] Modification of version format --- recipes/biogeme/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index f0a27e8ae009a..6332ee3c2cefb 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -27,7 +27,7 @@ requirements: - tqdm >=4.64.1 - tomlkit >=0.11.5 - cythonbiogeme ==1.0.2 - - biogeme-optimization == 0.0.5 + - biogeme-optimization ==0.0.5 test: imports: From 29dc69d462cc3425ff8b51af75211f9aca2ae3e1 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 12 Jun 2024 16:57:31 +0200 Subject: [PATCH 22/81] updated with the second patch --- recipes/cythonbiogeme/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index ea94601fcf015..a6443a4863c9f 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -11,6 +11,7 @@ source: patches: - setup.cfg.patch # [win] + - setup.py.patch build: number: 0 From 3c3c4229ab5510a51298a4cabffb7fa75ec012ae Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 12 Jun 2024 17:13:41 +0200 Subject: [PATCH 23/81] updated patch --- recipes/cythonbiogeme/setup.py.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/cythonbiogeme/setup.py.patch b/recipes/cythonbiogeme/setup.py.patch index acc2568e9db51..078afae574797 100644 --- a/recipes/cythonbiogeme/setup.py.patch +++ b/recipes/cythonbiogeme/setup.py.patch @@ -10,5 +10,6 @@ -else: - os.environ["CC"] = "g++" - os.environ["CXX"] = "g++" - - setup() +- +- setup() ++ setup() \ No newline at end of file From c69bc8636a6336a15e1263bb247691592f04bd48 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 12 Jun 2024 17:24:25 +0200 Subject: [PATCH 24/81] Reverted patch modification --- recipes/cythonbiogeme/setup.py.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/cythonbiogeme/setup.py.patch b/recipes/cythonbiogeme/setup.py.patch index 078afae574797..bba127a45bf08 100644 --- a/recipes/cythonbiogeme/setup.py.patch +++ b/recipes/cythonbiogeme/setup.py.patch @@ -11,5 +11,5 @@ - os.environ["CC"] = "g++" - os.environ["CXX"] = "g++" - -- setup() -+ setup() \ No newline at end of file +- + setup() \ No newline at end of file From 86cb32446947e0d0651c71acce397f33e43641ce Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 12 Jun 2024 17:27:47 +0200 Subject: [PATCH 25/81] Jason patches (original ones) --- recipes/cythonbiogeme/setup.py.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/cythonbiogeme/setup.py.patch b/recipes/cythonbiogeme/setup.py.patch index bba127a45bf08..cde45313509aa 100644 --- a/recipes/cythonbiogeme/setup.py.patch +++ b/recipes/cythonbiogeme/setup.py.patch @@ -12,4 +12,4 @@ - os.environ["CXX"] = "g++" - - - setup() \ No newline at end of file + setup() From d2271c56e4d606738bf97ee5fb94a3b0ae16a521 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 12 Jun 2024 17:47:42 +0200 Subject: [PATCH 26/81] Updated url of tar for biogeme_optimization --- recipes/biogeme-optimization/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 53ac9f36db767..73443d67dec20 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -6,7 +6,7 @@ package: version: {{ version }} source: - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme-optimization-{{ version }}.tar.gz + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme_optimization-{{ version }}.tar.gz sha256: c202fb1b5eaecffdca04f98201ac39cc813dee2c3bb4c98cf079a868bda1c6bb build: From 9b30c8a74580ede743b633ab18f828cd5127d3d0 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 09:19:31 +0200 Subject: [PATCH 27/81] Adding python 3.12 skip to all recipes --- recipes/biogeme-optimization/meta.yaml | 1 + recipes/biogeme/meta.yaml | 1 + recipes/cythonbiogeme/meta.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 73443d67dec20..184a09aa7dfeb 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -13,6 +13,7 @@ build: noarch: python script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 + skip: True # [py == 312 and osx] requirements: host: diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 6332ee3c2cefb..3014a71b2e1ba 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -13,6 +13,7 @@ build: noarch: python script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 + skip: True # [py == 312 and osx] requirements: host: diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index a6443a4863c9f..f676c5041939f 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -16,6 +16,7 @@ source: build: number: 0 script: {{ PYTHON }} -m pip install . -vv + skip: True # [py == 312 and osx] requirements: build: From 394a2626cb4ca214d17d375e169a68d6fe0f51f3 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 09:21:34 +0200 Subject: [PATCH 28/81] Adding the mingw c compiler --- recipes/cythonbiogeme/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index f676c5041939f..8221e198b2d2a 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -21,8 +21,10 @@ build: requirements: build: - {{ compiler('c') }} - - {{ compiler('cxx') }} + - {{ compiler('cxx') }} # [not win] + - {{ compiler('m2w64_cxx') }} # [win] - {{ stdlib("c") }} + host: - python - setuptools >=63.4.1 From 8e9a1cb56d6956c14970e6f5ee495dcdf320bf4a Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 09:24:16 +0200 Subject: [PATCH 29/81] Updating the patch with no static flags --- recipes/cythonbiogeme/setup.cfg.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index 8ed9763dbb3e7..e7b811c35b16c 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -4,8 +4,8 @@ src/cythonbiogeme/cpp/bioGhFunction.cc include_dirs = eval(__import__('numpy').get_include()) language = c++ --extra_compile_args = -std=c++11 --extra_link_args = -std=c++11 +-extra_compile_args = -std=c++11 -DMS_WIN64 +-extra_link_args = -std=c++11 -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive [egg_info] tag_build = From 8cce67ba9c73e4f5802a8bd6d319e630baff7478 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 09:30:26 +0200 Subject: [PATCH 30/81] removing noarch: python line in build sections --- recipes/biogeme-optimization/meta.yaml | 1 - recipes/biogeme/meta.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 184a09aa7dfeb..e8813e4d0f4bb 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -10,7 +10,6 @@ source: sha256: c202fb1b5eaecffdca04f98201ac39cc813dee2c3bb4c98cf079a868bda1c6bb build: - noarch: python script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 skip: True # [py == 312 and osx] diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 3014a71b2e1ba..1252f9dddc05e 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -10,7 +10,6 @@ source: sha256: aa3aaa4d32e37fd98b4b23d0630259e07d4645e7ce42c28d57a96c1b4297acc7 build: - noarch: python script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 skip: True # [py == 312 and osx] From 98657c09cc579bcaa567c49f3cfff2557f6e495b Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 09:36:50 +0200 Subject: [PATCH 31/81] Reverting deletion of norach and moving the skip to the top --- recipes/biogeme-optimization/meta.yaml | 4 +++- recipes/biogeme/meta.yaml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index e8813e4d0f4bb..8480921e07cbe 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -10,9 +10,11 @@ source: sha256: c202fb1b5eaecffdca04f98201ac39cc813dee2c3bb4c98cf079a868bda1c6bb build: + skip: True # [py == 312 and osx] + noarch: python script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 - skip: True # [py == 312 and osx] + requirements: host: diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 1252f9dddc05e..2dddd4e8395a7 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -10,9 +10,11 @@ source: sha256: aa3aaa4d32e37fd98b4b23d0630259e07d4645e7ce42c28d57a96c1b4297acc7 build: + skip: True # [py == 312 and osx] + noarch: python script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 - skip: True # [py == 312 and osx] + requirements: host: From bd3de4bf539f29f934ab6eb7648b9200bf306ce9 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 09:44:06 +0200 Subject: [PATCH 32/81] Removing again the "noarch: python" line in build and removing python version in requirements --- recipes/biogeme-optimization/meta.yaml | 8 +++----- recipes/biogeme/meta.yaml | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 8480921e07cbe..813aea72a5d9b 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -10,18 +10,16 @@ source: sha256: c202fb1b5eaecffdca04f98201ac39cc813dee2c3bb4c98cf079a868bda1c6bb build: - skip: True # [py == 312 and osx] - noarch: python script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 - + skip: True # [py == 312 and osx] requirements: host: - - python >=3.7 + - python - pip run: - - python >=3.7 + - python - numpy >=1.24.2 - scipy >=1.10.1 - matplotlib-base >=3.8.2 diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 2dddd4e8395a7..4f6278b746deb 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -10,20 +10,18 @@ source: sha256: aa3aaa4d32e37fd98b4b23d0630259e07d4645e7ce42c28d57a96c1b4297acc7 build: - skip: True # [py == 312 and osx] - noarch: python script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 - + skip: True # [py == 312 and osx] requirements: host: - - python >=3.7 + - python - setuptools >=63.4.1 - wheel - pip run: - - python >=3.7 + - python - pandas >=1.3.5 - scipy >=1.7.3 - tqdm >=4.64.1 From 64b8696ab1bd4269a9c9fa2c881e9117eccefd57 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 10:09:28 +0200 Subject: [PATCH 33/81] Removing some flags that mentioned to be static --- recipes/cythonbiogeme/setup.cfg.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index e7b811c35b16c..e4c5c35f14aaf 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -5,7 +5,7 @@ include_dirs = eval(__import__('numpy').get_include()) language = c++ -extra_compile_args = -std=c++11 -DMS_WIN64 --extra_link_args = -std=c++11 -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive +-extra_link_args = -std=c++11 -lpthread -mms-bitfields -mwindows [egg_info] tag_build = From e6cbaa7270351e5aa0947d507cb7aa11ccb18647 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 10:33:47 +0200 Subject: [PATCH 34/81] Reverting the skip 312 for biogeme and opti --- recipes/biogeme-optimization/meta.yaml | 6 +++--- recipes/biogeme/meta.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 813aea72a5d9b..73443d67dec20 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -10,16 +10,16 @@ source: sha256: c202fb1b5eaecffdca04f98201ac39cc813dee2c3bb4c98cf079a868bda1c6bb build: + noarch: python script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 - skip: True # [py == 312 and osx] requirements: host: - - python + - python >=3.7 - pip run: - - python + - python >=3.7 - numpy >=1.24.2 - scipy >=1.10.1 - matplotlib-base >=3.8.2 diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 4f6278b746deb..6332ee3c2cefb 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -10,18 +10,18 @@ source: sha256: aa3aaa4d32e37fd98b4b23d0630259e07d4645e7ce42c28d57a96c1b4297acc7 build: + noarch: python script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 - skip: True # [py == 312 and osx] requirements: host: - - python + - python >=3.7 - setuptools >=63.4.1 - wheel - pip run: - - python + - python >=3.7 - pandas >=1.3.5 - scipy >=1.7.3 - tqdm >=4.64.1 From 1c1032b712c53cff2ee6e916a215c2e1ed0e5f41 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 10:57:24 +0200 Subject: [PATCH 35/81] trying new patch version --- recipes/cythonbiogeme/setup.cfg.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index e4c5c35f14aaf..1634d59815187 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -1,11 +1,12 @@ --- setup.cfg +++ setup.cfg -@@ -108,8 +108,6 @@ - src/cythonbiogeme/cpp/bioGhFunction.cc +@@ -26,8 +26,8 @@ include_dirs = eval(__import__('numpy').get_include()) language = c++ --extra_compile_args = -std=c++11 -DMS_WIN64 --extra_link_args = -std=c++11 -lpthread -mms-bitfields -mwindows - [egg_info] - tag_build = +-extra_compile_args = -std=c++11 +-extra_link_args = -std=c++11 ++extra_compile_args = -std=c++11 -DMS_WIN64 ++extra_link_args = -static -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive + + # For Windows \ No newline at end of file From f47670a940f8775f178618ce966d4ca39b7cc5cd Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 11:12:24 +0200 Subject: [PATCH 36/81] Other try with the patch --- recipes/cythonbiogeme/setup.cfg.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index 1634d59815187..0854282dac018 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -9,4 +9,5 @@ +extra_compile_args = -std=c++11 -DMS_WIN64 +extra_link_args = -static -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive - # For Windows \ No newline at end of file + # For Windows ++ \ No newline at end of file From e41b3f123ae52544b7dddcfe43f64297ff804bf4 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 15:06:38 +0200 Subject: [PATCH 37/81] Trying another patch --- recipes/cythonbiogeme/setup.cfg.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index 0854282dac018..a2d30ac694d36 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -1,13 +1,13 @@ --- setup.cfg +++ setup.cfg -@@ -26,8 +26,8 @@ +@@ -108,8 +108,6 @@ + src/cythonbiogeme/cpp/bioGhFunction.cc include_dirs = eval(__import__('numpy').get_include()) language = c++ - -extra_compile_args = -std=c++11 -extra_link_args = -std=c++11 +extra_compile_args = -std=c++11 -DMS_WIN64 -+extra_link_args = -static -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive ++extra_link_args = -lpthread -mms-bitfields -mwindows -Wl,--whole-archive -Wl,--no-whole-archive - # For Windows -+ \ No newline at end of file + [egg_info] + tag_build = From 139410228920397aea14c9cf8353364864720d1d Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 15:26:47 +0200 Subject: [PATCH 38/81] Reset patch to original --- recipes/cythonbiogeme/setup.cfg.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index a2d30ac694d36..f80ca1b4e22a1 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -6,8 +6,6 @@ language = c++ -extra_compile_args = -std=c++11 -extra_link_args = -std=c++11 -+extra_compile_args = -std=c++11 -DMS_WIN64 -+extra_link_args = -lpthread -mms-bitfields -mwindows -Wl,--whole-archive -Wl,--no-whole-archive [egg_info] - tag_build = + tag_build = \ No newline at end of file From 090e40286eb8617059a5af64eece85f9e7de0436 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 17:25:18 +0200 Subject: [PATCH 39/81] Updating the compilers --- recipes/cythonbiogeme/meta.yaml | 3 ++- recipes/cythonbiogeme/setup.cfg.patch | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index 8221e198b2d2a..590b1fee63870 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -20,7 +20,8 @@ build: requirements: build: - - {{ compiler('c') }} + - {{ compiler('c') }} # [not win] + - {{ compiler('m2w64_c') }} # [win] - {{ compiler('cxx') }} # [not win] - {{ compiler('m2w64_cxx') }} # [win] - {{ stdlib("c") }} diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index f80ca1b4e22a1..8ed9763dbb3e7 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -8,4 +8,4 @@ -extra_link_args = -std=c++11 [egg_info] - tag_build = \ No newline at end of file + tag_build = From c7e47872f00e3076c785caa82abaef2c92a226c2 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 17:45:48 +0200 Subject: [PATCH 40/81] New patch created with diff. --- recipes/cythonbiogeme/setup.cfg.patch | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index 8ed9763dbb3e7..40ffc787a034e 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -1,11 +1,14 @@ --- setup.cfg +++ setup.cfg -@@ -108,8 +108,6 @@ - src/cythonbiogeme/cpp/bioGhFunction.cc +@@ -110,9 +110,7 @@ include_dirs = eval(__import__('numpy').get_include()) language = c++ + -extra_compile_args = -std=c++11 -extra_link_args = -std=c++11 - [egg_info] - tag_build = + # For Windows +-#extra_compile_args = -std=c++11 -DMS_WIN64 +-#extra_link_args = -static -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive ++extra_compile_args = -std=c++11 -DMS_WIN64 ++extra_link_args = -static -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive From 206caa3224d673541f7babe51f95d9b8cae342f7 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 17:57:56 +0200 Subject: [PATCH 41/81] updated compilers --- recipes/cythonbiogeme/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index 590b1fee63870..4b1aff45d95b6 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -24,7 +24,8 @@ requirements: - {{ compiler('m2w64_c') }} # [win] - {{ compiler('cxx') }} # [not win] - {{ compiler('m2w64_cxx') }} # [win] - - {{ stdlib("c") }} + - {{ stdlib("c") }} # [not win] + - {{ stdlib("m2w64_c") }} # [win] host: - python From c5ccae31eabb8f855e16703a14a22f02dbeb18aa Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 18:21:04 +0200 Subject: [PATCH 42/81] another try of setup patch --- recipes/cythonbiogeme/setup.cfg.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index 40ffc787a034e..6c8e167ae1f24 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -1,14 +1,14 @@ ---- setup.cfg -+++ setup.cfg -@@ -110,9 +110,7 @@ +--- setup.cfg.orig 2024-06-13 18:08:57 ++++ setup.cfg 2024-06-13 18:20:30 +@@ -110,9 +110,6 @@ include_dirs = eval(__import__('numpy').get_include()) language = c++ -extra_compile_args = -std=c++11 -extra_link_args = -std=c++11 - +- # For Windows -#extra_compile_args = -std=c++11 -DMS_WIN64 -#extra_link_args = -static -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive +extra_compile_args = -std=c++11 -DMS_WIN64 -+extra_link_args = -static -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive ++extra_link_args = -std=c++11 -lpthread -mms-bitfields -mwindows -Wl,--whole-archive -Wl,--no-whole-archive From b7ee6f5346afa5a90635f46c128e0431bf5e239e Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 13 Jun 2024 19:29:32 +0200 Subject: [PATCH 43/81] another try --- recipes/cythonbiogeme/setup.cfg.patch | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index 6c8e167ae1f24..3bba3d7514433 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -1,5 +1,16 @@ --- setup.cfg.orig 2024-06-13 18:08:57 -+++ setup.cfg 2024-06-13 18:20:30 ++++ setup.cfg 2024-06-13 19:28:51 +@@ -33,8 +33,8 @@ + pandas >= 1.3.5 + + # For Windows +-#[build] +-#compiler=mingw32 ++[build] ++compiler=mingw32 + + + [options.packages.find] @@ -110,9 +110,6 @@ include_dirs = eval(__import__('numpy').get_include()) language = c++ From 98e8d96c827f44d89e6eb005980a02e358b5ce46 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Fri, 14 Jun 2024 16:39:21 +0200 Subject: [PATCH 44/81] New yaml and patch --- recipes/cythonbiogeme/meta.yaml | 2 ++ recipes/cythonbiogeme/setup.cfg.patch | 28 +++++++-------------------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index 4b1aff45d95b6..c16641d299ce3 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -33,10 +33,12 @@ requirements: - wheel - numpy >=1.19.0 - cython + - m2w64-toolchain # [win] - pip run: - python - cython >=0.29.16 + - m2w64-gcc-libs # [win] - pandas >=1.3.5 - {{ pin_compatible('numpy') }} diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index 3bba3d7514433..8ed9763dbb3e7 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -1,25 +1,11 @@ ---- setup.cfg.orig 2024-06-13 18:08:57 -+++ setup.cfg 2024-06-13 19:28:51 -@@ -33,8 +33,8 @@ - pandas >= 1.3.5 - - # For Windows --#[build] --#compiler=mingw32 -+[build] -+compiler=mingw32 - - - [options.packages.find] -@@ -110,9 +110,6 @@ +--- setup.cfg ++++ setup.cfg +@@ -108,8 +108,6 @@ + src/cythonbiogeme/cpp/bioGhFunction.cc include_dirs = eval(__import__('numpy').get_include()) language = c++ - -extra_compile_args = -std=c++11 -extra_link_args = -std=c++11 -- - # For Windows --#extra_compile_args = -std=c++11 -DMS_WIN64 --#extra_link_args = -static -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive -+extra_compile_args = -std=c++11 -DMS_WIN64 -+extra_link_args = -std=c++11 -lpthread -mms-bitfields -mwindows -Wl,--whole-archive -Wl,--no-whole-archive + + [egg_info] + tag_build = From 3fb7332f6510e829b729144bfeac30d0fdc5af0c Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Fri, 14 Jun 2024 16:54:28 +0200 Subject: [PATCH 45/81] new yaml --- recipes/cythonbiogeme/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index c16641d299ce3..a4cabb0f012f6 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -39,6 +39,8 @@ requirements: - python - cython >=0.29.16 - m2w64-gcc-libs # [win] + - {{ native }}gcc-libs # [win] + - {{ native }}libwinpthread-git # [win] - pandas >=1.3.5 - {{ pin_compatible('numpy') }} From a5b888c4ad7f97757eb3d1a9d0497a81e60f3168 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Fri, 14 Jun 2024 17:00:22 +0200 Subject: [PATCH 46/81] new patch for mingw compilation --- recipes/cythonbiogeme/setup.cfg.patch | 28 +++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index 8ed9763dbb3e7..2b842eb92fa16 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -1,11 +1,27 @@ ---- setup.cfg -+++ setup.cfg -@@ -108,8 +108,6 @@ - src/cythonbiogeme/cpp/bioGhFunction.cc +--- setup.cfg.orig 2024-06-13 18:08:57 ++++ setup.cfg 2024-06-14 16:58:24 +@@ -33,8 +33,8 @@ + pandas >= 1.3.5 + + # For Windows +-#[build] +-#compiler=mingw32 ++[build] ++compiler=mingw32 + + + [options.packages.find] +@@ -110,9 +110,9 @@ include_dirs = eval(__import__('numpy').get_include()) language = c++ + -extra_compile_args = -std=c++11 -extra_link_args = -std=c++11 ++#extra_compile_args = -std=c++11 ++#extra_link_args = -std=c++11 - [egg_info] - tag_build = + # For Windows +-#extra_compile_args = -std=c++11 -DMS_WIN64 +-#extra_link_args = -static -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive ++extra_compile_args = -std=c++11 -DMS_WIN64 ++extra_link_args = -std=c++11 -lpthread -mms-bitfields -mwindows From 930d5a6841f73dc6b32d0807615dc8f8005df688 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Thu, 27 Jun 2024 18:08:39 +0200 Subject: [PATCH 47/81] Adding native definition --- recipes/biogeme/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 6332ee3c2cefb..825e2ecb02d95 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -1,5 +1,7 @@ {% set name = "biogeme" %} {% set version = "3.2.13" %} +{% set native = "" %} # Define native as an empty string or appropriate value + package: name: {{ name|lower }} From aad57148666fe5a3319be5df7034c9e5f1dc1ca3 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Fri, 28 Jun 2024 07:37:10 +0200 Subject: [PATCH 48/81] updated --- recipes/biogeme/meta.yaml | 2 -- recipes/cythonbiogeme/meta.yaml | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 825e2ecb02d95..6332ee3c2cefb 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -1,7 +1,5 @@ {% set name = "biogeme" %} {% set version = "3.2.13" %} -{% set native = "" %} # Define native as an empty string or appropriate value - package: name: {{ name|lower }} diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index a4cabb0f012f6..04d99fb7cc594 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -1,5 +1,6 @@ {% set name = "cythonbiogeme" %} {% set version = "1.0.2" %} +{% set native = "" %} # Define native as an empty string or appropriate value package: name: {{ name|lower }} From a12b934509596f105a31c86a5969e39daee4a668 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Fri, 28 Jun 2024 13:40:29 +0200 Subject: [PATCH 49/81] next try --- recipes/cythonbiogeme/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index 04d99fb7cc594..c023e3fdbbe5d 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -40,8 +40,8 @@ requirements: - python - cython >=0.29.16 - m2w64-gcc-libs # [win] - - {{ native }}gcc-libs # [win] - - {{ native }}libwinpthread-git # [win] + - gcc-libs # [win] + - libwinpthread-git # [win] - pandas >=1.3.5 - {{ pin_compatible('numpy') }} From a8c050d378176d928403c2b16026e9ef45a59478 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Mon, 1 Jul 2024 12:26:30 +0200 Subject: [PATCH 50/81] try --- recipes/cythonbiogeme/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index c023e3fdbbe5d..de575805c6687 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -40,8 +40,6 @@ requirements: - python - cython >=0.29.16 - m2w64-gcc-libs # [win] - - gcc-libs # [win] - - libwinpthread-git # [win] - pandas >=1.3.5 - {{ pin_compatible('numpy') }} From 7da5d80b6c0a07aad6030a8a6590b2ca05fd7b7c Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Mon, 1 Jul 2024 13:25:19 +0200 Subject: [PATCH 51/81] new patch --- recipes/cythonbiogeme/setup.cfg.patch | 146 +++++++++++++++++++++----- 1 file changed, 122 insertions(+), 24 deletions(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index 2b842eb92fa16..ced15d8176e5f 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -1,27 +1,125 @@ ---- setup.cfg.orig 2024-06-13 18:08:57 -+++ setup.cfg 2024-06-14 16:58:24 -@@ -33,8 +33,8 @@ - pandas >= 1.3.5 - - # For Windows --#[build] --#compiler=mingw32 +--- setuporig.cfg 2024-07-01 13:18:32 ++++ setupnew.cfg 2024-07-01 13:18:02 +@@ -0,0 +1,121 @@ ++[metadata] ++name = biogeme ++version = attr: biogeme.version.__version__ ++description = Estimation and application of discrete choice models ++long_description = file: README.md ++long_description_content_type = text/markdown ++author = Michel Bierlaire ++author_email = michel.bierlaire@epfl.ch ++url = http://biogeme.epfl.ch ++download_urls = https://pypi.org/project/biogeme/ ++project_urls = ++ Documentation = http://biogeme.epfl.ch/documents.html ++ Code = https://github.com/michelbierlaire/biogeme ++classifiers = ++ Intended Audience :: Education ++ Intended Audience :: Science/Research ++ Topic :: Scientific/Engineering ++ Topic :: Scientific/Engineering :: Mathematics ++ Natural Language :: English ++ Operating System :: OS Independent ++ Programming Language :: C++ ++ Programming Language :: Cython ++ Programming Language :: Python ++ Programming Language :: Python :: 3 ++ Programming Language :: Python :: 3.4 ++ Programming Language :: Python :: 3.5 ++ Programming Language :: Python :: 3.6 ++ Programming Language :: Python :: 3.7 ++ Programming Language :: Python :: 3 :: Only ++ Programming Language :: Python :: Implementation :: CPython ++ ++[options] ++package_dir = =src ++packages = find: ++install_requires = ++ cython >= 0.29.16 ++ pandas >= 1.3.5 ++ scipy >= 1.7.3 ++ tqdm >= 4.64.1 ++ tomlkit >= 0.11.5 ++ ++[options.packages.find] ++where=src ++ ++[options.extras_require] ++testing = cython >= 0.29.32 ++ numpy >= 1.23.4 ++ pytest >= 7.2.0 ++ pytest-cov >= 4.0.0 ++ tox >= 3.27.1 ++ +[build] +compiler=mingw32 - - - [options.packages.find] -@@ -110,9 +110,9 @@ - include_dirs = eval(__import__('numpy').get_include()) - language = c++ - --extra_compile_args = -std=c++11 --extra_link_args = -std=c++11 -+#extra_compile_args = -std=c++11 -+#extra_link_args = -std=c++11 - - # For Windows --#extra_compile_args = -std=c++11 -DMS_WIN64 --#extra_link_args = -static -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive ++ ++[build_ext] ++compiler=mingw32 ++ ++[cython-defaults] ++include_dirs = src/ ++ ++[cython-module: biogeme.cythonbiogeme] ++sources = src/biogeme/cpp/cythonbiogeme.pyx ++ src/biogeme/cpp/biogeme.cc ++ src/biogeme/cpp/evaluateExpressions.cc ++ src/biogeme/cpp/bioMemoryManagement.cc ++ src/biogeme/cpp/bioNormalCdf.cc ++ src/biogeme/cpp/bioFormula.cc ++ src/biogeme/cpp/bioSeveralFormulas.cc ++ src/biogeme/cpp/bioThreadMemory.cc ++ src/biogeme/cpp/bioThreadMemoryOneExpression.cc ++ src/biogeme/cpp/bioThreadMemorySimul.cc ++ src/biogeme/cpp/bioString.cc ++ src/biogeme/cpp/bioExprNormalCdf.cc ++ src/biogeme/cpp/bioExprIntegrate.cc ++ src/biogeme/cpp/bioExprGaussHermite.cc ++ src/biogeme/cpp/bioExprRandomVariable.cc ++ src/biogeme/cpp/bioExprMontecarlo.cc ++ src/biogeme/cpp/bioExprPanelTrajectory.cc ++ src/biogeme/cpp/bioExprDraws.cc ++ src/biogeme/cpp/bioExprDerive.cc ++ src/biogeme/cpp/bioExprMin.cc ++ src/biogeme/cpp/bioExprMax.cc ++ src/biogeme/cpp/bioExprAnd.cc ++ src/biogeme/cpp/bioExprOr.cc ++ src/biogeme/cpp/bioExprEqual.cc ++ src/biogeme/cpp/bioExprNotEqual.cc ++ src/biogeme/cpp/bioExprLessOrEqual.cc ++ src/biogeme/cpp/bioExprLess.cc ++ src/biogeme/cpp/bioExprGreaterOrEqual.cc ++ src/biogeme/cpp/bioExprGreater.cc ++ src/biogeme/cpp/bioExprElem.cc ++ src/biogeme/cpp/bioExprMultSum.cc ++ src/biogeme/cpp/bioExprLiteral.cc ++ src/biogeme/cpp/bioExprFreeParameter.cc ++ src/biogeme/cpp/bioExprFixedParameter.cc ++ src/biogeme/cpp/bioExprVariable.cc ++ src/biogeme/cpp/bioExprPlus.cc ++ src/biogeme/cpp/bioExprMinus.cc ++ src/biogeme/cpp/bioExprTimes.cc ++ src/biogeme/cpp/bioExprDivide.cc ++ src/biogeme/cpp/bioExprPower.cc ++ src/biogeme/cpp/bioExprUnaryMinus.cc ++ src/biogeme/cpp/bioExprExp.cc ++ src/biogeme/cpp/bioExprLog.cc ++ src/biogeme/cpp/bioExprLogzero.cc ++ src/biogeme/cpp/bioExprNumeric.cc ++ src/biogeme/cpp/bioExprLogLogit.cc ++ src/biogeme/cpp/bioExprLogLogitFullChoiceSet.cc ++ src/biogeme/cpp/bioExprLinearUtility.cc ++ src/biogeme/cpp/bioExpression.cc ++ src/biogeme/cpp/bioSeveralExpressions.cc ++ src/biogeme/cpp/bioExceptions.cc ++ src/biogeme/cpp/bioDerivatives.cc ++ src/biogeme/cpp/bioVectorOfDerivatives.cc ++ src/biogeme/cpp/bioGaussHermite.cc ++ src/biogeme/cpp/bioGhFunction.cc ++ ++include_dirs = eval(__import__('numpy').get_include()) ++language = c++ +extra_compile_args = -std=c++11 -DMS_WIN64 -+extra_link_args = -std=c++11 -lpthread -mms-bitfields -mwindows ++extra_link_args = -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows +\ No newline at end of file From ddaecfd5eec18c9620eac161a73e76efa6515d61 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Mon, 1 Jul 2024 17:24:37 +0200 Subject: [PATCH 52/81] testing a new patch --- recipes/cythonbiogeme/setup.cfg.patch | 145 +++++--------------------- 1 file changed, 25 insertions(+), 120 deletions(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index ced15d8176e5f..5efdc5da50d66 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -1,125 +1,30 @@ ---- setuporig.cfg 2024-07-01 13:18:32 -+++ setupnew.cfg 2024-07-01 13:18:02 -@@ -0,0 +1,121 @@ -+[metadata] -+name = biogeme -+version = attr: biogeme.version.__version__ -+description = Estimation and application of discrete choice models -+long_description = file: README.md -+long_description_content_type = text/markdown -+author = Michel Bierlaire -+author_email = michel.bierlaire@epfl.ch -+url = http://biogeme.epfl.ch -+download_urls = https://pypi.org/project/biogeme/ -+project_urls = -+ Documentation = http://biogeme.epfl.ch/documents.html -+ Code = https://github.com/michelbierlaire/biogeme -+classifiers = -+ Intended Audience :: Education -+ Intended Audience :: Science/Research -+ Topic :: Scientific/Engineering -+ Topic :: Scientific/Engineering :: Mathematics -+ Natural Language :: English -+ Operating System :: OS Independent -+ Programming Language :: C++ -+ Programming Language :: Cython -+ Programming Language :: Python -+ Programming Language :: Python :: 3 -+ Programming Language :: Python :: 3.4 -+ Programming Language :: Python :: 3.5 -+ Programming Language :: Python :: 3.6 -+ Programming Language :: Python :: 3.7 -+ Programming Language :: Python :: 3 :: Only -+ Programming Language :: Python :: Implementation :: CPython -+ -+[options] -+package_dir = =src -+packages = find: -+install_requires = -+ cython >= 0.29.16 -+ pandas >= 1.3.5 -+ scipy >= 1.7.3 -+ tqdm >= 4.64.1 -+ tomlkit >= 0.11.5 -+ -+[options.packages.find] -+where=src -+ -+[options.extras_require] -+testing = cython >= 0.29.32 -+ numpy >= 1.23.4 -+ pytest >= 7.2.0 -+ pytest-cov >= 4.0.0 -+ tox >= 3.27.1 -+ +--- setuporig.cfg 2024-07-01 17:23:39 ++++ setupnew.cfg 2024-07-01 17:23:35 +@@ -33,8 +33,8 @@ + pandas >= 1.3.5 + + # For Windows +-#[build] +-#compiler=mingw32 +[build] +compiler=mingw32 -+ -+[build_ext] -+compiler=mingw32 -+ -+[cython-defaults] -+include_dirs = src/ -+ -+[cython-module: biogeme.cythonbiogeme] -+sources = src/biogeme/cpp/cythonbiogeme.pyx -+ src/biogeme/cpp/biogeme.cc -+ src/biogeme/cpp/evaluateExpressions.cc -+ src/biogeme/cpp/bioMemoryManagement.cc -+ src/biogeme/cpp/bioNormalCdf.cc -+ src/biogeme/cpp/bioFormula.cc -+ src/biogeme/cpp/bioSeveralFormulas.cc -+ src/biogeme/cpp/bioThreadMemory.cc -+ src/biogeme/cpp/bioThreadMemoryOneExpression.cc -+ src/biogeme/cpp/bioThreadMemorySimul.cc -+ src/biogeme/cpp/bioString.cc -+ src/biogeme/cpp/bioExprNormalCdf.cc -+ src/biogeme/cpp/bioExprIntegrate.cc -+ src/biogeme/cpp/bioExprGaussHermite.cc -+ src/biogeme/cpp/bioExprRandomVariable.cc -+ src/biogeme/cpp/bioExprMontecarlo.cc -+ src/biogeme/cpp/bioExprPanelTrajectory.cc -+ src/biogeme/cpp/bioExprDraws.cc -+ src/biogeme/cpp/bioExprDerive.cc -+ src/biogeme/cpp/bioExprMin.cc -+ src/biogeme/cpp/bioExprMax.cc -+ src/biogeme/cpp/bioExprAnd.cc -+ src/biogeme/cpp/bioExprOr.cc -+ src/biogeme/cpp/bioExprEqual.cc -+ src/biogeme/cpp/bioExprNotEqual.cc -+ src/biogeme/cpp/bioExprLessOrEqual.cc -+ src/biogeme/cpp/bioExprLess.cc -+ src/biogeme/cpp/bioExprGreaterOrEqual.cc -+ src/biogeme/cpp/bioExprGreater.cc -+ src/biogeme/cpp/bioExprElem.cc -+ src/biogeme/cpp/bioExprMultSum.cc -+ src/biogeme/cpp/bioExprLiteral.cc -+ src/biogeme/cpp/bioExprFreeParameter.cc -+ src/biogeme/cpp/bioExprFixedParameter.cc -+ src/biogeme/cpp/bioExprVariable.cc -+ src/biogeme/cpp/bioExprPlus.cc -+ src/biogeme/cpp/bioExprMinus.cc -+ src/biogeme/cpp/bioExprTimes.cc -+ src/biogeme/cpp/bioExprDivide.cc -+ src/biogeme/cpp/bioExprPower.cc -+ src/biogeme/cpp/bioExprUnaryMinus.cc -+ src/biogeme/cpp/bioExprExp.cc -+ src/biogeme/cpp/bioExprLog.cc -+ src/biogeme/cpp/bioExprLogzero.cc -+ src/biogeme/cpp/bioExprNumeric.cc -+ src/biogeme/cpp/bioExprLogLogit.cc -+ src/biogeme/cpp/bioExprLogLogitFullChoiceSet.cc -+ src/biogeme/cpp/bioExprLinearUtility.cc -+ src/biogeme/cpp/bioExpression.cc -+ src/biogeme/cpp/bioSeveralExpressions.cc -+ src/biogeme/cpp/bioExceptions.cc -+ src/biogeme/cpp/bioDerivatives.cc -+ src/biogeme/cpp/bioVectorOfDerivatives.cc -+ src/biogeme/cpp/bioGaussHermite.cc -+ src/biogeme/cpp/bioGhFunction.cc -+ -+include_dirs = eval(__import__('numpy').get_include()) -+language = c++ + + + [options.packages.find] +\ No newline at end of file +@@ -115,9 +115,9 @@ + include_dirs = eval(__import__('numpy').get_include()) + language = c++ + +-extra_compile_args = -std=c++11 +-extra_link_args = -std=c++11 ++#extra_compile_args = -std=c++11 ++#extra_link_args = -std=c++11 + + # For Windows +-#extra_compile_args = -std=c++11 -DMS_WIN64 +-#extra_link_args = -static -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive +\ No newline at end of file +extra_compile_args = -std=c++11 -DMS_WIN64 +extra_link_args = -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows \ No newline at end of file From e40658f704f777c4f11af54a910d1de783292b0d Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 3 Jul 2024 10:36:42 +0200 Subject: [PATCH 53/81] changes on the patch --- recipes/cythonbiogeme/setup.cfg.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index 5efdc5da50d66..ec047403d85dc 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -1,5 +1,5 @@ ---- setuporig.cfg 2024-07-01 17:23:39 -+++ setupnew.cfg 2024-07-01 17:23:35 +--- setup.cfg 2024-07-01 17:23:39 ++++ setup.cfg 2024-07-01 17:23:35 @@ -33,8 +33,8 @@ pandas >= 1.3.5 From 3b12f1a55d67b4618d9390a27433e7f253f177c9 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 3 Jul 2024 11:25:14 +0200 Subject: [PATCH 54/81] updated patch --- recipes/cythonbiogeme/setup.cfg.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch index ec047403d85dc..48328579d5ffb 100644 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ b/recipes/cythonbiogeme/setup.cfg.patch @@ -24,7 +24,6 @@ # For Windows -#extra_compile_args = -std=c++11 -DMS_WIN64 -#extra_link_args = -static -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive -\ No newline at end of file + +extra_compile_args = -std=c++11 -DMS_WIN64 -+extra_link_args = -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows -\ No newline at end of file ++extra_link_args = -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows \ No newline at end of file From 73639076fb82813fc1bc474ad0808d642523a3df Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Sun, 21 Jul 2024 23:29:40 +0200 Subject: [PATCH 55/81] Updated recipe for 1.0.3 --- recipes/cythonbiogeme/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index de575805c6687..5c339571370b1 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -1,5 +1,5 @@ {% set name = "cythonbiogeme" %} -{% set version = "1.0.2" %} +{% set version = "1.0.3" %} {% set native = "" %} # Define native as an empty string or appropriate value package: @@ -11,7 +11,7 @@ source: sha256: f139342944c849b47ce5aaa548e68aa179c195de93ab76be78353f4309684d0e patches: - - setup.cfg.patch # [win] + #- setup.cfg.patch # [win] - setup.py.patch build: @@ -22,11 +22,11 @@ build: requirements: build: - {{ compiler('c') }} # [not win] - - {{ compiler('m2w64_c') }} # [win] + #- {{ compiler('m2w64_c') }} # [win] - {{ compiler('cxx') }} # [not win] - - {{ compiler('m2w64_cxx') }} # [win] + #- {{ compiler('m2w64_cxx') }} # [win] - {{ stdlib("c") }} # [not win] - - {{ stdlib("m2w64_c") }} # [win] + #- {{ stdlib("m2w64_c") }} # [win] host: - python @@ -39,7 +39,7 @@ requirements: run: - python - cython >=0.29.16 - - m2w64-gcc-libs # [win] + #- m2w64-gcc-libs # [win] - pandas >=1.3.5 - {{ pin_compatible('numpy') }} From 7e2b86ae22ae8a1a4dec38ef353e5a17b3581cb8 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Sun, 21 Jul 2024 23:45:52 +0200 Subject: [PATCH 56/81] updated ref --- recipes/biogeme/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 6332ee3c2cefb..407705b456896 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -26,7 +26,7 @@ requirements: - scipy >=1.7.3 - tqdm >=4.64.1 - tomlkit >=0.11.5 - - cythonbiogeme ==1.0.2 + - cythonbiogeme ==1.0.3 - biogeme-optimization ==0.0.5 test: From 1ff3d86c83b7571f08e6268259d5e499ccde08b7 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Mon, 22 Jul 2024 00:01:27 +0200 Subject: [PATCH 57/81] updated sha256 --- recipes/cythonbiogeme/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index 5c339571370b1..f771b665e8519 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -8,7 +8,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/cythonbiogeme-{{ version }}.tar.gz - sha256: f139342944c849b47ce5aaa548e68aa179c195de93ab76be78353f4309684d0e + sha256: 1e869d482d51fde70bdb88a52207a30081f2ef0d9ee8a5b0f7df850cae4d1719 patches: #- setup.cfg.patch # [win] From 00f2d1a6d106ca25e5720cbc5e7723db7aa09de9 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Mon, 22 Jul 2024 00:10:32 +0200 Subject: [PATCH 58/81] commented prevous patch --- recipes/cythonbiogeme/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index f771b665e8519..0a03b6a61c38b 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -12,7 +12,7 @@ source: patches: #- setup.cfg.patch # [win] - - setup.py.patch + #- setup.py.patch build: number: 0 From dd4e360f43bf054974fae867fdd9e751ccefea17 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Mon, 22 Jul 2024 00:24:42 +0200 Subject: [PATCH 59/81] python version --- recipes/cythonbiogeme/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml index 0a03b6a61c38b..7e5cb437cafc1 100644 --- a/recipes/cythonbiogeme/meta.yaml +++ b/recipes/cythonbiogeme/meta.yaml @@ -37,7 +37,7 @@ requirements: - m2w64-toolchain # [win] - pip run: - - python + - python >=3.8.19 - cython >=0.29.16 #- m2w64-gcc-libs # [win] - pandas >=1.3.5 From 7f5b94160a5de2571db8008d3daeb5cf53ceb03d Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 6 Aug 2024 11:51:51 +0200 Subject: [PATCH 60/81] removing cythonbiogeme --- recipes/cythonbiogeme/meta.yaml | 63 --------------------------- recipes/cythonbiogeme/setup.cfg.patch | 29 ------------ recipes/cythonbiogeme/setup.py.patch | 15 ------- 3 files changed, 107 deletions(-) delete mode 100644 recipes/cythonbiogeme/meta.yaml delete mode 100644 recipes/cythonbiogeme/setup.cfg.patch delete mode 100644 recipes/cythonbiogeme/setup.py.patch diff --git a/recipes/cythonbiogeme/meta.yaml b/recipes/cythonbiogeme/meta.yaml deleted file mode 100644 index 7e5cb437cafc1..0000000000000 --- a/recipes/cythonbiogeme/meta.yaml +++ /dev/null @@ -1,63 +0,0 @@ -{% set name = "cythonbiogeme" %} -{% set version = "1.0.3" %} -{% set native = "" %} # Define native as an empty string or appropriate value - -package: - name: {{ name|lower }} - version: {{ version }} - -source: - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/cythonbiogeme-{{ version }}.tar.gz - sha256: 1e869d482d51fde70bdb88a52207a30081f2ef0d9ee8a5b0f7df850cae4d1719 - - patches: - #- setup.cfg.patch # [win] - #- setup.py.patch - -build: - number: 0 - script: {{ PYTHON }} -m pip install . -vv - skip: True # [py == 312 and osx] - -requirements: - build: - - {{ compiler('c') }} # [not win] - #- {{ compiler('m2w64_c') }} # [win] - - {{ compiler('cxx') }} # [not win] - #- {{ compiler('m2w64_cxx') }} # [win] - - {{ stdlib("c") }} # [not win] - #- {{ stdlib("m2w64_c") }} # [win] - - host: - - python - - setuptools >=63.4.1 - - wheel - - numpy >=1.19.0 - - cython - - m2w64-toolchain # [win] - - pip - run: - - python >=3.8.19 - - cython >=0.29.16 - #- m2w64-gcc-libs # [win] - - pandas >=1.3.5 - - {{ pin_compatible('numpy') }} - -test: - imports: - - cythonbiogeme - commands: - - pip check - requires: - - pip - -about: - home: http://biogeme.epfl.ch - summary: C++ part of the Biogeme package - license: MIT - license_family: MIT - license_file: LICENSE - -extra: - recipe-maintainers: - - FGarridoV diff --git a/recipes/cythonbiogeme/setup.cfg.patch b/recipes/cythonbiogeme/setup.cfg.patch deleted file mode 100644 index 48328579d5ffb..0000000000000 --- a/recipes/cythonbiogeme/setup.cfg.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- setup.cfg 2024-07-01 17:23:39 -+++ setup.cfg 2024-07-01 17:23:35 -@@ -33,8 +33,8 @@ - pandas >= 1.3.5 - - # For Windows --#[build] --#compiler=mingw32 -+[build] -+compiler=mingw32 - - - [options.packages.find] -\ No newline at end of file -@@ -115,9 +115,9 @@ - include_dirs = eval(__import__('numpy').get_include()) - language = c++ - --extra_compile_args = -std=c++11 --extra_link_args = -std=c++11 -+#extra_compile_args = -std=c++11 -+#extra_link_args = -std=c++11 - - # For Windows --#extra_compile_args = -std=c++11 -DMS_WIN64 --#extra_link_args = -static -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows -Wl,-Bstatic,--whole-archive -Wl,--no-whole-archive - -+extra_compile_args = -std=c++11 -DMS_WIN64 -+extra_link_args = -std=c++11 -static-libstdc++ -static-libgcc -Bstatic -lpthread -mms-bitfields -mwindows \ No newline at end of file diff --git a/recipes/cythonbiogeme/setup.py.patch b/recipes/cythonbiogeme/setup.py.patch deleted file mode 100644 index cde45313509aa..0000000000000 --- a/recipes/cythonbiogeme/setup.py.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- setup.py -+++ setup.py -@@ -435,12 +435,4 @@ - raise ValueError('invalid boolean string %r' % value) - - --if platform.system() == "Darwin": -- os.environ["CC"] = "clang++" -- os.environ["CXX"] = "clang++" --else: -- os.environ["CC"] = "g++" -- os.environ["CXX"] = "g++" -- -- - setup() From d8ac7bf23531af3207d95c28fbfc87e3adb8a4cc Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 6 Aug 2024 11:52:02 +0200 Subject: [PATCH 61/81] updating biogeme --- recipes/biogeme-optimization/meta.yaml | 4 ++-- recipes/biogeme/meta.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 73443d67dec20..778d547ec0ffa 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -1,5 +1,5 @@ {% set name = "biogeme-optimization" %} -{% set version = "0.0.5" %} +{% set version = "0.0.10" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme_optimization-{{ version }}.tar.gz - sha256: c202fb1b5eaecffdca04f98201ac39cc813dee2c3bb4c98cf079a868bda1c6bb + sha256: a4e964d034208eb762217556112369d9f8f7dfeabe603a2dde360bca50031fca build: noarch: python diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 407705b456896..4faddfa7af915 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -1,5 +1,5 @@ {% set name = "biogeme" %} -{% set version = "3.2.13" %} +{% set version = "3.2.14" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme-{{ version }}.tar.gz - sha256: aa3aaa4d32e37fd98b4b23d0630259e07d4645e7ce42c28d57a96c1b4297acc7 + sha256: fe1169e09fcebe6c100e3c887c015301cba1e6abcd0f546eaf6e949104d52847 build: noarch: python @@ -26,8 +26,8 @@ requirements: - scipy >=1.7.3 - tqdm >=4.64.1 - tomlkit >=0.11.5 - - cythonbiogeme ==1.0.3 - - biogeme-optimization ==0.0.5 + - cythonbiogeme ==1.0.4 + - biogeme-optimization ==0.0.10 test: imports: From b634c6801940d54ec12c8255626bf9c7248d9636 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 6 Aug 2024 12:10:48 +0200 Subject: [PATCH 62/81] going back 1 version --- recipes/biogeme-optimization/meta.yaml | 6 +++--- recipes/biogeme/meta.yaml | 12 +++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 778d547ec0ffa..26b351142ad9a 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -1,5 +1,5 @@ {% set name = "biogeme-optimization" %} -{% set version = "0.0.10" %} +{% set version = "0.0.5" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme_optimization-{{ version }}.tar.gz - sha256: a4e964d034208eb762217556112369d9f8f7dfeabe603a2dde360bca50031fca + sha256: c202fb1b5eaecffdca04f98201ac39cc813dee2c3bb4c98cf079a868bda1c6bb build: noarch: python @@ -35,7 +35,7 @@ test: about: home: http://biogeme.epfl.ch summary: Various optimization algorithms for teaching and research - license: Unlicensed + license: Custom extra: recipe-maintainers: diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 4faddfa7af915..72e3f0a77bca6 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -1,5 +1,5 @@ {% set name = "biogeme" %} -{% set version = "3.2.14" %} +{% set version = "3.2.13" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme-{{ version }}.tar.gz - sha256: fe1169e09fcebe6c100e3c887c015301cba1e6abcd0f546eaf6e949104d52847 + sha256: aa3aaa4d32e37fd98b4b23d0630259e07d4645e7ce42c28d57a96c1b4297acc7 build: noarch: python @@ -26,8 +26,8 @@ requirements: - scipy >=1.7.3 - tqdm >=4.64.1 - tomlkit >=0.11.5 - - cythonbiogeme ==1.0.4 - - biogeme-optimization ==0.0.10 + - cythonbiogeme==1.0.3 + - biogeme-optimization ==0.0.5 test: imports: @@ -40,9 +40,7 @@ test: about: home: http://biogeme.epfl.ch summary: Estimation and application of discrete choice models - license: MIT - license_family: MIT - license_file: LICENSE + license: Custom extra: recipe-maintainers: From e4f298277c1bd8cbf1d41219199d3d1c652dd233 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 6 Aug 2024 12:12:52 +0200 Subject: [PATCH 63/81] minor space bug --- recipes/biogeme/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 72e3f0a77bca6..ea8dd289ed7fe 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -26,7 +26,7 @@ requirements: - scipy >=1.7.3 - tqdm >=4.64.1 - tomlkit >=0.11.5 - - cythonbiogeme==1.0.3 + - cythonbiogeme ==1.0.3 - biogeme-optimization ==0.0.5 test: From dbfad1f8aafb348af6f04682cd4a0e13fb4b6756 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 6 Aug 2024 12:19:53 +0200 Subject: [PATCH 64/81] Adding License filename --- recipes/biogeme-optimization/meta.yaml | 1 + recipes/biogeme/meta.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 26b351142ad9a..c991edbba8228 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -36,6 +36,7 @@ about: home: http://biogeme.epfl.ch summary: Various optimization algorithms for teaching and research license: Custom + license_file: LICENSE extra: recipe-maintainers: diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index ea8dd289ed7fe..3732c27fabebe 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -41,6 +41,7 @@ about: home: http://biogeme.epfl.ch summary: Estimation and application of discrete choice models license: Custom + license_file: LICENSE extra: recipe-maintainers: From 191fb5cc603a519578a0adb07bbbbd7235ad7655 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 6 Aug 2024 12:21:18 +0200 Subject: [PATCH 65/81] Removing License file from optimization as there is not in the tarball --- recipes/biogeme-optimization/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index c991edbba8228..26b351142ad9a 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -36,7 +36,6 @@ about: home: http://biogeme.epfl.ch summary: Various optimization algorithms for teaching and research license: Custom - license_file: LICENSE extra: recipe-maintainers: From 4bdbe132b06b5645f54f32790619c25ba55790a5 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 6 Aug 2024 12:41:50 +0200 Subject: [PATCH 66/81] changing dependency version --- recipes/biogeme/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 3732c27fabebe..acf063a075017 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -26,7 +26,7 @@ requirements: - scipy >=1.7.3 - tqdm >=4.64.1 - tomlkit >=0.11.5 - - cythonbiogeme ==1.0.3 + - cythonbiogeme ==1.0.2 - biogeme-optimization ==0.0.5 test: From 04f856877f241ff16b00a4834edb87e7d37520ad Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 6 Aug 2024 12:52:29 +0200 Subject: [PATCH 67/81] to new versions --- recipes/biogeme-optimization/meta.yaml | 4 ++-- recipes/biogeme/meta.yaml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 26b351142ad9a..dba4f712349e0 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -1,5 +1,5 @@ {% set name = "biogeme-optimization" %} -{% set version = "0.0.5" %} +{% set version = "0.0.10" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme_optimization-{{ version }}.tar.gz - sha256: c202fb1b5eaecffdca04f98201ac39cc813dee2c3bb4c98cf079a868bda1c6bb + sha256: a4e964d034208eb762217556112369d9f8f7dfeabe603a2dde360bca50031fca build: noarch: python diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index acf063a075017..5989508b901ac 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -1,5 +1,5 @@ {% set name = "biogeme" %} -{% set version = "3.2.13" %} +{% set version = "3.2.14" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/biogeme-{{ version }}.tar.gz - sha256: aa3aaa4d32e37fd98b4b23d0630259e07d4645e7ce42c28d57a96c1b4297acc7 + sha256: fe1169e09fcebe6c100e3c887c015301cba1e6abcd0f546eaf6e949104d52847 build: noarch: python @@ -25,9 +25,9 @@ requirements: - pandas >=1.3.5 - scipy >=1.7.3 - tqdm >=4.64.1 - - tomlkit >=0.11.5 - - cythonbiogeme ==1.0.2 - - biogeme-optimization ==0.0.5 + - tomlkit >=0.13.0 + - cythonbiogeme ==1.0.4 + - biogeme-optimization ==0.0.10 test: imports: From a66ed8f9635df84b62ffc35e53d2f4b33dd6800c Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 6 Aug 2024 13:01:32 +0200 Subject: [PATCH 68/81] tomlkit version --- recipes/biogeme/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 5989508b901ac..e85dda89ffbba 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -25,7 +25,7 @@ requirements: - pandas >=1.3.5 - scipy >=1.7.3 - tqdm >=4.64.1 - - tomlkit >=0.13.0 + - tomlkit >=0.11.5 - cythonbiogeme ==1.0.4 - biogeme-optimization ==0.0.10 From 90eef2182b7f0793ccb34825d27e6932bc9f0b5c Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 6 Aug 2024 13:02:10 +0200 Subject: [PATCH 69/81] version cython --- recipes/biogeme/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index e85dda89ffbba..8eba92b18caf6 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -26,7 +26,7 @@ requirements: - scipy >=1.7.3 - tqdm >=4.64.1 - tomlkit >=0.11.5 - - cythonbiogeme ==1.0.4 + - cythonbiogeme >=1.0.3 - biogeme-optimization ==0.0.10 test: From 0dbc13e4bfe23e987417897c140d75c849d59b33 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 6 Aug 2024 14:31:23 +0200 Subject: [PATCH 70/81] Added license for opti --- recipes/biogeme-optimization/LICENSE | 24 ++++++++++++++++++++++++ recipes/biogeme-optimization/meta.yaml | 1 + 2 files changed, 25 insertions(+) create mode 100644 recipes/biogeme-optimization/LICENSE diff --git a/recipes/biogeme-optimization/LICENSE b/recipes/biogeme-optimization/LICENSE new file mode 100644 index 0000000000000..2d4bf1777021b --- /dev/null +++ b/recipes/biogeme-optimization/LICENSE @@ -0,0 +1,24 @@ +BIOGEME is distributed free of charge. We ask each user to register to +Biogeme's users group, and to mention explicitly the use of the +package when publishing results, using the following reference: + +For BisonBiogeme: Bierlaire, M. (2003). BIOGEME: A free package for +the estimation of discrete choice models , Proceedings of the 3rd +Swiss Transportation Research Conference, Ascona, Switzerland. + +For PythonBiogeme: Bierlaire, M. (2016) PythonBiogeme: a short +introduction. Report TRANSP-OR 160706 ,Series on Biogeme. Transport +and Mobility Laboratory, School of Architecture, Civil and +Environmental Engineering, Ecole Polytechnique Fédérale de Lausanne, +Switzerland. + +Disclaimer: This software is provided free of charge and "AS IS" +WITHOUT ANY WARRANTY of any kind. The implied warranties of +merchantability, fitness for a particular purpose and non-infringment +are expressly disclaimed. In no event will the author (Michel +Bierlaire) or his employer (EPFL) be liable to any party for any +direct, indirect, special or other consequential damages for any use +of the code including, without limitation, any lost profits, business +interruption, loss of programs or other data on your information +handling system or otherwise, even if we are expressly advised of the +possibility of such damages. \ No newline at end of file diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index dba4f712349e0..c7539fb228028 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -36,6 +36,7 @@ about: home: http://biogeme.epfl.ch summary: Various optimization algorithms for teaching and research license: Custom + license_file: LICENSE extra: recipe-maintainers: From c70e74a4ef17add77c5b8a3fd73ecd3c64a6875a Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 6 Aug 2024 15:13:18 +0200 Subject: [PATCH 71/81] updated metas files with new dependencies --- recipes/biogeme-optimization/meta.yaml | 7 ++++--- recipes/biogeme/meta.yaml | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index c7539fb228028..40d70a5016dc8 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -20,9 +20,10 @@ requirements: - pip run: - python >=3.7 - - numpy >=1.24.2 - - scipy >=1.10.1 - - matplotlib-base >=3.8.2 + - numpy >=2.0.0, <3 + - scipy >=1.14.0, <2 + - matplotlib >=3.9.0, <4 + - tomlkit >=0.12.5, <1 test: imports: diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 8eba92b18caf6..4b649b322c236 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -22,12 +22,18 @@ requirements: - pip run: - python >=3.7 - - pandas >=1.3.5 - - scipy >=1.7.3 - - tqdm >=4.64.1 - - tomlkit >=0.11.5 - - cythonbiogeme >=1.0.3 - - biogeme-optimization ==0.0.10 + - numpy >=2.0.0, <3 + - scipy >=1.14.0, <2 + - matplotlib-base >=3.9.0, <4 + - pandas >=2.2.2, <3 + - tqdm >=4.66.4 + - tomlkit >=0.12.5 + - python-levenshtein >=0.25.1 + - fuzzywuzzy >=0.18.0 + - cythonbiogeme ==1.0.4 + - biogeme_optimization ==0.0.10 + - ipython >=8.25.0 + - Jinja2 >=3.1.4 test: imports: From 622732160f6e5cec662e708e575ae36d533ce3a0 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Tue, 6 Aug 2024 16:44:30 +0200 Subject: [PATCH 72/81] removing numpy --- recipes/biogeme-optimization/meta.yaml | 1 - recipes/biogeme/meta.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 40d70a5016dc8..81253131809f7 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -20,7 +20,6 @@ requirements: - pip run: - python >=3.7 - - numpy >=2.0.0, <3 - scipy >=1.14.0, <2 - matplotlib >=3.9.0, <4 - tomlkit >=0.12.5, <1 diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 4b649b322c236..1663ab52eb193 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -22,7 +22,6 @@ requirements: - pip run: - python >=3.7 - - numpy >=2.0.0, <3 - scipy >=1.14.0, <2 - matplotlib-base >=3.9.0, <4 - pandas >=2.2.2, <3 From 0e264915b19db8bf9c81630ad932df2b4d9727d1 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Wed, 7 Aug 2024 07:35:09 +0200 Subject: [PATCH 73/81] updated versions --- recipes/biogeme-optimization/meta.yaml | 7 ++++--- recipes/biogeme/meta.yaml | 7 +++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 81253131809f7..e2b1a3d40a6a4 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -20,9 +20,10 @@ requirements: - pip run: - python >=3.7 - - scipy >=1.14.0, <2 - - matplotlib >=3.9.0, <4 - - tomlkit >=0.12.5, <1 + - numpy + - scipy >=1.14.0 + - matplotlib-base >=3.9.0 + - tomlkit >=0.12.5 test: imports: diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 1663ab52eb193..c489c8fd08832 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -22,16 +22,15 @@ requirements: - pip run: - python >=3.7 - - scipy >=1.14.0, <2 - - matplotlib-base >=3.9.0, <4 - - pandas >=2.2.2, <3 + - scipy >=1.14.0 + - matplotlib-base >=3.9.0 + - pandas >=2.2.2 - tqdm >=4.66.4 - tomlkit >=0.12.5 - python-levenshtein >=0.25.1 - fuzzywuzzy >=0.18.0 - cythonbiogeme ==1.0.4 - biogeme_optimization ==0.0.10 - - ipython >=8.25.0 - Jinja2 >=3.1.4 test: From 29a7ba99f229a42bcb759bdf9ef96a71090d8f2d Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Fri, 16 Aug 2024 14:22:33 +0200 Subject: [PATCH 74/81] typo --- recipes/biogeme/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index c489c8fd08832..4c6145f21a5ad 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -30,7 +30,7 @@ requirements: - python-levenshtein >=0.25.1 - fuzzywuzzy >=0.18.0 - cythonbiogeme ==1.0.4 - - biogeme_optimization ==0.0.10 + - biogeme-optimization ==0.0.10 - Jinja2 >=3.1.4 test: From 8c45729134209069401b1e1007b897263607d663 Mon Sep 17 00:00:00 2001 From: FGarridoV Date: Fri, 16 Aug 2024 17:08:34 +0200 Subject: [PATCH 75/81] Adding ipython --- recipes/biogeme/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 4c6145f21a5ad..9e38fe78977dd 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -32,6 +32,7 @@ requirements: - cythonbiogeme ==1.0.4 - biogeme-optimization ==0.0.10 - Jinja2 >=3.1.4 + - ipython test: imports: From f7964d4e66ebf7b9e66f0a70e58d3c525e3d727e Mon Sep 17 00:00:00 2001 From: Sander van Cranenburgh <91725095+sandervancranenburgh@users.noreply.github.com> Date: Fri, 30 Aug 2024 08:56:29 +0200 Subject: [PATCH 76/81] Update license meta.yaml --> LicenseRef-BIOGEME --- recipes/biogeme-optimization/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index e2b1a3d40a6a4..9e82e24686687 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -36,7 +36,7 @@ test: about: home: http://biogeme.epfl.ch summary: Various optimization algorithms for teaching and research - license: Custom + license: LicenseRef-BIOGEME license_file: LICENSE extra: From ba9e2a2fcc4174bdcd95d790b16e3682ee27001f Mon Sep 17 00:00:00 2001 From: Sander van Cranenburgh <91725095+sandervancranenburgh@users.noreply.github.com> Date: Fri, 30 Aug 2024 11:55:09 +0200 Subject: [PATCH 77/81] Update meta.yaml license --> LicenseRef-BIOGEME-OPTIMIZATION --- recipes/biogeme-optimization/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 9e82e24686687..232472990bd70 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -36,7 +36,7 @@ test: about: home: http://biogeme.epfl.ch summary: Various optimization algorithms for teaching and research - license: LicenseRef-BIOGEME + license: LicenseRef-BIOGEME-OPTIMIZATION license_file: LICENSE extra: From 0ee164bb782a1dc4161edee270e535e20ce6b35d Mon Sep 17 00:00:00 2001 From: Sander van Cranenburgh <91725095+sandervancranenburgh@users.noreply.github.com> Date: Fri, 30 Aug 2024 11:56:39 +0200 Subject: [PATCH 78/81] Update meta.yaml license: --> LicenseRef-BIOGEME --- recipes/biogeme/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 9e38fe78977dd..5047e709c9727 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -45,7 +45,7 @@ test: about: home: http://biogeme.epfl.ch summary: Estimation and application of discrete choice models - license: Custom + license: LicenseRef-BIOGEME license_file: LICENSE extra: From bd12db2cfed7f4b3c7cafac324dd6aab34fb5a3d Mon Sep 17 00:00:00 2001 From: Sander van Cranenburgh <91725095+sandervancranenburgh@users.noreply.github.com> Date: Fri, 30 Aug 2024 13:03:10 +0200 Subject: [PATCH 79/81] Update meta.yaml Adding setuptools to host requirements --- recipes/biogeme-optimization/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index 232472990bd70..b7f7c3d018334 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -17,6 +17,7 @@ build: requirements: host: - python >=3.7 + - setuptools >=63.4.1 - pip run: - python >=3.7 From 50c8984cea0b75ef13d7d71abfaa86bc69d3e561 Mon Sep 17 00:00:00 2001 From: Sander van Cranenburgh <91725095+sandervancranenburgh@users.noreply.github.com> Date: Fri, 30 Aug 2024 21:20:25 +0200 Subject: [PATCH 80/81] Update meta.yaml add dev_url --- recipes/biogeme/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/biogeme/meta.yaml b/recipes/biogeme/meta.yaml index 5047e709c9727..41c480d6ff3b4 100644 --- a/recipes/biogeme/meta.yaml +++ b/recipes/biogeme/meta.yaml @@ -47,6 +47,7 @@ about: summary: Estimation and application of discrete choice models license: LicenseRef-BIOGEME license_file: LICENSE + dev_url: https://github.com/michelbierlaire/biogeme extra: recipe-maintainers: From 0306cc3020e0c607becb898253e18aaade448001 Mon Sep 17 00:00:00 2001 From: Sander van Cranenburgh <91725095+sandervancranenburgh@users.noreply.github.com> Date: Fri, 30 Aug 2024 21:21:35 +0200 Subject: [PATCH 81/81] Update meta.yaml add dev_url --- recipes/biogeme-optimization/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/biogeme-optimization/meta.yaml b/recipes/biogeme-optimization/meta.yaml index b7f7c3d018334..db77de1503cf2 100644 --- a/recipes/biogeme-optimization/meta.yaml +++ b/recipes/biogeme-optimization/meta.yaml @@ -39,6 +39,7 @@ about: summary: Various optimization algorithms for teaching and research license: LicenseRef-BIOGEME-OPTIMIZATION license_file: LICENSE + dev_url: https://github.com/michelbierlaire/optimization extra: recipe-maintainers: