From e1ffaeea6f9805bce80ef866740516bf92ee1d35 Mon Sep 17 00:00:00 2001 From: Francesc Torradeflot Date: Tue, 4 Jun 2024 14:31:54 +0200 Subject: [PATCH 1/3] Move lace to src folder --- {lace => src/lace}/__init__.py | 0 {lace => src/lace}/archive/__init__.py | 0 {lace => src/lace}/archive/base_archive.py | 0 {lace => src/lace}/archive/gadget_archive.py | 0 {lace => src/lace}/archive/nyx_archive.py | 0 {lace => src/lace}/cosmo/__init__.py | 0 {lace => src/lace}/cosmo/camb_cosmo.py | 0 {lace => src/lace}/cosmo/fit_linP.py | 0 {lace => src/lace}/cosmo/thermal_broadening.py | 0 {lace => src/lace}/emulator/__init__.py | 0 {lace => src/lace}/emulator/base_emulator.py | 0 {lace => src/lace}/emulator/emulator_manager.py | 0 {lace => src/lace}/emulator/gp_emulator.py | 0 {lace => src/lace}/emulator/nn_architecture.py | 0 {lace => src/lace}/emulator/nn_emulator.py | 0 {lace => src/lace}/setup_simulations/__init__.py | 0 {lace => src/lace}/setup_simulations/read_gadget.py | 0 {lace => src/lace}/setup_simulations/read_genic.py | 0 {lace => src/lace}/utils/__init__.py | 0 {lace => src/lace}/utils/distance_to_center.py | 0 {lace => src/lace}/utils/exceptions.py | 0 {lace => src/lace}/utils/misc.py | 0 {lace => src/lace}/utils/nonlinear_smoothing_p1d.py | 0 {lace => src/lace}/utils/poly_p1d.py | 0 {lace => src/lace}/utils/smoothing_manager.py | 0 25 files changed, 0 insertions(+), 0 deletions(-) rename {lace => src/lace}/__init__.py (100%) rename {lace => src/lace}/archive/__init__.py (100%) rename {lace => src/lace}/archive/base_archive.py (100%) rename {lace => src/lace}/archive/gadget_archive.py (100%) rename {lace => src/lace}/archive/nyx_archive.py (100%) rename {lace => src/lace}/cosmo/__init__.py (100%) rename {lace => src/lace}/cosmo/camb_cosmo.py (100%) rename {lace => src/lace}/cosmo/fit_linP.py (100%) rename {lace => src/lace}/cosmo/thermal_broadening.py (100%) rename {lace => src/lace}/emulator/__init__.py (100%) rename {lace => src/lace}/emulator/base_emulator.py (100%) rename {lace => src/lace}/emulator/emulator_manager.py (100%) rename {lace => src/lace}/emulator/gp_emulator.py (100%) rename {lace => src/lace}/emulator/nn_architecture.py (100%) rename {lace => src/lace}/emulator/nn_emulator.py (100%) rename {lace => src/lace}/setup_simulations/__init__.py (100%) rename {lace => src/lace}/setup_simulations/read_gadget.py (100%) rename {lace => src/lace}/setup_simulations/read_genic.py (100%) rename {lace => src/lace}/utils/__init__.py (100%) rename {lace => src/lace}/utils/distance_to_center.py (100%) rename {lace => src/lace}/utils/exceptions.py (100%) rename {lace => src/lace}/utils/misc.py (100%) rename {lace => src/lace}/utils/nonlinear_smoothing_p1d.py (100%) rename {lace => src/lace}/utils/poly_p1d.py (100%) rename {lace => src/lace}/utils/smoothing_manager.py (100%) diff --git a/lace/__init__.py b/src/lace/__init__.py similarity index 100% rename from lace/__init__.py rename to src/lace/__init__.py diff --git a/lace/archive/__init__.py b/src/lace/archive/__init__.py similarity index 100% rename from lace/archive/__init__.py rename to src/lace/archive/__init__.py diff --git a/lace/archive/base_archive.py b/src/lace/archive/base_archive.py similarity index 100% rename from lace/archive/base_archive.py rename to src/lace/archive/base_archive.py diff --git a/lace/archive/gadget_archive.py b/src/lace/archive/gadget_archive.py similarity index 100% rename from lace/archive/gadget_archive.py rename to src/lace/archive/gadget_archive.py diff --git a/lace/archive/nyx_archive.py b/src/lace/archive/nyx_archive.py similarity index 100% rename from lace/archive/nyx_archive.py rename to src/lace/archive/nyx_archive.py diff --git a/lace/cosmo/__init__.py b/src/lace/cosmo/__init__.py similarity index 100% rename from lace/cosmo/__init__.py rename to src/lace/cosmo/__init__.py diff --git a/lace/cosmo/camb_cosmo.py b/src/lace/cosmo/camb_cosmo.py similarity index 100% rename from lace/cosmo/camb_cosmo.py rename to src/lace/cosmo/camb_cosmo.py diff --git a/lace/cosmo/fit_linP.py b/src/lace/cosmo/fit_linP.py similarity index 100% rename from lace/cosmo/fit_linP.py rename to src/lace/cosmo/fit_linP.py diff --git a/lace/cosmo/thermal_broadening.py b/src/lace/cosmo/thermal_broadening.py similarity index 100% rename from lace/cosmo/thermal_broadening.py rename to src/lace/cosmo/thermal_broadening.py diff --git a/lace/emulator/__init__.py b/src/lace/emulator/__init__.py similarity index 100% rename from lace/emulator/__init__.py rename to src/lace/emulator/__init__.py diff --git a/lace/emulator/base_emulator.py b/src/lace/emulator/base_emulator.py similarity index 100% rename from lace/emulator/base_emulator.py rename to src/lace/emulator/base_emulator.py diff --git a/lace/emulator/emulator_manager.py b/src/lace/emulator/emulator_manager.py similarity index 100% rename from lace/emulator/emulator_manager.py rename to src/lace/emulator/emulator_manager.py diff --git a/lace/emulator/gp_emulator.py b/src/lace/emulator/gp_emulator.py similarity index 100% rename from lace/emulator/gp_emulator.py rename to src/lace/emulator/gp_emulator.py diff --git a/lace/emulator/nn_architecture.py b/src/lace/emulator/nn_architecture.py similarity index 100% rename from lace/emulator/nn_architecture.py rename to src/lace/emulator/nn_architecture.py diff --git a/lace/emulator/nn_emulator.py b/src/lace/emulator/nn_emulator.py similarity index 100% rename from lace/emulator/nn_emulator.py rename to src/lace/emulator/nn_emulator.py diff --git a/lace/setup_simulations/__init__.py b/src/lace/setup_simulations/__init__.py similarity index 100% rename from lace/setup_simulations/__init__.py rename to src/lace/setup_simulations/__init__.py diff --git a/lace/setup_simulations/read_gadget.py b/src/lace/setup_simulations/read_gadget.py similarity index 100% rename from lace/setup_simulations/read_gadget.py rename to src/lace/setup_simulations/read_gadget.py diff --git a/lace/setup_simulations/read_genic.py b/src/lace/setup_simulations/read_genic.py similarity index 100% rename from lace/setup_simulations/read_genic.py rename to src/lace/setup_simulations/read_genic.py diff --git a/lace/utils/__init__.py b/src/lace/utils/__init__.py similarity index 100% rename from lace/utils/__init__.py rename to src/lace/utils/__init__.py diff --git a/lace/utils/distance_to_center.py b/src/lace/utils/distance_to_center.py similarity index 100% rename from lace/utils/distance_to_center.py rename to src/lace/utils/distance_to_center.py diff --git a/lace/utils/exceptions.py b/src/lace/utils/exceptions.py similarity index 100% rename from lace/utils/exceptions.py rename to src/lace/utils/exceptions.py diff --git a/lace/utils/misc.py b/src/lace/utils/misc.py similarity index 100% rename from lace/utils/misc.py rename to src/lace/utils/misc.py diff --git a/lace/utils/nonlinear_smoothing_p1d.py b/src/lace/utils/nonlinear_smoothing_p1d.py similarity index 100% rename from lace/utils/nonlinear_smoothing_p1d.py rename to src/lace/utils/nonlinear_smoothing_p1d.py diff --git a/lace/utils/poly_p1d.py b/src/lace/utils/poly_p1d.py similarity index 100% rename from lace/utils/poly_p1d.py rename to src/lace/utils/poly_p1d.py diff --git a/lace/utils/smoothing_manager.py b/src/lace/utils/smoothing_manager.py similarity index 100% rename from lace/utils/smoothing_manager.py rename to src/lace/utils/smoothing_manager.py From 8ef5f1aa5a395edd4651c01cb0f413c436a4cea0 Mon Sep 17 00:00:00 2001 From: Francesc Torradeflot Date: Tue, 4 Jun 2024 14:34:38 +0200 Subject: [PATCH 2/3] Remove unnecessary package info in pyproject.toml --- .gitignore | 1 + pyproject.toml | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6b93678c..f48b71ad 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ notebooks/*.ipynb lace.egg-info/ */__pycache__/ */*/__pycache__/ +build diff --git a/pyproject.toml b/pyproject.toml index a105e881..ee961b71 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,11 +71,7 @@ explicit = [ "GPy==1.13.1", ] -[tool.setuptools.packages.find] -include = ["lace"] -namespaces = false - [project.urls] Homepage="https://github.com/igmhub/LaCE" Repository="https://github.com/igmhub/LaCE.git" -Issues="https://github.com/igmhub/LaCE/issues" \ No newline at end of file +Issues="https://github.com/igmhub/LaCE/issues" From 32b8fe985920b2a64785d17905e2c645c08a71ab Mon Sep 17 00:00:00 2001 From: Francesc Torradeflot Date: Tue, 4 Jun 2024 14:45:03 +0200 Subject: [PATCH 3/3] Add the hability to run the ci/cd on demand --- .github/workflows/python-tests.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index 11fdc18e..155da02b 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -1,7 +1,11 @@ # .github/workflows/python-tests.yml name: LaCE automated testing -on: [push] +on: + push: + branches: '*' + workflow_dispatch: + jobs: build: