Skip to content

Commit 5c2be48

Browse files
authored
Merge branch 'amusecode:main' into iss9-arepo_dark_matter_interface
2 parents ff2ea53 + 6042882 commit 5c2be48

508 files changed

Lines changed: 6333 additions & 24485 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
3+
4+
name: Python package
5+
6+
on:
7+
push:
8+
branches: [ "main" ]
9+
pull_request:
10+
branches: [ "main" ]
11+
12+
jobs:
13+
build:
14+
15+
runs-on: ubuntu-latest
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
python-version: ["3.8", "3.9", "3.10"]
20+
21+
steps:
22+
- uses: actions/checkout@v3
23+
- name: Set up Python ${{ matrix.python-version }}
24+
uses: actions/setup-python@v3
25+
with:
26+
python-version: ${{ matrix.python-version }}
27+
- name: Install dependencies
28+
run: |
29+
python -m pip install --upgrade pip
30+
python -m pip install flake8 pytest
31+
# don't install requirements.txt as mpi4py will fail...
32+
# if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
33+
python -m pip install setuptools setuptools_scm wheel docutils numpy h5py
34+
- name: Lint with flake8
35+
run: |
36+
# stop the build if there are Python syntax errors or undefined names
37+
flake8 src/amuse/. --count --select=E9,F63,F7,F82 --show-source --statistics
38+
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
39+
flake8 src/amuse/. --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
40+
- name: Install framework
41+
run: |
42+
python -m pip install -e .
43+
- name: Test with pytest (only core tests)
44+
run: |
45+
pytest src/amuse/test/suite/core_tests
46+
- name: Create packages
47+
run: |
48+
cd packages && sh generate_packages.sh

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# files generated by the configure script
2-
build.py
32
config.log
43
config.mk
54
config.status

.zenodo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"name": "McMillan, Steve"
1919
},
2020
{
21-
"affiliation": "University of Exeter",
21+
"affiliation": "Université de Genève",
2222
"name": "Rieder, Steven",
2323
"orcid": "0000-0003-3688-5798"
2424
},

Makefile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ python_version_major := $(word 1,${python_version_full})
1111
python_version_minor := $(word 2,${python_version_full})
1212
python_version_patch := $(word 3,${python_version_full})
1313

14-
all: build.py
14+
all: config.mk
1515
@-mkdir -p test_results
1616
$(PYTHON) setup.py generate_main
1717
$(PYTHON) setup.py build_codes --inplace
1818

19-
framework: build.py
19+
framework: config.mk
2020
@-mkdir -p test_results
2121
$(PYTHON) setup.py generate_main
2222
$(PYTHON) setup.py build_libraries --inplace
@@ -46,7 +46,7 @@ distclean:
4646
-rm -f amuse.sh
4747
-rm -f iamuse.sh
4848
-rm -f ibis-deploy.sh
49-
-rm -f build.py bin/amusifier
49+
-rm -f bin/amusifier
5050
-rm -rf test_results src/amuse.egg-info
5151

5252
-rm -f test/*.000 test/fort.* test/perr test/pout test/test.h5 test/*.log

0 commit comments

Comments
 (0)