Skip to content

Commit 4cd3093

Browse files
committed
Merge branch 'master' into learning_algos
2 parents f3599cd + 0e4e2b1 commit 4cd3093

File tree

114 files changed

+3058
-2656
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+3058
-2656
lines changed

.coveragerc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
[run]
2+
# relative_files = True is necessary as per documentation of
3+
# https://github.com/AndreMiras/coveralls-python-action
4+
relative_files = True
25
source = quantecon
36
omit =
47
*/python?.?/*

.coveralls.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
name: conda-build
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags:
8+
- 'v*'
9+
pull_request:
10+
branches:
11+
- master
12+
13+
14+
jobs:
15+
tests:
16+
runs-on: ${{ matrix.os }}
17+
strategy:
18+
matrix:
19+
os: [windows-latest, ubuntu-latest, macos-latest]
20+
python-version: [3.8, 3.9, '3.10']
21+
exclude:
22+
- os: windows-latest
23+
python-version: 3.8
24+
25+
steps:
26+
- uses: actions/checkout@v2
27+
with:
28+
fetch-depth: 0
29+
30+
- name: Cache conda
31+
uses: actions/cache@v2
32+
env:
33+
CACHE_NUMBER: 0
34+
with:
35+
path: ~/conda_pkgs_dir
36+
key:
37+
${{ runner.os }}-${{ matrix.python-version }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('environment.yml') }}
38+
39+
- uses: conda-incubator/setup-miniconda@v2
40+
with:
41+
auto-update-conda: true
42+
environment-file: environment.yml
43+
python-version: ${{ matrix.python-version }}
44+
auto-activate-base: false
45+
use-only-tar-bz2: true
46+
47+
- name: Conda info
48+
shell: bash -l {0}
49+
run: |
50+
conda info
51+
conda list
52+
53+
- name: Setup QuantEcon
54+
shell: bash -l {0}
55+
run: |
56+
pip install -U pip
57+
pip install .[testing]
58+
59+
- name: flake8 Tests
60+
shell: bash -l {0}
61+
run: |
62+
flake8 --select F401, F405, E231 quantecon
63+
64+
- name: Run Tests (pytest)
65+
shell: bash -l {0}
66+
run: |
67+
coverage run -m pytest quantecon
68+
coverage lcov
69+
70+
- name: Coveralls
71+
uses: coverallsapp/github-action@master
72+
if: runner.os == 'Linux'
73+
with:
74+
github-token: ${{ secrets.GITHUB_TOKEN }}
75+
path-to-lcov: coverage.lcov
76+
77+
publish:
78+
79+
name: Publish to PyPi
80+
needs: [tests]
81+
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
82+
runs-on: ubuntu-latest
83+
steps:
84+
- name: Checkout source
85+
uses: actions/checkout@v3
86+
- name: Set up Python 3.8
87+
uses: actions/setup-python@v3
88+
with:
89+
python-version: 3.8
90+
- name: Install flit
91+
run: |
92+
pip install flit~=3.6
93+
- name: Build and publish
94+
run: |
95+
flit publish
96+
env:
97+
FLIT_USERNAME: __token__
98+
FLIT_PASSWORD: ${{ secrets.PYPI_TOKEN }}

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ quantecon.egg-info/
99
*.noseids
1010
*.coverage
1111
*.h5
12+
*.lcov
1213

1314
# Numba cache files
1415
*.nbc
1516
*.nbi
17+
18+
# Coverage
19+
20+
coverage.xml

.travis.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 200 additions & 687 deletions
Large diffs are not rendered by default.

LICENSE.txt renamed to LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
Copyright © 2013-2019 Thomas J. Sargent and John Stachurski: BSD-3
2+
Copyright © 2013-2021 Thomas J. Sargent and John Stachurski: BSD-3
33
All rights reserved.
44

55
Redistribution and use in source and binary forms, with or without

README.md

Lines changed: 50 additions & 214 deletions
Large diffs are not rendered by default.

docs/qe_apidoc.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ def model_tool():
237237
tool_files = glob("../quantecon/[a-z0-9]*.py")
238238
tools = list(map(lambda x: x.split('/')[-1][:-3], tool_files))
239239
# Alphabetize
240-
tools.remove("version")
241240
tools.sort()
242241

243242
# list file names of utilities

docs/rtd-requirements.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
sphinx
2+
ipython
3+
numpydoc
4+
numba>=0.38
5+
numpy>=1.2
6+
sympy
7+
scipy>=1.0
8+
requests
9+
matplotlib

0 commit comments

Comments
 (0)