Skip to content

Commit

Permalink
remove py 3.7 add 3.10 and 3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
bnb32 committed Jul 5, 2024
1 parent 710bd75 commit b7cc673
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 32 deletions.
16 changes: 0 additions & 16 deletions .github/release-drafter.yml

This file was deleted.

8 changes: 5 additions & 3 deletions .github/workflows/pull_request_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.9]
python-version: ['3.11']
include:
- os: ubuntu-latest
python-version: 3.8
python-version: '3.10'
- os: ubuntu-latest
python-version: 3.7
python-version: '3.9'
- os: ubuntu-latest
python-version: '3.8'

steps:
- uses: actions/checkout@v2
Expand Down
22 changes: 12 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
"""
setup.py
"""

import os
import shlex
from codecs import open
from setuptools import setup, find_packages
from setuptools.command.develop import develop
from subprocess import check_call
import shlex
from warnings import warn

from setuptools import find_packages, setup
from setuptools.command.develop import develop


class PostDevelopCommand(develop):
"""
Expand All @@ -22,8 +24,7 @@ def run(self):
try:
check_call(shlex.split("pre-commit install"))
except Exception as e:
warn("Unable to run 'pre-commit install': {}"
.format(e))
warn("Unable to run 'pre-commit install': {}".format(e))

develop.run(self)

Expand All @@ -39,9 +40,9 @@ def run(self):
with open(os.path.join(here, "farms", "version.py"), encoding="utf-8") as f:
version = f.read()

version = version.split('=')[-1].strip().strip('"').strip("'")
version = version.split("=")[-1].strip().strip('"').strip("'")

test_requires = ["pytest>=5.2", ]
test_requires = ["pytest>=5.2"]
description = "The Fast All-sky Radiation Model for Solar applications (FARMS)"

setup(
Expand All @@ -54,13 +55,14 @@ def run(self):
url="https://github.com/NREL/farms",
packages=find_packages(),
package_dir={"farms": "farms"},
package_data={'farms': ['earth_periodic_terms.csv',
'sun_earth_radius_vector.csv']},
package_data={
"farms": ["earth_periodic_terms.csv", "sun_earth_radius_vector.csv"]
},
include_package_data=True,
license="BSD 3-Clause",
zip_safe=False,
keywords="farms",
python_requires='>=3.7',
python_requires=">=3.8",
classifiers=[
"Development Status :: 4 - Beta",
"Intended Audience :: Science/Research",
Expand Down
7 changes: 4 additions & 3 deletions tests/test_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
"""

import os
import pytest

import numpy as np
from farms.utilities import rayleigh
import pytest

from farms.utilities import rayleigh

RTOL = 0.001
ATOL = 0.001
Expand Down Expand Up @@ -61,4 +62,4 @@ def execute_pytest(capture='all', flags='-rapP'):


if __name__ == '__main__':
execute_pytest()
execute_pytest(__file__)

0 comments on commit b7cc673

Please sign in to comment.