Skip to content

Commit

Permalink
Merge branch 'devel' into cuda_main
Browse files Browse the repository at this point in the history
  • Loading branch information
EmilyBourne committed Jul 14, 2023
2 parents 137e9a9 + 653a8fd commit 2d3c15b
Show file tree
Hide file tree
Showing 223 changed files with 628 additions and 12,472 deletions.
8 changes: 8 additions & 0 deletions .dict_custom.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,11 @@ uniformise
incrementation
Pylint
templated
et
al
transpiler
bibtex
Bourne
Güçlü
Hadjout
Ratnani
20 changes: 14 additions & 6 deletions .github/actions/pytest_run/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,27 @@ runs:
- name: Test with pytest
run: |
which python
python -m pytest -n auto -rXx -v -m "not (parallel or xdist_incompatible) and c ${{ inputs.pytest_mark }}" --ignore=symbolic --ignore=ndarrays
if [ -n "${{ runner.debug }}" ]
then
# If running in debug mode
export "DEBUG=1"
export FLAGS="-xsv --log-cli-level DEBUG"
else
export FLAGS=""
fi
python -m pytest -n auto -rXx ${FLAGS} -m "not (parallel or xdist_incompatible) and c ${{ inputs.pytest_mark }}" --ignore=symbolic --ignore=ndarrays
if [ -n "${SITE_DIR}" ]; then
echo "Touching"
# Test ndarray folder update (requires parallel tests to avoid clean)
touch ${SITE_DIR}/pyccel/stdlib/cwrapper/cwrapper.h
python -m pytest -n auto -rXx -v -m c -k test_array_int32_1d_scalar epyccel/test_arrays.py
python -m pytest -n auto -rXx ${FLAGS} -m c -k test_array_int32_1d_scalar epyccel/test_arrays.py
fi
python -m pytest -rXx -m "xdist_incompatible and not parallel and c ${{ inputs.pytest_mark }}" --ignore=symbolic --ignore=ndarrays
python -m pytest -rXx ${FLAGS} -m "xdist_incompatible and not parallel and c ${{ inputs.pytest_mark }}" --ignore=symbolic --ignore=ndarrays
pyccel-clean
python -m pytest -n auto -rXx -m "not (parallel or xdist_incompatible) and not (c or python or ccuda) ${{ inputs.pytest_mark }}" --ignore=symbolic --ignore=ndarrays
python -m pytest -rXx -m "xdist_incompatible and not parallel and not (c or python or ccuda) ${{ inputs.pytest_mark }}" --ignore=symbolic --ignore=ndarrays
python -m pytest -n auto -rXx ${FLAGS} -m "not (parallel or xdist_incompatible) and not (c or python or ccuda) ${{ inputs.pytest_mark }}" --ignore=symbolic --ignore=ndarrays
python -m pytest -rXx ${FLAGS} -m "xdist_incompatible and not parallel and not (c or python or ccuda) ${{ inputs.pytest_mark }}" --ignore=symbolic --ignore=ndarrays
pyccel-clean
python -m pytest ndarrays/ -rXx
python -m pytest ndarrays/ -rXx ${FLAGS}
pyccel-clean
shell: ${{ inputs.shell_cmd }}
working-directory: ./tests
148 changes: 0 additions & 148 deletions .travis.yml

This file was deleted.

10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,18 @@ All notable changes to this project will be documented in this file.

### Changed

- Updating `stdlib` files if they are modified not just accessed.

### Deprecated

- \[INTERNALS\] Removed `obsolete` folder.
- \[INTERNALS\] Removed out of date `samples` folder.
- \[INTERNALS\] Removed out of date `doc` folder.
- \[INTERNALS\] Removed `benchmarks` folder. Code is still available in benchmark repository.
- \[INTERNALS\] Removed `bugs` folder.
- \[INTERNALS\] Removed `inprogress` folder.
- \[INTERNALS\] Remove old Travis configuration file.

## \[1.8.1\] - 2023-07-07

### Added
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ recursive-include pyccel *.f90
recursive-include pyccel *.h
recursive-include pyccel *.pyccel

graft tutorial
graft docs
graft samples
graft tests
Loading

0 comments on commit 2d3c15b

Please sign in to comment.