This repository has been archived by the owner on Nov 25, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/1.1.0' into main
- Loading branch information
Showing
9 changed files
with
189 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| name: Publish Python 🐍 distributions 📦 to PyPI | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
|
|
||
| jobs: | ||
| build-n-publish: | ||
| name: Build and publish Python 🐍 distributions 📦 to PyPI | ||
| runs-on: ubuntu-18.04 | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@master | ||
|
|
||
| - name: Set up Python 3.8 | ||
| uses: actions/setup-python@v1 | ||
| with: | ||
| python-version: 3.8 | ||
|
|
||
| - name: Install pypa/build | ||
| run: >- | ||
| python -m | ||
| pip install | ||
| build | ||
| --user | ||
| - name: Build a binary wheel and a source tarball | ||
| run: >- | ||
| python -m | ||
| build | ||
| --outdir dist/ | ||
| . | ||
| - name: Publish distribution 📦 to PyPI | ||
| uses: pypa/gh-action-pypi-publish@master | ||
| with: | ||
| user: __token__ | ||
| password: ${{ secrets.PYPI_API_TOKEN }} | ||
| verbose: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| name: Unit test on push and PR | ||
|
|
||
|
|
||
| on: [push, pull_request, workflow_dispatch] | ||
|
|
||
|
|
||
| jobs: | ||
| unit-tests: | ||
| name: Run Unit Tests | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: [windows-latest, ubuntu-latest, macos-latest] | ||
| python-version: [3.7, 3.8, 3.9] | ||
|
|
||
| env: | ||
| OS: ${{ matrix.os }} | ||
| PYTHON-VERSION: ${{ matrix.python-version }} | ||
|
|
||
| runs-on: ${{ matrix.os }} | ||
|
|
||
| steps: | ||
|
|
||
| - uses: actions/setup-python@v2 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| - run: python -m pip install --upgrade pip | ||
|
|
||
| - uses: actions/checkout@v2 | ||
|
|
||
| - run: python -m pip install .[test] | ||
|
|
||
| - run: python -m pytest tests --cov=endaq.ide | ||
|
|
||
| - uses: codecov/codecov-action@v2 | ||
| with: | ||
| token: ${{ secrets.CODECOV_TOKEN }} | ||
| env_vars: OS,PYTHON-VERSION | ||
| files: .coverage | ||
| name: ${{ matrix.os }} ${{ matrix.python-version }} | ||
| verbose: true |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| numpy>=1.16.6 | ||
| ebmlite>=3.0.0 | ||
| idelib>=3.2.0 | ||
| idelib>=3.2.3 | ||
| jinja2 | ||
| pandas | ||
| pandas>=1.3 | ||
| requests |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,9 +7,9 @@ | |
| INSTALL_REQUIRES = [ | ||
| "numpy>=1.16.6", | ||
| "ebmlite>=3.0.0", | ||
| "idelib>=3.2.0", | ||
| "idelib>=3.2.3", | ||
| "requests", | ||
| "pandas", | ||
| "pandas>=1.3", | ||
| "jinja2", # required for pandas.DataFrame.style | ||
| ] | ||
|
|
||
|
|
@@ -23,7 +23,7 @@ | |
|
|
||
| setuptools.setup( | ||
| name='endaq-ide', | ||
| version='1.0.0b1', | ||
| version='1.1.0', | ||
| author='Mide Technology', | ||
| author_email='[email protected]', | ||
| description='A comprehensive, user-centric Python API for working with enDAQ data and devices', | ||
|
|
@@ -34,8 +34,6 @@ | |
| classifiers=['Development Status :: 4 - Beta', | ||
| 'License :: OSI Approved :: MIT License', | ||
| 'Natural Language :: English', | ||
| 'Programming Language :: Python :: 3.5', | ||
| 'Programming Language :: Python :: 3.6', | ||
| 'Programming Language :: Python :: 3.7', | ||
| 'Programming Language :: Python :: 3.8', | ||
| 'Programming Language :: Python :: 3.9', | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters