Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GlasgowEmbedded/glasgow
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 050a5ca398ae
Choose a base ref
...
head repository: GlasgowEmbedded/glasgow
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 97a151baba59
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Aug 6, 2019

  1. Bump required Python version to 3.7.

    @whitequark
    whitequark committed Aug 6, 2019
    Copy the full SHA
    97a151b View commit details
Showing with 11 additions and 7 deletions.
  1. +2 −2 .travis.yml
  2. +5 −5 README.md
  3. +4 −0 software/setup.py
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
dist: trusty
dist: xenial
sudo: required
language: python
python:
- "3.6"
- "3.7"
addons:
apt:
update: true
10 changes: 5 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -76,9 +76,9 @@ Debugging new applets can be hard, especially if bidirectional buses are involve

### ... with Linux?

You will need Python 3.6 (or a newer version, in which case replace `3.6` with that version below) and sdcc. On a Debian or Ubuntu system these can be installed with:
You will need Python 3.7 (or a newer version, in which case replace `3.7` with that version below) and sdcc. On a Debian or Ubuntu system these can be installed with:

apt-get install python3.6 sdcc
apt-get install python3.7 sdcc

Obtain the source code:

@@ -92,16 +92,16 @@ Configure your system to allow unprivileged access (for anyone in the `plugdev`
Install the dependencies and the binaries for the current user:

cd software
python3.6 setup.py develop --user
python3.7 setup.py develop --user

The binaries are placed in `$HOME/.local/bin`, so be sure to add that directory to the `PATH` environment variable; after this, you can run `glasgow` from a terminal. Instead of adjusting `PATH` it is also possible to use `python3.6 -m glasgow.cli`.
The binaries are placed in `$HOME/.local/bin`, so be sure to add that directory to the `PATH` environment variable; after this, you can run `glasgow` from a terminal. Instead of adjusting `PATH` it is also possible to use `python3.7 -m glasgow.cli`.

To update the source code, do:

cd Glasgow
git pull
cd software
python3.6 setup.py build_ext
python3.7 setup.py build_ext

### ... with Windows?

4 changes: 4 additions & 0 deletions software/setup.py
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,10 @@
import versioneer


if sys.version_info[:3] < (3, 7):
raise SystemExit("Glasgow requires Python 3.7+")


class GlasgowBuildExt(build_ext):
def run(self):
try: