Skip to content

Commit 7b2260f

Browse files
authored
Support Python 3.8 release (#447)
* Support Python 3.8 release * Also bump versions * Format
1 parent b50fac9 commit 7b2260f

File tree

12 files changed

+141
-66
lines changed

12 files changed

+141
-66
lines changed

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ version: 2
22
jobs:
33
test-cpython:
44
docker:
5-
- image: chrisrink10/pyenv:3.6-3.7-3.8dev-0.0.6
5+
- image: chrisrink10/pyenv:3.6-3.7-3.8-0.0.1
66
user: pyenv
77
steps:
88
- checkout
99
- restore_cache:
10-
key: deps-{{ .Branch }}-{{ checksum "Pipfile.lock" }}
10+
key: deps-{{ .Branch }}-{{ checksum "tox.ini" }}-{{ checksum "Pipfile.lock" }}
1111
- run:
1212
name: Install tox
1313
shell: /bin/bash -leo pipefail
@@ -22,7 +22,7 @@ jobs:
2222
command: |
2323
tox -p $TOX_NUM_CORES -e py36,py37,py38,coverage,mypy,format,lint,safety
2424
- save_cache:
25-
key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }}
25+
key: deps9-{{ .Branch }}-{{ checksum "tox.ini" }}-{{ checksum "Pipfile.lock" }}
2626
paths:
2727
- "/home/pyenv/.tox"
2828
- "/usr/local/bin"
@@ -32,11 +32,11 @@ jobs:
3232

3333
test-pypy:
3434
docker:
35-
- image: pypy:3.6-7.1-slim-stretch
35+
- image: pypy:3.6-7.2-slim-stretch
3636
steps:
3737
- checkout
3838
- restore_cache:
39-
key: deps-{{ .Branch }}-{{ checksum "Pipfile.lock" }}
39+
key: deps-{{ .Branch }}-{{ checksum "tox.ini" }}-{{ checksum "Pipfile.lock" }}
4040
- run:
4141
name: Install tox
4242
command: |
@@ -46,7 +46,7 @@ jobs:
4646
command: |
4747
tox -e pypy3
4848
- save_cache:
49-
key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }}
49+
key: deps9-{{ .Branch }}-{{ checksum "tox.ini" }}-{{ checksum "Pipfile.lock" }}
5050
paths:
5151
- "/home/pyenv/.tox"
5252
- "/usr/local/bin"

Pipfile.lock

Lines changed: 95 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import sys
1010
from shutil import rmtree
1111

12-
from setuptools import setup, Command, find_packages
12+
from setuptools import Command, find_packages, setup
1313

1414
# Package metadata
1515
NAME = "basilisp"
@@ -121,6 +121,7 @@ def run(self):
121121
"Programming Language :: Python :: 3",
122122
"Programming Language :: Python :: 3.6",
123123
"Programming Language :: Python :: 3.7",
124+
"Programming Language :: Python :: 3.8",
124125
"Programming Language :: Python :: Implementation :: CPython",
125126
"Programming Language :: Python :: Implementation :: PyPy",
126127
"Topic :: Software Development :: Compilers",

src/basilisp/importer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ def _get_basilisp_bytecode(
5757
raw_size = cache_data[8:12]
5858
if magic != MAGIC_NUMBER:
5959
message = (
60-
f"Incorrect magic number ({magic}) in {fullname}; expected {MAGIC_NUMBER}"
60+
f"Incorrect magic number ({magic!r}) in {fullname}; "
61+
f"expected {MAGIC_NUMBER!r}"
6162
)
6263
logger.debug(message)
6364
raise ImportError(message, **exc_details) # type: ignore

src/basilisp/lang/compiler/analyzer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ def _meta_getter(meta_kw: kw.Keyword) -> MetaGetter:
496496
value by meta_kw."""
497497

498498
def has_meta_prop(o: Union[IMeta, Var]) -> bool:
499-
return ( # type: ignore
499+
return bool(
500500
Maybe(o.meta).map(lambda m: m.val_at(meta_kw, None)).or_else_get(False)
501501
)
502502

0 commit comments

Comments
 (0)