Skip to content

Commit

Permalink
Merge branch 'pip_rc_install' into BUGtimedelta
Browse files Browse the repository at this point in the history
  • Loading branch information
jklenzing authored Jun 17, 2024
2 parents 421d7f1 + 399df74 commit 2639552
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

name: Pytest with Flake8

on: [push, pull_request]
# on: [push, pull_request]

jobs:
build:
Expand Down
39 changes: 35 additions & 4 deletions .github/workflows/pip_rc_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,21 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: ["3.11"] # Keep this version at the highest supported Python version
os: ["ubuntu-latest", "windows-latest", "macos-latest"]
python-version: ["3.11", "3.12"]
numpy_ver: ["latest"]
test_config: ["latest"]
include:
# NEP29 compliance settings
- python-version: "3.10"
numpy_ver: "1.23"
os: ubuntu-latest
test_config: "NEP29"
# Operational compliance settings
- python-version: "3.6.8"
numpy_ver: "1.19.5"
os: "ubuntu-20.04"
test_config: "Ops"

name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand All @@ -25,10 +38,27 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: Install standard dependencies
if: ${{ matrix.test_config == 'latest'}}
run: pip install -r requirements.txt

- name: Install Operational dependencies
if: ${{ matrix.test_config == 'Ops'}}
run: |
pip install numpy==${{ matrix.numpy_ver }}
pip install -r requirements.txt
pip install "pip<19.0"
- name: Install NEP29 dependencies
if: ${{ matrix.test_config == 'NEP29'}}
run: |
pip install numpy==${{ matrix.numpy_ver }}
pip install --upgrade-strategy only-if-needed -r requirements.txt
- name: Install pysat RC
run: pip install --no-deps --pre -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ pysat
run: |
pip -V
python -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])'
python -m pip install --no-deps --pre -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ pysat
- name: Set up pysat
run: |
Expand All @@ -37,5 +67,6 @@ jobs:
- name: Check that install imports correctly
run: |
cd ..
cd pysatData
python -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])'
python -c "import pysat; print(pysat.__version__)"
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
* Updates usage of `dt.datetime.utcnow()` to `dt.datetime.now(dt.timezone.utc)`
* Drop testing for python 3.9 following NEP29.
* Update useage of `step.delta` to `pds.Timedelta(step)`
* Update pip rc install workflow to test against multiple python versions

[3.2.0] - 2024-03-27
--------------------
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = pysat
version = 3.2.0
version = 3.2.1rc1

[flake8]
max-line-length = 80
Expand Down
16 changes: 16 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright (C) 2020, Authors
# Full license can be found in License.md
# -----------------------------------------------------------------------------
"""Setup routine for pysat.
Note
----
package metadata stored in setup.cfg
"""

from setuptools import setup

setup()

0 comments on commit 2639552

Please sign in to comment.