Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combine dev environments #2937

Merged
merged 1 commit into from
Oct 26, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Create build environment
uses: mamba-org/setup-micromamba@v1
with:
environment-file: ./libmamba/environment-dev.yml
environment-file: ./dev/environment-dev.yml
environment-name: build_env
cache-environment: true
- uses: hendrikmuhs/ccache-action@main
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
- name: create build environment
uses: mamba-org/setup-micromamba@v1
with:
environment-file: ./micromamba/environment-dev.yml
environment-file: ./dev/environment-dev.yml
environment-name: build_env
cache-environment: true
create-args: >-
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Create build environment
uses: mamba-org/setup-micromamba@v1
with:
environment-file: ./libmamba/environment-dev.yml
environment-file: ./dev/environment-dev.yml
environment-name: build_env
cache-environment: true
init-shell: bash cmd.exe
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
- name: create build environment
uses: mamba-org/setup-micromamba@v1
with:
environment-file: ./micromamba/environment-dev.yml
environment-file: ./dev/environment-dev.yml
environment-name: build_env
cache-environment: true
init-shell: bash cmd.exe
Expand Down Expand Up @@ -227,7 +227,7 @@ jobs:
- name: create build environment
uses: mamba-org/setup-micromamba@v1
with:
environment-file: ./micromamba/environment-dev.yml
environment-file: ./dev/environment-dev.yml
environment-name: build_env
create-args: >-
menuinst
Expand Down
36 changes: 22 additions & 14 deletions micromamba/environment-dev.yml → dev/environment-dev.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,38 @@
name: mamba-dev
channels:
- conda-forge
dependencies:
# libmamba build dependencies
- cxx-compiler
- cmake >=3.16
- ninja
- nlohmann_json
- simdjson >=3.3.0
- mitmproxy
- libsolv >=0.7.18
# libmamba dependencies
- cpp-expected
- fmt
- libarchive
- libsodium
- libcurl >=7.86
- gtest
- gmock
- cpp-expected
- libsodium
- libsolv >=0.7.18
- nlohmann_json
- reproc-cpp >=14.2.4.post0
- simdjson >=3.3.0
- spdlog
- yaml-cpp >=0.8.0
- sel(win): winreg
# libmamba test dependencies
- doctest
# micromamba dependencies
- cli11 >=2.2
# micromamba test dependencies
- mitmproxy
- pytest >=7.3.0
- pytest-asyncio
- pytest-lazy-fixture
- pytest-xprocess
- conda-package-handling
- pyyaml
- spdlog
- fmt <10
- sel(win): winreg
- sel(win): pywin32
# libmambapy build dependencies
- pybind11-stubgen <1.0
# libmambapy dependencies
- python
- pybind11
# dev dependencies
- pre-commit
21 changes: 0 additions & 21 deletions libmamba/environment-dev.yml

This file was deleted.

25 changes: 0 additions & 25 deletions libmambapy/environment-dev.yml

This file was deleted.