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
23 changes: 23 additions & 0 deletions .github/workflows/check_packages_overlap.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Check Packages Overlap Between Spack-C2SM and Spack
on:
pull_request:
branches:
- main
push:
branches:
- main
workflow_dispatch:

jobs:
package-overlap:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
fetch-depth: 1 # --depth 1 and --shallow-submodules
submodules: recursive # --recurse-submodules

- name: Check Packages Overlap
run: |
python3 tools/package_overlap.py
9 changes: 0 additions & 9 deletions repos/c2sm/packages/ecbuild/package.py

This file was deleted.

59 changes: 0 additions & 59 deletions repos/c2sm/packages/py-hatchling/package.py

This file was deleted.

21 changes: 0 additions & 21 deletions repos/c2sm/packages/py-tabulate/package.py

This file was deleted.

21 changes: 0 additions & 21 deletions repos/c2sm/packages/py-typing-extensions/package.py

This file was deleted.

24 changes: 0 additions & 24 deletions test/common_system_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,6 @@ def test_install_cosmo_eccodes_definitions():
spack_install("cosmo-eccodes-definitions")


def test_install_ecbuild():
# Tests are disabled because they fail with:
# The following tests FAILED:
# 1 - ECBUILD-359 (Failed)
# 2 - ECBUILD-401 (Failed)
# 8 - ECBUILD-511 (Failed)
# 11 - bundle-subdir-std (Failed)
# 12 - bundle-subdir-ecbfind (Failed)
# 17 - test_ecbuild_find_package (Failed)
spack_install("ecbuild @3.7.2", test_root=False)


def test_install_makedepf90():
# Tests are disabled because they fail with:
# test1.sh: No such file or directory
Expand Down Expand Up @@ -58,21 +46,9 @@ def test_install_py_gridtools_cpp():
spack_install("py-gridtools-cpp")


def test_install_py_hatchling():
spack_install("py-hatchling")


def test_install_py_inflection():
spack_install("py-inflection")


def test_install_py_pytest_factoryboy():
spack_install("py-pytest-factoryboy")


def test_install_py_tabulate():
spack_install("py-tabulate")


def test_install_py_typing_extensions():
spack_install("py-typing-extensions")
19 changes: 17 additions & 2 deletions tools/package_overlap.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
import os
import sys

spack = set(os.listdir("./spack/var/spack/repos/builtin/packages"))
spack_c2sm = set(os.listdir("./repos/c2sm/packages"))

for folder in sorted(spack & spack_c2sm):
print(folder)
overlapping_packages = sorted(spack & spack_c2sm)

# Allow duplicate icon package only before update to Spack v1.1
overlapping_packages.remove("icon")

if not overlapping_packages:
print("::notice::No overlapping packages!")
else:
print("::error::Found overlapping packages between Spack-C2SM and Spack repos")

print("::group::Overlapping packages")
for package in overlapping_packages:
print(package)
print("::endgroup::")

sys.exit(1)
Loading