Skip to content

Commit

Permalink
Merge pull request #134 from Hazboun6/master
Browse files Browse the repository at this point in the history
Bumping to v2.3.0
  • Loading branch information
Hazboun6 authored Sep 15, 2021
2 parents a1c9eb9 + ac41224 commit 895024b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 15 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:
pull_request:
branches: [ master, dev ]
release:
workflow_dispatch:
types:
- published

Expand Down Expand Up @@ -70,7 +69,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: "3.7"
python-version: "3.8"
- name: Install non-python dependencies on linux
run: |
sudo apt-get install libsuitesparse-dev
Expand Down Expand Up @@ -116,7 +115,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.7'
python-version: '3.8'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
6 changes: 6 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
=======
History
=======
2.3.0 (2021-09-15)*
Functionality added for NANOGrav 15yr dataset analyses.
Outlier analysis software moved into separate package.

2.2.0 (2021-08-10)
Version with outlier analysis.

0.9.1 (2021-05-06)
0.9.0 (2019-09-20)
------------------
Expand Down
2 changes: 1 addition & 1 deletion enterprise_extensions/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.2.0"
__version__ = "2.3.0"
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.2.0
current_version = 2.3.0
commit = True
tag = True

Expand Down
12 changes: 2 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,7 @@
"ptmcmcsampler",
]

test_requirements = [
"pytest",
]

if platform.system() == "Darwin":
extra_compile_args = ["-O2", "-Xpreprocessor", "-fopenmp", "-fno-wrapv"]
extra_link_args = ["-liomp5"] if os.getenv("NO_MKL", 0) == 0 else ["-lomp"]
else:
extra_compile_args = ["-O2", "-fopenmp", "-fno-wrapv"]
extra_link_args = ["-liomp5"] if os.getenv("NO_MKL", 0) == 0 else []
test_requirements = []

# Extract version
def get_version():
Expand All @@ -50,6 +41,7 @@ def get_version():
version=get_version(),
description="Extensions, model shortcuts, and utilities for the enterprise PTA analysis framework.",
long_description=readme + "\n\n" + history,
long_description_content_type='text/x-rst',
classifiers=[
"Topic :: Scientific/Engineering :: Astronomy",
"Topic :: Scientific/Engineering :: Physics",
Expand Down

0 comments on commit 895024b

Please sign in to comment.