From b0907f63cee0f3e2598ab3dbca51fbcec71193ab Mon Sep 17 00:00:00 2001 From: judewells Date: Tue, 27 Aug 2024 19:55:27 +0100 Subject: [PATCH 1/3] debug windows --- .github/workflows/all_os_ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/all_os_ci.yml b/.github/workflows/all_os_ci.yml index 9b1b3c3..b12047e 100644 --- a/.github/workflows/all_os_ci.yml +++ b/.github/workflows/all_os_ci.yml @@ -7,8 +7,8 @@ jobs: test: strategy: matrix: - os: [ubuntu-latest, windows-latest] #[ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.8', '3.11'] + os: [windows-latest] #[ubuntu-latest, windows-latest, macos-latest] + python-version: ['3.10'] runs-on: ${{ matrix.os }} steps: From cb8df77fdfe45a0ab383644ecdc0b2e366ff3e3e Mon Sep 17 00:00:00 2001 From: judewells Date: Wed, 28 Aug 2024 15:17:46 +0100 Subject: [PATCH 2/3] update workflows --- .../workflows/mac_ubuntu_all_python_test.yml | 63 +++++++++++++++++++ .gitignore | 2 +- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/mac_ubuntu_all_python_test.yml diff --git a/.github/workflows/mac_ubuntu_all_python_test.yml b/.github/workflows/mac_ubuntu_all_python_test.yml new file mode 100644 index 0000000..947c522 --- /dev/null +++ b/.github/workflows/mac_ubuntu_all_python_test.yml @@ -0,0 +1,63 @@ +name: Test Installation on mac+linux and all Python versions + +on: + workflow_dispatch: + +jobs: + test: + strategy: + matrix: + os: [ubuntu-latest, macos-latest] + python-version: ['3.8', '3.9', '3.10', '3.11'] + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v3 + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + + - name: Set up MSYS2 (Windows only) + if: runner.os == 'Windows' + uses: msys2/setup-msys2@v2 + with: + update: true + install: base-devel gcc + + - name: Install dependencies and run setup script + shell: bash + run: | + if [ "$RUNNER_OS" == "Windows" ]; then + export PATH="/c/msys64/usr/bin:$PATH" + fi + python --version + which python + chmod +x setup.sh + ./setup.sh + + - name: Test installation + shell: bash + run: | + if [ "$RUNNER_OS" == "Windows" ]; then + source chswEnv/Scripts/activate + else + source chswEnv/bin/activate + fi + python get_predictions.py --structure_file example_files/AF-A0A1W2PQ64-F1-model_v4.pdb --output results/test.tsv + + - name: Run pytest + shell: bash + run: | + if [ "$RUNNER_OS" == "Windows" ]; then + export PATH="/c/msys64/usr/bin:$PATH" + source chswEnv/Scripts/activate + else + source chswEnv/bin/activate + fi + python -c "import sys; print(sys.path)" + python -c "import torch; print(torch.__version__)" + pwd + pytest -v + pytest \ No newline at end of file diff --git a/.gitignore b/.gitignore index 8c33d35..a1a0652 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,4 @@ stride/* !stride/stride.tgz .vscode/ model_v3_predictions* - +chswEnv/ From c0d15d985d6af450730e587b8f9bcb7507183961 Mon Sep 17 00:00:00 2001 From: judewells Date: Wed, 28 Aug 2024 15:26:35 +0100 Subject: [PATCH 3/3] delete windows --- .github/workflows/all_os_ci.yml | 58 ------------------- .../workflows/mac_ubuntu_all_python_test.yml | 4 +- 2 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 .github/workflows/all_os_ci.yml diff --git a/.github/workflows/all_os_ci.yml b/.github/workflows/all_os_ci.yml deleted file mode 100644 index b12047e..0000000 --- a/.github/workflows/all_os_ci.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: Test Installation on all OS and all Python versions - -on: - workflow_dispatch: - -jobs: - test: - strategy: - matrix: - os: [windows-latest] #[ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.10'] - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v3 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - - name: Set up MSYS2 (Windows only) - if: runner.os == 'Windows' - uses: msys2/setup-msys2@v2 - with: - update: true - install: base-devel gcc - - - name: Install dependencies and run setup script - shell: bash - run: | - if [ "$RUNNER_OS" == "Windows" ]; then - export PATH="/c/msys64/usr/bin:$PATH" - fi - python --version - which python - chmod +x setup.sh - ./setup.sh - - - name: Test installation - shell: bash - run: | - if [ "$RUNNER_OS" == "Windows" ]; then - source chswEnv/Scripts/activate - else - source chswEnv/bin/activate - fi - python get_predictions.py --structure_file example_files/AF-A0A1W2PQ64-F1-model_v4.pdb --output results/test.tsv - - - name: Run pytest - shell: bash - run: | - if [ "$RUNNER_OS" == "Windows" ]; then - source chswEnv/Scripts/activate - else - source chswEnv/bin/activate - fi - pytest \ No newline at end of file diff --git a/.github/workflows/mac_ubuntu_all_python_test.yml b/.github/workflows/mac_ubuntu_all_python_test.yml index 947c522..6e27d90 100644 --- a/.github/workflows/mac_ubuntu_all_python_test.yml +++ b/.github/workflows/mac_ubuntu_all_python_test.yml @@ -1,4 +1,4 @@ -name: Test Installation on mac+linux and all Python versions +name: Test Installation on mac linux and all Python versions on: workflow_dispatch: @@ -7,7 +7,7 @@ jobs: test: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest] #[ubuntu-latest, windows-latest, macos-latest] python-version: ['3.8', '3.9', '3.10', '3.11'] runs-on: ${{ matrix.os }}