Skip to content

Commit d32f64d

Browse files
authored
Merge pull request #227 from EasyPost/remove_pypy
chore: remove pypy tests and plumbing
2 parents 67b8bb6 + 0ae62c7 commit d32f64d

File tree

6 files changed

+12
-25
lines changed

6 files changed

+12
-25
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ jobs:
2222
runs-on: ubuntu-latest
2323
strategy:
2424
matrix:
25-
pythonversion: ["pypy-3.6", "3.6", "3.7", "3.8", "3.9", "3.10"]
25+
pythonversion: ["3.6", "3.7", "3.8", "3.9", "3.10"]
2626
steps:
2727
- uses: actions/checkout@v3
2828
- name: set up python
2929
uses: actions/setup-python@v3
3030
with:
3131
python-version: ${{ matrix.pythonversion }}
3232
- name: Install Dependencies
33-
run: make ${{ matrix.pythonversion == 'pypy-3.6' && 'install-pypy' || 'install' }}
33+
run: make install
3434
- name: Run Tests
3535
run: EASYPOST_TEST_API_KEY=123 EASYPOST_PROD_API_KEY=123 make test
3636
- name: Run security analysis

Makefile

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,12 @@ format: black isort
3636
format-check: black-check isort-check lint mypy
3737

3838
## install - Install the project locally
39-
install: | venv install-dev
40-
41-
## install-dev - Install dev requirements
42-
install-dev: | venv
39+
install:
40+
$(PYTHON_BINARY) -m venv $(VIRTUAL_ENV)
4341
$(VIRTUAL_BIN)/pip install -e ."[dev]"
4442
git submodule init
4543
git submodule update
4644

47-
## install-pypy - Install dev requirements for pypy
48-
install-pypy: | venv
49-
$(VIRTUAL_BIN)/pip install -e ."[pypy_dev]"
50-
git submodule init
51-
git submodule update
52-
5345
## isort - Sorts imports throughout the project
5446
isort:
5547
$(VIRTUAL_BIN)/isort $(PROJECT_NAME)/ $(TEST_DIR)/
@@ -83,8 +75,4 @@ scan:
8375
test:
8476
$(VIRTUAL_BIN)/pytest
8577

86-
## venv - Create the virtual environment
87-
venv:
88-
$(PYTHON_BINARY) -m venv $(VIRTUAL_ENV)
89-
90-
.PHONY: help build clean coverage black black-check format format-check install install-dev install-pypy isort isort-check lint mypy publish release scan test
78+
.PHONY: help build clean coverage black black-check format format-check install isort isort-check lint mypy publish release scan test

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ EasyPost, the simple shipping solution. You can sign up for an account at <https
77

88
## Install
99

10+
The library is tested against Python3 and should be compatible with PyPy3.
11+
1012
```bash
1113
pip install easypost
1214
```

easypost/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# flake8: noqa
12
import easypost.beta
23
from easypost.address import Address
34
from easypost.batch import Batch

easypost/beta/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# flake8: noqa
12
from easypost.beta.referral import Referral

setup.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
DEV_REQUIREMENTS = [
1313
"bandit==1.7.1", # Bandit 1.7.2 drops support for Python 3.6
1414
"black==22.*",
15-
"flake8==4.*",
15+
"flake8==5.*",
1616
"isort==5.*",
17+
"mypy==0.971",
1718
"pytest-cov==3.*",
1819
"pytest-vcr==1.*",
1920
"pytest==7.*",
@@ -24,11 +25,6 @@
2425
"wheel==0.37.*",
2526
]
2627

27-
# packages incompatible with PyPy go here
28-
CPYTHON_DEV_REQUIREMENTS = [
29-
"mypy==0.942",
30-
]
31-
3228
with open("README.md", encoding="utf-8") as f:
3329
long_description = f.read()
3430

@@ -47,8 +43,7 @@
4743
),
4844
install_requires=REQUIREMENTS,
4945
extras_require={
50-
"dev": DEV_REQUIREMENTS + CPYTHON_DEV_REQUIREMENTS,
51-
"pypy_dev": DEV_REQUIREMENTS, # no cpython requirements
46+
"dev": DEV_REQUIREMENTS,
5247
},
5348
package_data={
5449
"easypost": ["py.typed"],

0 commit comments

Comments
 (0)