diff --git a/.github/workflows/pypublish.yml b/.github/workflows/pypublish.yml new file mode 100644 index 0000000..7bdb360 --- /dev/null +++ b/.github/workflows/pypublish.yml @@ -0,0 +1,48 @@ +name: Publish Python distribution to PyPI and TestPyPI +on: push + +jobs: + build-n-publish: + name: Publish Python distribution to PyPI and TestPyPI + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Setup Python 3.8 + uses: actions/setup-python@v2 + 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 + --sdist + --wheel + --outdir dist/ + - name: install check-wheel-contents + run: >- + python3 -m + pip install + check-wheel-contents + - name: check wheel + run: >- + check-wheel-contents + dist/*.whl + - name: Publish distribution to TestPyPI + if: startsWith(github.event.ref, 'refs/tags') + uses: pypa/gh-action-pypi-publish@master + with: + user: __token__ + password: ${{ secrets.TESTPYPI_API_TOKEN }} + repository_url: https://test.pypi.org/legacy/ + - name: Publish distribution to PyPI + if: startsWith(github.event.ref, 'refs/tags') + uses: pypa/gh-action-pypi-publish@master + with: + user: __token__ + password: ${{ secrets.PYPI_API_TOKEN }} diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index bdff2c9..6e8b16a 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macOS-latest] - python-version: [3.6, 3.7, 3.8] + python-version: [3.8, 3.9, "3.10"] steps: - uses: actions/checkout@v2 diff --git a/requirements.txt b/requirements.txt index ee31dfa..2974666 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,6 @@ -wheel -certifi==2020.4.5.1 -cycler==0.10.0 -kiwisolver==1.2.0; -matplotlib==3.1.3 +matplotlib==3.1.3; python_version < '3.8' +matplotlib>=3.1.3; python_version >= '3.8' numpy==1.15.2; python_version < '3.8' -numpy==1.17.2; python_version >= '3.8' -packaging==20.3 -pyparsing==2.4.7 -python-dateutil==2.8.1 -scipy==1.4.1 -six==1.15.0 \ No newline at end of file +numpy>=1.21.0; python_version >= '3.8' +scipy==1.4.1; python_version < '3.8' +scipy>=1.4.1; python_version >= '3.8' \ No newline at end of file diff --git a/setup.py b/setup.py index fb51e94..bece8b0 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name='UncertainSCI', - version='0.1.1-b0', + version='0.2.0-b0', author='UncertainSCI Developers', author_email='uncertainsci@sci.utah.edu', packages=find_packages(), @@ -39,17 +39,11 @@ keywords='Uncertainty Quantification, Simulation', url=r'https://sci.utah.edu/sci-software/simulation/uncertainsci.html', install_requires=[ - "wheel", - "certifi==2020.4.5.1", - "cycler==0.10.0", - "kiwisolver==1.2.0", - "matplotlib==3.1.3", + "matplotlib==3.1.3; python_version < '3.8'", + "matplotlib>=3.1.3; python_version >= '3.8'", "numpy==1.15.2; python_version < '3.8'", - "numpy==1.17.2; python_version >= '3.8'", - "packaging==20.3", - "pyparsing==2.4.7", - "python-dateutil==2.8.1", - "scipy==1.4.1", - "six==1.15.0" + "numpy>=1.21.0; python_version >= '3.8'", + "scipy==1.4.1; python_version < '3.8'", + "scipy>=1.4.1; python_version >= '3.8'" ] )