diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 756d062..7b514f4 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -2,15 +2,32 @@ name: Pull Request CI on: pull_request: - branches: [ "main" ] + branches: develop jobs: - test_oslg: - runs-on: ubuntu-22.04 + test_oslg_ubuntu_latest: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: ["3.10", "3.x"] + + steps: + - name: Check out repository + uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: python -m pip install --upgrade pip setuptools wheel + - name: Run unit tests + run: python -m unittest + test_oslg_ubuntu_2204: + runs-on: ubuntu-22.04 strategy: matrix: - python-version: [3.2, 3.5, 3.10] + python-version: ["3.10", "3.x"] steps: - name: Check out repository @@ -18,8 +35,8 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: ${{ matrix.python-version } + python-version: ${{ matrix.python-version }} - name: Install dependencies run: python -m pip install --upgrade pip setuptools wheel - name: Run unit tests - run: python -m unittest discover -s ./tests + run: python -m unittest diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml deleted file mode 100644 index 4bbc1f5..0000000 --- a/.github/workflows/python-package.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Python package - -on: - pull_request: - branches: [ "main" ] - -jobs: - build: - - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: ["3.10"] - - steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install flake8 pytest - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - - name: Test with pytest - run: | - python -m unittest diff --git a/.gitignore b/.gitignore index b6e4761..7b9468e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ __pycache__/ # C extensions *.so +.DS_Store + # Distribution / packaging .Python build/ diff --git a/pyproject.toml b/pyproject.toml index 06353b9..294a44e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ readme = "README.md" license = "BSD-3-Clause" license-files = ["LICENSE"] classifiers = [ - "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.2", "Intended Audience :: Developers", "Topic :: Software Development :: Libraries :: Python Modules", "Operating System :: OS Independent",