Skip to content

Commit

Permalink
packaging: upgrade python to 3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
linzuzeng committed Oct 26, 2022
1 parent 8c81e71 commit a1df1cc
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Download python-webinstall.exe
uses: wei/wget@v1
with:
args: -O python-webinstall.exe https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64-webinstall.exe
args: -O python-webinstall.exe https://www.python.org/ftp/python/3.9.13/python-3.9.13-amd64.exe
- name: Upload artifact
uses: actions/upload-artifact@v1
with:
Expand All @@ -28,13 +28,13 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
strategy:
matrix:
node-version: [14.x]
node-version: [18.x]
steps:
- uses: actions/checkout@v2
- name: Download artifact
uses: actions/download-artifact@v1
with:
name: wheels-3.8
name: wheels-3.9
path: gui
- name: Download artifact
uses: actions/download-artifact@v1
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8]
python-version: [3.9]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
PYPI_USERNAME: ${{secrets.PYPI_USERNAME}}
strategy:
matrix:
python-version: [3.8]
python-version: [3.9]
steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
Expand All @@ -114,7 +114,7 @@ jobs:
- name: Download artifact
uses: actions/download-artifact@v1
with:
name: wheels-3.8
name: wheels-3.9
path: dist
- name: Twine upload
run: |
Expand All @@ -126,7 +126,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.8,3.9]
python-version: [3.9,3.10]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -136,7 +136,7 @@ jobs:
- name: Download artifact
uses: actions/download-artifact@v1
with:
name: wheels-3.8
name: wheels-3.9
path: dist
- name: Test with pytest
run: |
Expand Down
6 changes: 3 additions & 3 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Installing ETA
--------
ETA is comprised of two parts communicating via websocket: the GUI and the backend. We chose to separate the program in this way to allow remote analysis of time tags. Since correlators are typically close to the setup and require a fast interface for data transfer, it is advisable to run the backend on the computer controlling the correlator. The GUI, however, can be used from anywhere with a morden browser, and network access to the data aquisition computer. If you transfered the time tag files to your own computer for evaluation, make sure you are running both the GUI and the backend locally.

Currently, ETA (>=0.7.0) has been tested on 64-bit versions of Microsoft Windows 7/10, Ubuntu 20.04 and Mac OS 10.15 with Python 3.8/3.9, but it may also work nicely on other platforms. We recommend users to install ETA as a standalone program on Windows, and as a Python package on other platforms.
Currently, ETA (>=0.7.0) has been tested on 64-bit versions of Microsoft Windows 7/10/11, Ubuntu 20.04/22.04 and Mac OS 10.15 with Python >3.6, but it may also work nicely on other platforms. We recommend users to install ETA as a standalone program on Windows, and as a Python package on other platforms.

Install as a standalone program (Windows-only)
......
Expand Down Expand Up @@ -44,11 +44,11 @@ For offical Python distribution:
For Anaconda/Miniconda in separate environment:
,,,,

* Open the Anaconda promt and type the following lines. This will create a conda environment for ETA with python newer than 3.8 but not 3.9, yet (incompatible with llvmlite).
* Open the Anaconda promt and type the following lines. This will create a conda environment for ETA with python newer than 3.9.

.. code::
conda create -n ETA python=3.8
conda create -n ETA python=3.9
conda install -n ETA pip
activate ETA
pip install etabackend
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# tox.ini
[tox]
envlist = py38, py39
envlist = py39, py310
[gh-actions]
python =
3.8: py38
3.10: py310
3.9: py39
[testenv]
description = Unit tests
Expand Down

0 comments on commit a1df1cc

Please sign in to comment.