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.

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

wip: removing python 38 #1059

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
6 changes: 2 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ jobs:
fail-fast: false
matrix:
include:
- python: "3.8"
pyshort: "38"
- python: "3.9"
pyshort: "39"
- python: "3.11"
Expand Down Expand Up @@ -62,13 +60,13 @@ jobs:
export OMP_NUM_THREADS=2
export OPENBLAS_NUM_THREADS=2
export MPI_DISABLE=1
python3 setup.py test
python3 -m unittest discover

- name: Run MPI Tests
run: |
export OMP_NUM_THREADS=1
export OPENBLAS_NUM_THREADS=1
mpirun -np 2 python3 setup.py test
python3 -m unittest discover

# FIXME: Re-enable after testing this procedure on a local
# apple machine.
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,6 @@ venv.bak/

# pychram
.idea

# vscode
.vscode
11 changes: 5 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@

import unittest

from setuptools import find_packages, setup, Extension
from setuptools.command.test import test as TestCommand
from setuptools import find_packages, setup, Extension, Command

import versioneer

Expand Down Expand Up @@ -43,7 +42,7 @@
setup_opts["url"] = "https://github.com/simonsobs/sotodlib"
setup_opts["packages"] = find_packages(where=".", exclude="tests")
setup_opts["license"] = "MIT"
setup_opts["python_requires"] = ">=3.8.0"
setup_opts["python_requires"] = ">=3.9.0"
setup_opts["package_data"] = {
"sotodlib": [
"toast/ops/data/*"
Expand Down Expand Up @@ -84,16 +83,16 @@

# Class to run unit tests

class SOTestCommand(TestCommand):
class SOTestCommand(Command):

def __init__(self, *args, **kwargs):
super(SOTestCommand, self).__init__(*args, **kwargs)

def initialize_options(self):
TestCommand.initialize_options(self)
Command.initialize_options(self)

def finalize_options(self):
TestCommand.finalize_options(self)
Command.finalize_options(self)
self.test_suite = True

def mpi_world(self):
Expand Down
Loading