Spaces:
Sleeping
Sleeping
MilesCranmer
commited on
Merge pull request #227 from MilesCranmer/backend-update
Browse files- .github/workflows/CI.yml +3 -1
- .github/workflows/CI_Windows.yml +3 -1
- .github/workflows/CI_docker.yml +1 -1
- .github/workflows/CI_mac.yml +3 -1
- .github/workflows/docker_deploy.yml +0 -3
- .github/workflows/pypi_deploy.yml +31 -0
- pysr/version.py +2 -2
- requirements.txt +1 -1
- setup.py +2 -7
.github/workflows/CI.yml
CHANGED
@@ -3,12 +3,14 @@ name: Linux
|
|
3 |
on:
|
4 |
push:
|
5 |
branches:
|
6 |
-
- '
|
7 |
paths:
|
8 |
- 'test/**'
|
9 |
- 'pysr/**'
|
10 |
- '.github/workflows/CI.yml'
|
11 |
- 'setup.py'
|
|
|
|
|
12 |
pull_request:
|
13 |
branches:
|
14 |
- '*'
|
|
|
3 |
on:
|
4 |
push:
|
5 |
branches:
|
6 |
+
- '**'
|
7 |
paths:
|
8 |
- 'test/**'
|
9 |
- 'pysr/**'
|
10 |
- '.github/workflows/CI.yml'
|
11 |
- 'setup.py'
|
12 |
+
tags:
|
13 |
+
- 'v*.*.*'
|
14 |
pull_request:
|
15 |
branches:
|
16 |
- '*'
|
.github/workflows/CI_Windows.yml
CHANGED
@@ -3,12 +3,14 @@ name: Windows
|
|
3 |
on:
|
4 |
push:
|
5 |
branches:
|
6 |
-
- '
|
7 |
paths:
|
8 |
- 'test/**'
|
9 |
- 'pysr/**'
|
10 |
- '.github/workflows/CI_Windows.yml'
|
11 |
- 'setup.py'
|
|
|
|
|
12 |
pull_request:
|
13 |
branches:
|
14 |
- '*'
|
|
|
3 |
on:
|
4 |
push:
|
5 |
branches:
|
6 |
+
- '**'
|
7 |
paths:
|
8 |
- 'test/**'
|
9 |
- 'pysr/**'
|
10 |
- '.github/workflows/CI_Windows.yml'
|
11 |
- 'setup.py'
|
12 |
+
tags:
|
13 |
+
- 'v*.*.*'
|
14 |
pull_request:
|
15 |
branches:
|
16 |
- '*'
|
.github/workflows/CI_docker.yml
CHANGED
@@ -3,7 +3,7 @@ name: Docker
|
|
3 |
on:
|
4 |
push:
|
5 |
branches:
|
6 |
-
- '
|
7 |
paths:
|
8 |
- 'test/**'
|
9 |
- 'pysr/**'
|
|
|
3 |
on:
|
4 |
push:
|
5 |
branches:
|
6 |
+
- '**'
|
7 |
paths:
|
8 |
- 'test/**'
|
9 |
- 'pysr/**'
|
.github/workflows/CI_mac.yml
CHANGED
@@ -3,12 +3,14 @@ name: macOS
|
|
3 |
on:
|
4 |
push:
|
5 |
branches:
|
6 |
-
- '
|
7 |
paths:
|
8 |
- 'test/**'
|
9 |
- 'pysr/**'
|
10 |
- '.github/workflows/CI_mac.yml'
|
11 |
- 'setup.py'
|
|
|
|
|
12 |
pull_request:
|
13 |
branches:
|
14 |
- '*'
|
|
|
3 |
on:
|
4 |
push:
|
5 |
branches:
|
6 |
+
- '**'
|
7 |
paths:
|
8 |
- 'test/**'
|
9 |
- 'pysr/**'
|
10 |
- '.github/workflows/CI_mac.yml'
|
11 |
- 'setup.py'
|
12 |
+
tags:
|
13 |
+
- 'v*.*.*'
|
14 |
pull_request:
|
15 |
branches:
|
16 |
- '*'
|
.github/workflows/docker_deploy.yml
CHANGED
@@ -8,9 +8,6 @@ on:
|
|
8 |
- "**"
|
9 |
tags:
|
10 |
- "v*.*.*"
|
11 |
-
pull_request:
|
12 |
-
branches:
|
13 |
-
- 'master'
|
14 |
workflow_dispatch:
|
15 |
|
16 |
|
|
|
8 |
- "**"
|
9 |
tags:
|
10 |
- "v*.*.*"
|
|
|
|
|
|
|
11 |
workflow_dispatch:
|
12 |
|
13 |
|
.github/workflows/pypi_deploy.yml
ADDED
@@ -0,0 +1,31 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
name: Deploy PyPI
|
2 |
+
on:
|
3 |
+
workflow_run:
|
4 |
+
workflows: ["Linux"]
|
5 |
+
types:
|
6 |
+
- completed
|
7 |
+
|
8 |
+
jobs:
|
9 |
+
pypi:
|
10 |
+
runs-on: ubuntu-latest
|
11 |
+
steps:
|
12 |
+
- name: "Checkout"
|
13 |
+
uses: actions/checkout@v3
|
14 |
+
- name: "Set up Python"
|
15 |
+
uses: actions/setup-python@v4
|
16 |
+
with:
|
17 |
+
python-version: 3.10.8
|
18 |
+
- name: "Install building tools"
|
19 |
+
run: pip install wheel
|
20 |
+
- name: "Build package"
|
21 |
+
run: python setup.py sdist bdist_wheel
|
22 |
+
- name: "Publish distribution π¦ to Test PyPI"
|
23 |
+
uses: pypa/gh-action-pypi-publish@release/v1
|
24 |
+
with:
|
25 |
+
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
|
26 |
+
repository_url: https://test.pypi.org/legacy/
|
27 |
+
- name: "Publish distribution π¦ to PyPI"
|
28 |
+
if: startsWith(github.ref, 'refs/tags')
|
29 |
+
uses: pypa/gh-action-pypi-publish@release/v1
|
30 |
+
with:
|
31 |
+
password: ${{ secrets.PYPI_API_TOKEN }}
|
pysr/version.py
CHANGED
@@ -1,2 +1,2 @@
|
|
1 |
-
__version__ = "0.11.
|
2 |
-
__symbolic_regression_jl_version__ = "0.14.
|
|
|
1 |
+
__version__ = "0.11.10"
|
2 |
+
__symbolic_regression_jl_version__ = "0.14.4"
|
requirements.txt
CHANGED
@@ -2,4 +2,4 @@ sympy
|
|
2 |
pandas
|
3 |
numpy
|
4 |
scikit_learn >= 1.0.0
|
5 |
-
julia
|
|
|
2 |
pandas
|
3 |
numpy
|
4 |
scikit_learn >= 1.0.0
|
5 |
+
julia == 0.6.0
|
setup.py
CHANGED
@@ -17,13 +17,8 @@ setuptools.setup(
|
|
17 |
long_description=long_description,
|
18 |
long_description_content_type="text/markdown",
|
19 |
url="https://github.com/MilesCranmer/pysr",
|
20 |
-
|
21 |
-
|
22 |
-
"numpy",
|
23 |
-
"pandas",
|
24 |
-
"sympy",
|
25 |
-
"scikit-learn >= 1.0.0",
|
26 |
-
],
|
27 |
packages=setuptools.find_packages(),
|
28 |
package_data={"pysr": ["../Project.toml", "../datasets/*"]},
|
29 |
include_package_data=False,
|
|
|
17 |
long_description=long_description,
|
18 |
long_description_content_type="text/markdown",
|
19 |
url="https://github.com/MilesCranmer/pysr",
|
20 |
+
# Read from requirements.txt:
|
21 |
+
install_requires=open("requirements.txt").read().splitlines(),
|
|
|
|
|
|
|
|
|
|
|
22 |
packages=setuptools.find_packages(),
|
23 |
package_data={"pysr": ["../Project.toml", "../datasets/*"]},
|
24 |
include_package_data=False,
|