From 97a50c1d45e2b61d83d02b60268a136cbcfa1b9a Mon Sep 17 00:00:00 2001 From: Nick Wogan Date: Thu, 26 Sep 2024 16:32:11 -0700 Subject: [PATCH] removed python test --- .github/workflows/test.yaml | 4 ---- examples/ModernEarth/settings.yaml | 2 +- photochem/cython/Atmosphere.pyx | 1 - photochem/cython/EvoAtmosphere.pyx | 1 - photochem/cython/_photochem.pyx | 1 + src/dependencies/CMakeLists.txt | 4 ++-- 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 153c7fe..06e4cd7 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -48,7 +48,3 @@ jobs: - name: build python run: python -m pip install . -v - - - name: test python - working-directory: ${{github.workspace}}/tests - run: python test.py \ No newline at end of file diff --git a/examples/ModernEarth/settings.yaml b/examples/ModernEarth/settings.yaml index 40d691d..77bc335 100644 --- a/examples/ModernEarth/settings.yaml +++ b/examples/ModernEarth/settings.yaml @@ -52,7 +52,7 @@ boundary-conditions: lower-boundary: {type: press, press: 360.0} upper-boundary: {type: veff, veff: 0.0} - name: CH4 - lower-boundary: {type: flux, flux: 1.0e11} + lower-boundary: {type: flux, flux: 9.0e10} upper-boundary: {type: veff, veff: 0.0} - name: CO lower-boundary: {type: press, press: 0.11} diff --git a/photochem/cython/Atmosphere.pyx b/photochem/cython/Atmosphere.pyx index ae8ca7d..0d02bc3 100644 --- a/photochem/cython/Atmosphere.pyx +++ b/photochem/cython/Atmosphere.pyx @@ -50,7 +50,6 @@ cdef class Atmosphere: self._init_called = True if data_dir == None: - import photochem_clima_data data_dir_ = photochem_clima_data.DATA_DIR else: data_dir_ = data_dir diff --git a/photochem/cython/EvoAtmosphere.pyx b/photochem/cython/EvoAtmosphere.pyx index f9747de..6c9c4fe 100644 --- a/photochem/cython/EvoAtmosphere.pyx +++ b/photochem/cython/EvoAtmosphere.pyx @@ -51,7 +51,6 @@ cdef class EvoAtmosphere: self._init_called = True if data_dir == None: - import photochem_clima_data data_dir_ = photochem_clima_data.DATA_DIR else: data_dir_ = data_dir diff --git a/photochem/cython/_photochem.pyx b/photochem/cython/_photochem.pyx index 4678fd4..db94ac5 100644 --- a/photochem/cython/_photochem.pyx +++ b/photochem/cython/_photochem.pyx @@ -6,6 +6,7 @@ from cpython.object cimport PyObject_GenericSetAttr import numpy as np import ctypes as ct import os +import photochem_clima_data DEF S_STR_LEN = 20; DEF M_STR_LEN = 100; diff --git a/src/dependencies/CMakeLists.txt b/src/dependencies/CMakeLists.txt index 8b2ac92..4cbadf2 100644 --- a/src/dependencies/CMakeLists.txt +++ b/src/dependencies/CMakeLists.txt @@ -49,7 +49,7 @@ CPMAddPackage( CPMAddPackage( NAME clima - VERSION 0.5.1 + VERSION 0.5.2 OPTIONS "BUILD_EXECUTABLE OFF" "BUILD_WITH_OPENMP ${BUILD_WITH_OPENMP}" @@ -57,7 +57,7 @@ CPMAddPackage( "BUILD_PYTHON_CLIMA ${BUILD_PYTHON_PHOTOCHEM}" "PYTHON_CLIMA_DESTINATION photochem" GITHUB_REPOSITORY "Nicholaswogan/clima" - GIT_TAG "v0.5.1" + GIT_TAG "v0.5.2" EXCLUDE_FROM_ALL OFF )