Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better os compatibility #21

Merged
merged 10 commits into from
Jul 24, 2023
Merged

Better os compatibility #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3250234
fixing tensorflow requirement on mac
htjb Jul 11, 2023
657d6d6
trying to get tests working on different os
htjb Jul 11, 2023
f26fb49
simplifying pip installs
htjb Jul 11, 2023
54e3a9a
fixing windows pip install readme read
htjb Jul 24, 2023
e8a5127
install requirements one line at a time
htjb Jul 24, 2023
8f1452e
modifying constraints on requirements
htjb Jul 24, 2023
4499191
modifying constraints on requirements
htjb Jul 24, 2023
1502696
apparently tensorflow-macos is only supported for python 3.8-3.10
htjb Jul 24, 2023
362914c
reverting to previous method for installing requirements
htjb Jul 24, 2023
68598b5
bumping version number
htjb Jul 24, 2023
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
7 changes: 4 additions & 3 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ on:
jobs:
build:

runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ['3.8', '3.9', '3.10']

steps:
- uses: actions/checkout@v2
Expand All @@ -27,7 +28,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install flake8 pytest coverage
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
pip install -r requirements.txt
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Introduction

:globalemu: Robust Global 21-cm Signal Emulation
:Author: Harry Thomas Jones Bevins
:Version: 1.7.3
:Version: 1.8.0
:Homepage: https://github.com/htjb/globalemu
:Documentation: https://globalemu.readthedocs.io/

Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
numpy
tensorflow
tensorflow-macos; sys_platform == 'darwin'
tensorflow; sys_platform != 'darwin'
pandas
matplotlib
Pillow
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages

def readme(short=False):
with open('README.rst') as f:
with open('README.rst', encoding='utf-8') as f:
if short:
return f.readlines()[1].strip()
else:
Expand Down