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

Revert "Test Ci/Cd" #20

Merged
merged 26 commits into from
Feb 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
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
42 changes: 0 additions & 42 deletions .github/workflows/backward_compatibility.yml

This file was deleted.

21 changes: 1 addition & 20 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install build
# - name: Git tag version
# id: git_tag_version
# run: |
# # Extract the version from the tag (e.g., 'v1.0.0' becomes '1.0.0')
# GIT_TAG_VERSION=${GITHUB_REF#refs/tags/v}
# echo "GIT_TAG_VERSION=$GIT_TAG_VERSION" >> $GITHUB_ENV
# echo "Version from Git tag: $GIT_TAG_VERSION"
# - name: Citation version
# id: citation_version
# run: |
# # Parse the version from the CITATION.cff file
# CITATION_VERSION=$(grep '^version:' CITATION.cff | cut -d' ' -f2)
# echo "CITATION_VERSION=$CITATION_VERSION" >> $GITHUB_ENV
# echo "Version from CITATION.cff: $CITATION_VERSION"
# - name: Compare versions
# run: |
# if [ "$GIT_TAG_VERSION" != "$CITATION_VERSION" ]; then
# echo "Version mismatch: Git tag version is $GIT_TAG_VERSION, CITATION.cff version is $CITATION_VERSION"
# exit 1
# fi

- name: Build package
run: python -m build
- name: Publish package
Expand Down
68 changes: 68 additions & 0 deletions .github/workflows/publish_compatibility_with_pynxtools.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: Publish Compatibility with Pynxtools

on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
publish_compatibility:
runs-on: ubuntu-latest
strategy:
fail-fast: false
# TODO check Disable this test from block merge request
matrix:
pynxtools_versions: ["latest_release", "v0.9.3"]
# pynxtools_versions: ["master"]
python-versions: ["3.11"]

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive

- name: Install uv && Set up Python ${{ matrix.python-versions }}
uses: astral-sh/setup-uv@v5
with:
python-version: ${{ matrix.python-versions }}
version: "0.6.2"

- name: Install nomad
if: "${{ matrix.python_versions != '3.8'}}"
run: |
uv pip uninstall nomad-lab -q
uv pip install nomad-lab[infrastructure]@git+https://gitlab.mpcdf.mpg.de/nomad-lab/nomad-FAIR.git

- name: Install dependencies
run: |
uv pip install --upgrade pip
uv pip install coverage coveralls

- name: Install pynxtools version ${{ matrix.pynxtools_versions }}
run: |
PYNXTOOLS_VERSION="${{ matrix.pynxtools_versions }}"
uv pip uninstall pynxtools -q
# if [ "$PYNXTOOLS_VERSION" == "master" ]; then
# uv pip install pynxtools@git+https://github.com/FAIRmat-NFDI/pynxtools@${{ matrix.pynxtools_versions }}

if [ "$PYNXTOOLS_VERSION" == "latest_release" ]; then
uv pip install pynxtools
else
uv pip install pynxtools==${{ matrix.pynxtools_versions }}
fi

- name: Install pynxtools-spm
run: |
uv pip install .[dev]

- name: Run Reader tests
run: |
pytest tests/test_reader.py
continue-on-error: true

- name: Run Nomad Examples tests
run: |
pytest tests/test_nomad_examples.py
continue-on-error: true
4 changes: 2 additions & 2 deletions .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.11
- name: Set up Python 3.10
uses: actions/setup-python@v2
with:
python-version: "3.11"
python-version: "3.10"
- name: Install dependencies
run: |
git submodule sync --recursive
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
fail-fast: false
matrix:
python_version: ["3.10", "3.11", "3.12"]
pynxtools_versions: ["master"]

steps:
- uses: actions/checkout@v4
Expand All @@ -30,6 +31,18 @@ jobs:
run: |
python -m pip install --upgrade pip
curl -LsSf https://astral.sh/uv/install.sh | sh
- name: Install pynxtools version ${{ matrix.pynxtools_versions }}
run: |
PYNXTOOLS_VERSION="${{ matrix.pynxtools_versions }}"
uv pip uninstall pynxtools -q
if [ "$PYNXTOOLS_VERSION" == "master" ]; then
uv pip install pynxtools@git+https://github.com/FAIRmat-NFDI/pynxtools@${{ matrix.pynxtools_versions }}

elif [ "$PYNXTOOLS_VERSION" == "latest_release" ]; then
uv pip install pynxtools
else
uv pip install pynxtools==${{ matrix.pynxtools_versions }}
fi
- name: Install nomad
if: "${{ matrix.python_version != '3.8'}}"
run: |
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@
![](https://coveralls.io/repos/github/FAIRmat-NFDI/pynxtools_spm/badge.svg?branch=master)

# STS reader

For proper docs please follow the link in [GitHub documentation page](https://FAIRmat-NFDI.github.io/pynxtools-spm/)
Loading
Loading