Skip to content

Commit

Permalink
Merge pull request #227 from MilesCranmer/backend-update
Browse files Browse the repository at this point in the history
Update backend version with improved resource monitoring
  • Loading branch information
MilesCranmer committed Nov 21, 2022
2 parents 60aa659 + b0a02aa commit c97f60d
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 17 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/CI.yml
Expand Up @@ -3,12 +3,14 @@ name: Linux
on:
push:
branches:
- '*'
- '**'
paths:
- 'test/**'
- 'pysr/**'
- '.github/workflows/CI.yml'
- 'setup.py'
tags:
- 'v*.*.*'
pull_request:
branches:
- '*'
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/CI_Windows.yml
Expand Up @@ -3,12 +3,14 @@ name: Windows
on:
push:
branches:
- '*'
- '**'
paths:
- 'test/**'
- 'pysr/**'
- '.github/workflows/CI_Windows.yml'
- 'setup.py'
tags:
- 'v*.*.*'
pull_request:
branches:
- '*'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CI_docker.yml
Expand Up @@ -3,7 +3,7 @@ name: Docker
on:
push:
branches:
- '*'
- '**'
paths:
- 'test/**'
- 'pysr/**'
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/CI_mac.yml
Expand Up @@ -3,12 +3,14 @@ name: macOS
on:
push:
branches:
- '*'
- '**'
paths:
- 'test/**'
- 'pysr/**'
- '.github/workflows/CI_mac.yml'
- 'setup.py'
tags:
- 'v*.*.*'
pull_request:
branches:
- '*'
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/docker_deploy.yml
Expand Up @@ -8,9 +8,6 @@ on:
- "**"
tags:
- "v*.*.*"
pull_request:
branches:
- 'master'
workflow_dispatch:


Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/pypi_deploy.yml
@@ -0,0 +1,31 @@
name: Deploy PyPI
on:
workflow_run:
workflows: ["Linux"]
types:
- completed

jobs:
pypi:
runs-on: ubuntu-latest
steps:
- name: "Checkout"
uses: actions/checkout@v3
- name: "Set up Python"
uses: actions/setup-python@v4
with:
python-version: 3.10.8
- name: "Install building tools"
run: pip install wheel
- name: "Build package"
run: python setup.py sdist bdist_wheel
- name: "Publish distribution 📦 to Test PyPI"
uses: pypa/gh-action-pypi-publish@release/v1
with:
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
repository_url: https://test.pypi.org/legacy/
- name: "Publish distribution 📦 to PyPI"
if: startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@release/v1
with:
password: ${{ secrets.PYPI_API_TOKEN }}
4 changes: 2 additions & 2 deletions pysr/version.py
@@ -1,2 +1,2 @@
__version__ = "0.11.9"
__symbolic_regression_jl_version__ = "0.14.3"
__version__ = "0.11.10"
__symbolic_regression_jl_version__ = "0.14.4"
2 changes: 1 addition & 1 deletion requirements.txt
Expand Up @@ -2,4 +2,4 @@ sympy
pandas
numpy
scikit_learn >= 1.0.0
julia
julia == 0.6.0
9 changes: 2 additions & 7 deletions setup.py
Expand Up @@ -17,13 +17,8 @@
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/MilesCranmer/pysr",
install_requires=[
"julia>=0.5.7",
"numpy",
"pandas",
"sympy",
"scikit-learn >= 1.0.0",
],
# Read from requirements.txt:
install_requires=open("requirements.txt").read().splitlines(),
packages=setuptools.find_packages(),
package_data={"pysr": ["../Project.toml", "../datasets/*"]},
include_package_data=False,
Expand Down

0 comments on commit c97f60d

Please sign in to comment.