Skip to content

Commit

Permalink
Remove estimagic related files (#2)
Browse files Browse the repository at this point in the history
  • Loading branch information
timmens authored Apr 9, 2023
1 parent f66089d commit ad05f88
Show file tree
Hide file tree
Showing 433 changed files with 477 additions and 118,208 deletions.
15 changes: 2 additions & 13 deletions .envs/testenv-linux.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,21 @@
---
name: estimagic
name: tranquilo
channels:
- conda-forge
- nodefaults
dependencies:
- jax
- pygmo
- nlopt # dev, tests
- pip # dev, tests, docs
- pytest # dev, tests
- pytest-cov # tests
- pytest-xdist # dev, tests
- statsmodels # dev, tests
- bokeh<=2.4.3 # run, tests
- click # run, tests
- cloudpickle # run, tests
- joblib # run, tests
- estimagic # run, tests
- numba # run, tests
- numpy>=1.17.0 # run, tests
- pandas # run, tests
- plotly # run, tests
- pybaum >= 0.1.2 # run, tests
- scipy>=1.2.1 # run, tests
- sqlalchemy # run, tests
- pip: # dev, tests, docs
- DFO-LS # dev, tests
- Py-BOBYQA # dev, tests
- fides==0.7.4 # dev, tests
- kaleido # dev, tests
- simoptlib==1.0.1 # dev, tests
- -e ../
15 changes: 2 additions & 13 deletions .envs/testenv-others.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,20 @@
---
name: estimagic
name: tranquilo
channels:
- conda-forge
- nodefaults
dependencies:
- cyipopt
- nlopt # dev, tests
- pip # dev, tests, docs
- pytest # dev, tests
- pytest-cov # tests
- pytest-xdist # dev, tests
- statsmodels # dev, tests
- bokeh<=2.4.3 # run, tests
- click # run, tests
- cloudpickle # run, tests
- joblib # run, tests
- estimagic # run, tests
- numba # run, tests
- numpy>=1.17.0 # run, tests
- pandas # run, tests
- plotly # run, tests
- pybaum >= 0.1.2 # run, tests
- scipy>=1.2.1 # run, tests
- sqlalchemy # run, tests
- pip: # dev, tests, docs
- DFO-LS # dev, tests
- Py-BOBYQA # dev, tests
- fides==0.7.4 # dev, tests
- kaleido # dev, tests
- simoptlib==1.0.1 # dev, tests
- -e ../
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/enhancement.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ assignees: ''

---

* estimagic version used, if any:
* tranquilo version used, if any:
* Python version, if any:
* Operating System:

Expand Down
28 changes: 5 additions & 23 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ jobs:
uses: mamba-org/provision-with-micromamba@main
with:
environment-file: ./.envs/testenv-linux.yml
environment-name: estimagic
environment-name: tranquilo
cache-env: true
extra-specs: |
python=${{ matrix.python-version }}
- name: run pytest
shell: bash -l {0}
run: |
micromamba activate estimagic
micromamba activate tranquilo
pytest --cov-report=xml --cov=./
- name: Upload coverage report.
if: runner.os == 'Linux' && matrix.python-version == '3.10'
Expand All @@ -63,30 +63,12 @@ jobs:
uses: mamba-org/provision-with-micromamba@main
with:
environment-file: ./.envs/testenv-others.yml
environment-name: estimagic
environment-name: tranquilo
cache-env: true
extra-specs: |
python=${{ matrix.python-version }}
- name: run pytest
shell: bash -l {0}
run: |
micromamba activate estimagic
pytest -m "not slow and not jax"
code-in-docs:
name: Run code snippets in documentation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: create build environment
uses: mamba-org/provision-with-micromamba@main
with:
environment-file: ./.envs/testenv-linux.yml
environment-name: estimagic
cache-env: true
extra-specs: python=3.10
- name: run sphinx
shell: bash -l {0}
run: |-
micromamba activate estimagic
cd docs/source
python -m doctest -v how_to_guides/optimization/how_to_specify_constraints.md
micromamba activate tranquilo
pytest -m "not slow and not jax"
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,6 @@ venv.bak/
.pytask.sqlite3


src/estimagic/_version.py
src/tranquilo/_version.py

*.~lock.*
5 changes: 0 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ repos:
rev: 1.9.0
hooks:
- id: yamlfix
exclude: tests/optimization/fixtures
- repo: local
hooks:
- id: update-environment-files
Expand All @@ -24,7 +23,6 @@ repos:
- id: check-added-large-files
args:
- --maxkb=1300
exclude: tests/optimization/fixtures/
- id: check-case-conflict
- id: check-merge-conflict
- id: check-vcs-permalinks
Expand All @@ -50,12 +48,10 @@ repos:
- id: trailing-whitespace
- id: check-ast
- id: check-docstring-first
exclude: src/estimagic/optimization/algo_options.py
- repo: https://github.com/adrienverge/yamllint.git
rev: v1.30.0
hooks:
- id: yamllint
exclude: tests/optimization/fixtures
- repo: https://github.com/psf/black
rev: 23.3.0
hooks:
Expand All @@ -65,7 +61,6 @@ repos:
rev: 1.13.0
hooks:
- id: blacken-docs
exclude: docs/source/how_to_guides/optimization/how_to_specify_constraints.md
- repo: https://github.com/PyCQA/docformatter
rev: v1.5.1
hooks:
Expand Down
Loading

0 comments on commit ad05f88

Please sign in to comment.