Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
pacesm committed Nov 6, 2023
2 parents d7bbebb + 309fd4e commit f8ed43c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ jobs:
fail-fast: false
matrix:
include:
- python: '3.6'
- python: '3.7'
- python: '3.8'
- python: '3.9'
- python: '3.10'
- python: '3.6'
- python: '3.7'
- python: '3.8'
- python: '3.9'
- python: '3.10'
- python: '3.11'
#- python: '3.12' # broken - no distutils - test again with SpacePy >= 0.5.0
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
Expand All @@ -29,9 +31,7 @@ jobs:
pip3 install --upgrade pip
pip3 install wheel
pip3 install scipy
export SETUPTOOLS_USE_DISTUTILS=stdlib # https://github.com/pypa/setuptools/issues/3693
pip3 install spacepy
unset SETUPTOOLS_USE_DISTUTILS
pip3 install spacepy --no-build-isolation
pip3 install ./eoxmagmod/
- name: Scripts
run: |
Expand Down
12 changes: 6 additions & 6 deletions libcdf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# install CDF library from sources
#

VERSION=39_0
DIRNAME=./cdf$(VERSION)-dist/
FILENAME=./cdf$(VERSION)-dist-cdf.tar.gz
SOURCE_URL=https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf$(VERSION)/linux/cdf$(VERSION)-dist-cdf.tar.gz
MD5CHECKSUM=7c6489017be3aee20d6d99f562f952f6
INSTALLDIR=/usr/local/cdf
VERSION = 39_0
DIRNAME = ./cdf$(VERSION)-dist/
FILENAME = ./cdf$(VERSION)-dist-cdf.tar.gz
SOURCE_URL = https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf$(VERSION)/linux/cdf$(VERSION)-dist-cdf.tar.gz
MD5CHECKSUM = 7c6489017be3aee20d6d99f562f952f6
INSTALLDIR ?= /usr/local/cdf

all: build

Expand Down

0 comments on commit f8ed43c

Please sign in to comment.