MilesCranmer commited on
Commit
5698780
1 Parent(s): 422ae17

Get CI suite to use test CLI

Browse files
.github/workflows/CI.yml CHANGED
@@ -60,17 +60,17 @@ jobs:
60
  - name: "Install Coverage tool"
61
  run: pip install coverage coveralls
62
  - name: "Run tests"
63
- run: coverage run --source=pysr --omit='*/test/*,*/feynman_problems.py' -m unittest pysr.test.test
64
  - name: "Install JAX"
65
  run: pip install jax jaxlib # (optional import)
66
  - name: "Run JAX tests"
67
- run: coverage run --append --source=pysr --omit='*/test/*,*/feynman_problems.py' -m unittest pysr.test.test_jax
68
  - name: "Install Torch"
69
  run: pip install torch # (optional import)
70
  - name: "Run Torch tests"
71
- run: coverage run --append --source=pysr --omit='*/test/*,*/feynman_problems.py' -m unittest pysr.test.test_torch
72
  - name: "Run custom env tests"
73
- run: coverage run --append --source=pysr --omit='*/test/*,*/feynman_problems.py' -m unittest pysr.test.test_env
74
  - name: Coveralls
75
  env:
76
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -113,7 +113,7 @@ jobs:
113
  miniforge-version: latest
114
  auto-activate-base: true
115
  python-version: ${{ matrix.python-version }}
116
- activate-environment: test
117
  environment-file: environment.yml
118
  - name: "Install PySR"
119
  run: |
@@ -122,9 +122,9 @@ jobs:
122
  - name: "Install Coverage tool"
123
  run: python3 -m pip install coverage coveralls
124
  - name: "Run tests"
125
- run: coverage run --append --source=pysr --omit='*/test/*,*/feynman_problems.py' -m unittest pysr.test.test
126
  - name: "Run custom env tests"
127
- run: coverage run --append --source=pysr --omit='*/test/*,*/feynman_problems.py' -m unittest pysr.test.test_env
128
  - name: Coveralls
129
  env:
130
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
60
  - name: "Install Coverage tool"
61
  run: pip install coverage coveralls
62
  - name: "Run tests"
63
+ run: coverage run --source=pysr --omit='*/test/*,*/feynman_problems.py' -m pysr.test main
64
  - name: "Install JAX"
65
  run: pip install jax jaxlib # (optional import)
66
  - name: "Run JAX tests"
67
+ run: coverage run --append --source=pysr --omit='*/test/*,*/feynman_problems.py' -m pysr.test jax
68
  - name: "Install Torch"
69
  run: pip install torch # (optional import)
70
  - name: "Run Torch tests"
71
+ run: coverage run --append --source=pysr --omit='*/test/*,*/feynman_problems.py' -m pysr.test torch
72
  - name: "Run custom env tests"
73
+ run: coverage run --append --source=pysr --omit='*/test/*,*/feynman_problems.py' -m pysr.test env
74
  - name: Coveralls
75
  env:
76
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
113
  miniforge-version: latest
114
  auto-activate-base: true
115
  python-version: ${{ matrix.python-version }}
116
+ activate-environment: pysr-test
117
  environment-file: environment.yml
118
  - name: "Install PySR"
119
  run: |
 
122
  - name: "Install Coverage tool"
123
  run: python3 -m pip install coverage coveralls
124
  - name: "Run tests"
125
+ run: coverage run --append --source=pysr --omit='*/test/*,*/feynman_problems.py' -m pysr.test main
126
  - name: "Run custom env tests"
127
+ run: coverage run --append --source=pysr --omit='*/test/*,*/feynman_problems.py' -m pysr.test env
128
  - name: Coveralls
129
  env:
130
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
.github/workflows/CI_Windows.yml CHANGED
@@ -58,10 +58,10 @@ jobs:
58
  python setup.py install
59
  python -c 'import pysr; pysr.install()'
60
  - name: "Run tests"
61
- run: python -m unittest pysr.test.test
62
  - name: "Install Torch"
63
  run: pip install torch # (optional import)
64
  - name: "Run Torch tests"
65
- run: python -m unittest pysr.test.test_torch
66
  - name: "Run custom env tests"
67
- run: python -m unittest pysr.test.test_env
 
58
  python setup.py install
59
  python -c 'import pysr; pysr.install()'
60
  - name: "Run tests"
61
+ run: python -m pysr.test main
62
  - name: "Install Torch"
63
  run: pip install torch # (optional import)
64
  - name: "Run Torch tests"
65
+ run: python -m pysr.test torch
66
  - name: "Run custom env tests"
67
+ run: python -m pysr.test env
.github/workflows/CI_docker.yml CHANGED
@@ -38,4 +38,4 @@ jobs:
38
  - name: Build docker
39
  run: docker build -t pysr --build-arg ARCH=${{ matrix.arch }} --build-arg VERSION=${{ matrix.julia-version }} --build-arg PYVERSION=${{ matrix.python-version }} .
40
  - name: Test docker
41
- run: docker run --platform=${{ matrix.arch }} --rm pysr /bin/bash -c 'python3 -m unittest pysr.test.test && python3 -m unittest pysr.test.test_env'
 
38
  - name: Build docker
39
  run: docker build -t pysr --build-arg ARCH=${{ matrix.arch }} --build-arg VERSION=${{ matrix.julia-version }} --build-arg PYVERSION=${{ matrix.python-version }} .
40
  - name: Test docker
41
+ run: docker run --platform=${{ matrix.arch }} --rm pysr /bin/bash -c 'python3 -m pysr.test main && python3 -m pysr.test env'
.github/workflows/CI_docker_large_nightly.yml CHANGED
@@ -31,4 +31,4 @@ jobs:
31
  - name: Build docker
32
  run: docker build -t pysr --build-arg ARCH=${{ matrix.arch }} --build-arg VERSION=${{ matrix.julia-version }} --build-arg PYVERSION=${{ matrix.python-version }} .
33
  - name: Test docker
34
- run: docker run --platform=${{ matrix.arch }} --rm pysr /bin/bash -c 'python3 -m unittest pysr.test.test && python3 -m unittest pysr.test.test_env'
 
31
  - name: Build docker
32
  run: docker build -t pysr --build-arg ARCH=${{ matrix.arch }} --build-arg VERSION=${{ matrix.julia-version }} --build-arg PYVERSION=${{ matrix.python-version }} .
33
  - name: Test docker
34
+ run: docker run --platform=${{ matrix.arch }} --rm pysr /bin/bash -c 'python3 -m pysr.test main && python3 -m pysr.test env'
.github/workflows/CI_large_nightly.yml CHANGED
@@ -41,7 +41,7 @@ jobs:
41
  python setup.py install
42
  python -c 'import pysr; pysr.install()'
43
  - name: "Run tests"
44
- run: python -m unittest pysr.test.test
45
  - name: "Run new env test"
46
- run: python -m unittest pysr.test.test_env
47
  if: ${{ !(matrix.os == 'windows-latest' && matrix.python-version == '3.7') }}
 
41
  python setup.py install
42
  python -c 'import pysr; pysr.install()'
43
  - name: "Run tests"
44
+ run: python -m pysr.test main
45
  - name: "Run new env test"
46
+ run: python -m pysr.test env
47
  if: ${{ !(matrix.os == 'windows-latest' && matrix.python-version == '3.7') }}
.github/workflows/CI_mac.yml CHANGED
@@ -58,14 +58,14 @@ jobs:
58
  python setup.py install
59
  python -c 'import pysr; pysr.install()'
60
  - name: "Run tests"
61
- run: python -m unittest pysr.test.test
62
  - name: "Install JAX"
63
  run: pip install jax jaxlib # (optional import)
64
  - name: "Run JAX tests"
65
- run: python -m unittest pysr.test.test_jax
66
  - name: "Install Torch"
67
  run: pip install torch # (optional import)
68
  - name: "Run Torch tests"
69
- run: python -m unittest pysr.test.test_torch
70
  - name: "Run custom env tests"
71
- run: python -m unittest pysr.test.test_env
 
58
  python setup.py install
59
  python -c 'import pysr; pysr.install()'
60
  - name: "Run tests"
61
+ run: python -m pysr.test main
62
  - name: "Install JAX"
63
  run: pip install jax jaxlib # (optional import)
64
  - name: "Run JAX tests"
65
+ run: python -m pysr.test jax
66
  - name: "Install Torch"
67
  run: pip install torch # (optional import)
68
  - name: "Run Torch tests"
69
+ run: python -m pysr.test torch
70
  - name: "Run custom env tests"
71
+ run: python -m pysr.test env