Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions .github/workflows/python.yml

This file was deleted.

90 changes: 0 additions & 90 deletions .github/workflows/release.yml

This file was deleted.

9 changes: 1 addition & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${PROJECT_SOURCE_DIR}/cmake")

option(MECH_CONFIG_ENABLE_TESTS "Build the tests" ON)
option(MECH_CONFIG_ENABLE_PYTHON_LIBRARY "Build the python library" ON)
option(MECH_CONFIG_ENABLE_PIC "Build the library with position independent code" ON)
option(MECH_CONFIG_ENABLE_COVERAGE "Enable code coverage output" OFF)

Expand All @@ -39,12 +38,6 @@ include(cmake/dependencies.cmake)

add_subdirectory(src)

################################################################################
# python
if(MECH_CONFIG_ENABLE_PYTHON_LIBRARY)
add_subdirectory(mechanism_configuration)
endif()

################################################################################
# Tests

Expand Down Expand Up @@ -74,6 +67,6 @@ endif()
# Packaging

# only include packaging if we are the top level project being built
if(PROJECT_IS_TOP_LEVEL AND NOT MECH_CONFIG_ENABLE_PYTHON_LIBRARY)
if(PROJECT_IS_TOP_LEVEL)
add_subdirectory(packaging)
endif()
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ An attempt at defining a model-independent configuration schema for atmospheric
[![Windows](https://github.com/ncar/MechanismConfiguration/actions/workflows/windows.yml/badge.svg)](https://github.com/ncar/MechanismConfiguration/actions/workflows/windows.yml)
[![Mac](https://github.com/ncar/MechanismConfiguration/actions/workflows/mac.yml/badge.svg)](https://github.com/ncar/MechanismConfiguration/actions/workflows/mac.yml)
[![Ubuntu](https://github.com/ncar/MechanismConfiguration/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/ncar/MechanismConfiguration/actions/workflows/ubuntu.yml)
[![PyPI version](https://badge.fury.io/py/mechanism_configuration.svg)](https://pypi.org/p/mechanism_configuration)
[![codecov](https://codecov.io/gh/NCAR/MechanismConfiguration/branch/main/graph/badge.svg)](https://codecov.io/gh/NCAR/MechanismConfiguration)
[![DOI](https://zenodo.org/badge/668458983.svg)](https://doi.org/10.5281/zenodo.15116380)

Expand Down
20 changes: 1 addition & 19 deletions cmake/dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,4 @@ FetchContent_Declare(yaml-cpp

set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "" FORCE)

FetchContent_MakeAvailable(yaml-cpp)

################################################################################
# pybind11

if(MECH_CONFIG_ENABLE_PYTHON_LIBRARY)
set(PYBIND11_NEWPYTHON ON)

set_git_default(PYBIND11_GIT_REPOSITORY https://github.com/pybind/pybind11)
set_git_default(PYBIND11_GIT_TAG v2.12.0)

FetchContent_Declare(pybind11
GIT_REPOSITORY ${PYBIND11_GIT_REPOSITORY}
GIT_TAG ${PYBIND11_GIT_TAG}
GIT_PROGRESS NOT ${FETCHCONTENT_QUIET}
)

FetchContent_MakeAvailable(pybind11)
endif()
FetchContent_MakeAvailable(yaml-cpp)
8 changes: 0 additions & 8 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,13 @@ RUN dnf -y update \
gdb \
git \
make \
python3 \
python3-devel \
python3-pip \
python3-setuptools \
&& dnf clean all

COPY . /mechanism_configuration/

ENV CXX=g++
ENV CC=gcc

RUN cd /mechanism_configuration \
&& python3 -m pip install --upgrade wheel setuptools \
&& pip3 install --verbose .[test]

RUN mkdir /build \
&& cd /build \
&& cmake \
Expand Down
1 change: 0 additions & 1 deletion docker/Dockerfile.coverage
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ RUN dnf -y update \
git \
lcov \
make \
python-devel \
&& dnf clean all

COPY . /mechanism_configuration/
Expand Down
34 changes: 0 additions & 34 deletions mechanism_configuration/CMakeLists.txt

This file was deleted.

2 changes: 0 additions & 2 deletions mechanism_configuration/__init__.py

This file was deleted.

Loading