From 9040afd22787d33799f9976d906a3caef9335eca Mon Sep 17 00:00:00 2001 From: SophieCurinier Date: Tue, 17 Dec 2024 10:57:48 -0500 Subject: [PATCH 01/11] [DEVOPS-578] Add gempy_engine to conda-forge --- recipes/gempy_engine/meta.yaml | 44 ++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 recipes/gempy_engine/meta.yaml diff --git a/recipes/gempy_engine/meta.yaml b/recipes/gempy_engine/meta.yaml new file mode 100644 index 0000000000000..f872cb1ad680d --- /dev/null +++ b/recipes/gempy_engine/meta.yaml @@ -0,0 +1,44 @@ +{% set name = "gempy_engine" %} +{% set version = "2024.2.0" %} +{% set python_min = "3.10" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://pypi.org/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz + sha256: 35bd3e764305fd49955713703913e4619e12a7780439f342c0616c2c361e335a + +build: + noarch: python + script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + number: 0 + +requirements: + host: + - python {{ python_min }} + - pip + run: + - python >={{ python_min }} + - numpy + - python-dotenv >=1.0.1,<1.1.dev0 + +test: + imports: + - gempy_engine + commands: + - pip check + requires: + - python {{ python_min }} + - pip + +about: + home: https://github.com/gempy-project/gempy_engine + summary: A Python package for GemPy + license: MPL-2.0 + license_file: LICENSE + +extra: + recipe-maintainers: + - SophieCurinier From 6e77b4db553b8c3f1c5433ff2fd6ef99fa06ac83 Mon Sep 17 00:00:00 2001 From: SophieCurinier Date: Tue, 17 Dec 2024 11:06:11 -0500 Subject: [PATCH 02/11] [DEVOPS-578] Precise build backend --- recipes/gempy_engine/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/gempy_engine/meta.yaml b/recipes/gempy_engine/meta.yaml index f872cb1ad680d..65dd2f5562094 100644 --- a/recipes/gempy_engine/meta.yaml +++ b/recipes/gempy_engine/meta.yaml @@ -19,10 +19,13 @@ requirements: host: - python {{ python_min }} - pip + - setuptools run: - python >={{ python_min }} - numpy - python-dotenv >=1.0.1,<1.1.dev0 + - setuptools + - pytorch test: imports: From efd011da0e677bc9590aa566c8333ecf202b8214 Mon Sep 17 00:00:00 2001 From: SophieCurinier Date: Tue, 17 Dec 2024 11:20:06 -0500 Subject: [PATCH 03/11] [DEVOPS-578] Test if pytest works --- recipes/gempy_engine/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/gempy_engine/meta.yaml b/recipes/gempy_engine/meta.yaml index 65dd2f5562094..abe958a9978a3 100644 --- a/recipes/gempy_engine/meta.yaml +++ b/recipes/gempy_engine/meta.yaml @@ -25,16 +25,18 @@ requirements: - numpy - python-dotenv >=1.0.1,<1.1.dev0 - setuptools - - pytorch + # - pytorch test: imports: - gempy_engine commands: - pip check + - pytest requires: - python {{ python_min }} - pip + - pytest tests/fixtures/simple_models.py about: home: https://github.com/gempy-project/gempy_engine From 2de5a599cbe4d3a05c5e99226257e2603f91a197 Mon Sep 17 00:00:00 2001 From: SophieCurinier Date: Tue, 17 Dec 2024 13:46:21 -0500 Subject: [PATCH 04/11] [DEVOPS-578] Precise numpy version --- recipes/gempy_engine/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gempy_engine/meta.yaml b/recipes/gempy_engine/meta.yaml index abe958a9978a3..eab77e8d302cf 100644 --- a/recipes/gempy_engine/meta.yaml +++ b/recipes/gempy_engine/meta.yaml @@ -22,7 +22,7 @@ requirements: - setuptools run: - python >={{ python_min }} - - numpy + - numpy >=1.23 - python-dotenv >=1.0.1,<1.1.dev0 - setuptools # - pytorch From f1863db7b1516a528da7881279a27061f6ad2ec6 Mon Sep 17 00:00:00 2001 From: SophieCurinier Date: Tue, 17 Dec 2024 14:06:59 -0500 Subject: [PATCH 05/11] [DEVOPS-578] Correct test requirements --- recipes/gempy_engine/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/gempy_engine/meta.yaml b/recipes/gempy_engine/meta.yaml index eab77e8d302cf..ffb411658d7ad 100644 --- a/recipes/gempy_engine/meta.yaml +++ b/recipes/gempy_engine/meta.yaml @@ -32,11 +32,11 @@ test: - gempy_engine commands: - pip check - - pytest + - pytest tests/fixtures/simple_models.py requires: - python {{ python_min }} - pip - - pytest tests/fixtures/simple_models.py + - pytest about: home: https://github.com/gempy-project/gempy_engine From b2ece7dfa65256bd8e0f71fd52526e99dc7696fc Mon Sep 17 00:00:00 2001 From: SophieCurinier Date: Tue, 17 Dec 2024 14:38:12 -0500 Subject: [PATCH 06/11] [DEVOPS-578] Add documentation --- recipes/gempy_engine/meta.yaml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/recipes/gempy_engine/meta.yaml b/recipes/gempy_engine/meta.yaml index ffb411658d7ad..7ea125a78c623 100644 --- a/recipes/gempy_engine/meta.yaml +++ b/recipes/gempy_engine/meta.yaml @@ -24,15 +24,16 @@ requirements: - python >={{ python_min }} - numpy >=1.23 - python-dotenv >=1.0.1,<1.1.dev0 - - setuptools - # - pytorch test: + source_files: + - gempy_engine/ + - tests/ imports: - gempy_engine commands: - pip check - - pytest tests/fixtures/simple_models.py + - pytest ./tests/fixtures/simple_models.py requires: - python {{ python_min }} - pip @@ -40,9 +41,17 @@ test: about: home: https://github.com/gempy-project/gempy_engine - summary: A Python package for GemPy - license: MPL-2.0 - license_file: LICENSE + summary: A Python package necessary for GemPy. + description: | + A Python package necessary for GemPy. + + This package is not maintained by its author. + license: EUPL-1.2 + license_file: + - LICENSE + - AUTHORS.rst + doc_url: + dev_url: https://github.com/gempy-project/gempy_engine extra: recipe-maintainers: From 550210b766458b1581245c144151de2ddd39ded8 Mon Sep 17 00:00:00 2001 From: SophieCurinier Date: Tue, 17 Dec 2024 14:39:14 -0500 Subject: [PATCH 07/11] [DEVOPS-578] Correct doc_url --- recipes/gempy_engine/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/gempy_engine/meta.yaml b/recipes/gempy_engine/meta.yaml index 7ea125a78c623..b36b2447352be 100644 --- a/recipes/gempy_engine/meta.yaml +++ b/recipes/gempy_engine/meta.yaml @@ -50,7 +50,6 @@ about: license_file: - LICENSE - AUTHORS.rst - doc_url: dev_url: https://github.com/gempy-project/gempy_engine extra: From 38b73e4ea7997fdc5b9da2e17efa18e617d3b9a8 Mon Sep 17 00:00:00 2001 From: SophieCurinier Date: Tue, 17 Dec 2024 14:49:54 -0500 Subject: [PATCH 08/11] [DEVOPS-578] Add test dependencies --- recipes/gempy_engine/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/gempy_engine/meta.yaml b/recipes/gempy_engine/meta.yaml index b36b2447352be..415c79e9e9713 100644 --- a/recipes/gempy_engine/meta.yaml +++ b/recipes/gempy_engine/meta.yaml @@ -38,6 +38,10 @@ test: - python {{ python_min }} - pip - pytest + - pandas + - matplotlib-base + - pytest-benchmark + - pytest-approvaltests about: home: https://github.com/gempy-project/gempy_engine From c0c8bbb42f649060676a289aa8bc73e05dd28fe8 Mon Sep 17 00:00:00 2001 From: SophieCurinier Date: Tue, 17 Dec 2024 14:58:30 -0500 Subject: [PATCH 09/11] [DEVOPS-578] Delete pytest-approvaltests --- recipes/gempy_engine/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/gempy_engine/meta.yaml b/recipes/gempy_engine/meta.yaml index 415c79e9e9713..30d8b5bbf97e6 100644 --- a/recipes/gempy_engine/meta.yaml +++ b/recipes/gempy_engine/meta.yaml @@ -41,7 +41,6 @@ test: - pandas - matplotlib-base - pytest-benchmark - - pytest-approvaltests about: home: https://github.com/gempy-project/gempy_engine From 4dc147c82cdc31f6a9adc2e64ca7dfea306807a2 Mon Sep 17 00:00:00 2001 From: SophieCurinier Date: Tue, 17 Dec 2024 15:05:22 -0500 Subject: [PATCH 10/11] [DEVOPS-578] Cleaning --- recipes/gempy_engine/meta.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/recipes/gempy_engine/meta.yaml b/recipes/gempy_engine/meta.yaml index 30d8b5bbf97e6..ba8b2e3d15b86 100644 --- a/recipes/gempy_engine/meta.yaml +++ b/recipes/gempy_engine/meta.yaml @@ -26,21 +26,13 @@ requirements: - python-dotenv >=1.0.1,<1.1.dev0 test: - source_files: - - gempy_engine/ - - tests/ imports: - gempy_engine commands: - pip check - - pytest ./tests/fixtures/simple_models.py requires: - python {{ python_min }} - pip - - pytest - - pandas - - matplotlib-base - - pytest-benchmark about: home: https://github.com/gempy-project/gempy_engine From abce25a264f7a62102a6148b69a04ea4eb2a1dcc Mon Sep 17 00:00:00 2001 From: SophieCurinier Date: Wed, 18 Dec 2024 08:51:46 -0500 Subject: [PATCH 11/11] [DEVOPS-578] Review correction - Package name - Add setuptools_scm as a dependency - Delete the line in the description explaining that package is not maintained by its author - Remove AUTHORS.rst from the license_file list --- recipes/gempy_engine/meta.yaml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/recipes/gempy_engine/meta.yaml b/recipes/gempy_engine/meta.yaml index ba8b2e3d15b86..9a4218ffdec5f 100644 --- a/recipes/gempy_engine/meta.yaml +++ b/recipes/gempy_engine/meta.yaml @@ -1,4 +1,4 @@ -{% set name = "gempy_engine" %} +{% set name = "gempy-engine" %} {% set version = "2024.2.0" %} {% set python_min = "3.10" %} @@ -7,7 +7,7 @@ package: version: {{ version }} source: - url: https://pypi.org/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz + url: https://pypi.org/packages/source/{{ name[0] }}/{{ name }}/gempy_engine-{{ version }}.tar.gz sha256: 35bd3e764305fd49955713703913e4619e12a7780439f342c0616c2c361e335a build: @@ -20,9 +20,10 @@ requirements: - python {{ python_min }} - pip - setuptools + - setuptools_scm run: - python >={{ python_min }} - - numpy >=1.23 + - numpy - python-dotenv >=1.0.1,<1.1.dev0 test: @@ -37,14 +38,9 @@ test: about: home: https://github.com/gempy-project/gempy_engine summary: A Python package necessary for GemPy. - description: | - A Python package necessary for GemPy. - - This package is not maintained by its author. + description: A Python package necessary for GemPy. license: EUPL-1.2 - license_file: - - LICENSE - - AUTHORS.rst + license_file: LICENSE dev_url: https://github.com/gempy-project/gempy_engine extra: