Skip to content

Commit

Permalink
Merge branch 'master' of github.com:AWehrhahn/SME
Browse files Browse the repository at this point in the history
  • Loading branch information
AWehrhahn committed Jun 3, 2021
2 parents 97fa70f + ee6ab83 commit 3d75c65
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,14 @@ jobs:
run: pytest

- name: GitHub Tag
if: github.event_name != 'pull_request'
id: tag_release
uses: mathieudutour/github-tag-action@v5
with:
github_token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/checkout@v2
if: github.event_name != 'pull_request'
with:
ref: ${{ steps.tag_release.outputs.new_tag }}
clean: false
Expand All @@ -58,6 +60,7 @@ jobs:


- name: Create Release
if: github.event_name != 'pull_request'
id: create_release
uses: actions/create-release@v1
env:
Expand All @@ -69,6 +72,7 @@ jobs:
prerelease: false

- name: Upload Release Asset
if: github.event_name != 'pull_request'
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
Expand All @@ -80,6 +84,7 @@ jobs:
asset_content_type: application/zip

- name: Publish a Python distribution to PyPI
if: github.event_name != 'pull_request'
uses: pypa/gh-action-pypi-publish@master
with:
user: __token__
Expand Down
6 changes: 3 additions & 3 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
pandas==1.2.4
scipy==1.6.3
numpy==1.20.2
numpy==1.20.3
astropy==4.2.1
wget==3.2
requests==2.25.1
tqdm==4.60.0
tqdm==4.61.0
colorlog==5.0.1
emcee==3.0.2
pybtex==0.24.0
pytest==6.2.3
pytest==6.2.4

future-fstrings==1.2.0; python_version < "3.6"
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pandas==1.2.4
scipy==1.6.3
numpy==1.20.2
numpy==1.20.3
astropy==4.2.1
wget==3.2
requests==2.25.1
tqdm==4.60.0
tqdm==4.61.0
colorlog==5.0.1
emcee==3.0.2
pybtex==0.24.0
Expand Down
2 changes: 1 addition & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pytest==6.2.3
pytest==6.2.4

0 comments on commit 3d75c65

Please sign in to comment.