Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions .github/workflows/test-master.yml

This file was deleted.

18 changes: 12 additions & 6 deletions .github/workflows/test-develop.yml → .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Test Develop
name: Test PyMEOS

on:
push:
branches: [ "develop" ]
branches: [ "develop", "master" ]
pull_request:
branches: [ "develop" ]
branches: [ "develop", "master" ]

jobs:
build:
Expand All @@ -16,18 +16,24 @@ jobs:
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: awalsh128/cache-apt-pkgs-action@latest
with:
packages: build-essential cmake postgresql-server-dev-14 libproj-dev libjson-c-dev libgsl-dev libgeos-dev
version: 1.0

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: "pip"

- name: Install MEOS
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
run: |
git clone --branch develop https://github.com/MobilityDB/MobilityDB
git clone --branch ${{ env.BRANCH_NAME }} --depth 1 https://github.com/MobilityDB/MobilityDB
mkdir MobilityDB/build
cd MobilityDB/build
cmake .. -DMEOS=on
Expand Down
3 changes: 1 addition & 2 deletions pymeos/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ classifiers = [
'Programming Language :: C',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
Expand All @@ -32,7 +31,7 @@ classifiers = [
readme = 'README.md'
license = { file = 'LICENSE' }

requires-python = '>=3.7'
requires-python = '>=3.8'
dependencies = [
'pymeos-cffi >=1.1.0, <2',
'python-dateutil',
Expand Down
3 changes: 1 addition & 2 deletions pymeos_cffi/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ classifiers = [
'Programming Language :: C',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
Expand All @@ -33,7 +32,7 @@ classifiers = [
readme = 'README.md'
license = { file = 'LICENSE' }

requires-python = '>=3.7'
requires-python = '>=3.8'
dependencies = [
'cffi',
'python-dateutil',
Expand Down