Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unicode error #136

Closed
wants to merge 12 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,10 @@ jobs:
strategy:
matrix:
os: [Ubuntu, MacOS, Windows]
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3]
python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
exclude:
- os: Ubuntu
python-version: pypy2
- os: MacOS
python-version: pypy2
- os: MacOS
python-version: pypy3
- os: Windows
python-version: pypy2
- os: Windows
python-version: pypy3
steps:
Expand All @@ -48,11 +42,6 @@ jobs:
shell: bash
run: poetry config virtualenvs.in-project true

- name: Configure poetry installer
if: matrix.python-version == '2.7'
shell: bash
run: poetry config experimental.new-installer false

- name: Set up cache
uses: actions/cache@v1
id: cache
Expand Down
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
repos:
- repo: https://github.com/psf/black
rev: 19.10b0
rev: 20.8b1
hooks:
- id: black
exclude: ^poetry/core/_vendor

- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.3
rev: 3.8.4
hooks:
- id: flake8
exclude: |
Expand All @@ -16,8 +16,8 @@ repos:
| ^poetry/core/_vendor
)

- repo: https://github.com/pre-commit/mirrors-isort
rev: v5.4.2
- repo: https://github.com/timothycrosley/isort
rev: 5.7.0
hooks:
- id: isort
additional_dependencies: [toml]
Expand All @@ -28,7 +28,7 @@ repos:
)

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
rev: v3.4.0
hooks:
- id: trailing-whitespace
exclude: |
Expand Down
21 changes: 12 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,27 @@ ROOT_DIR := $(patsubst %/,%,$(dir $(MAKEFILE_PATH)))

VENDOR_SRC := $(ROOT_DIR)/vendors
VENDOR_DIR := $(ROOT_DIR)/poetry/core/_vendor
VENDOR_TXT := $(VENDOR_DIR)/vendor.txt
POETRY_BIN ?= $(shell which poetry)


.PHONY: vendor/lock
vendor/lock:
# regenerate lock file
@pushd $(VENDOR_SRC) && $(POETRY_BIN) lock
vendor/lock: $(VENDOR_LOCK)
# regenerate lock file
@pushd $(VENDOR_SRC) && $(POETRY_BIN) lock --no-update

.PHONY: vendor/sync
vendor/sync:
# regenerate vendor.txt file (exported from lockfile)
@pushd $(VENDOR_SRC) && $(POETRY_BIN) export --without-hashes \
@pushd $(VENDOR_SRC) && $(POETRY_BIN) export --without-hashes 2> /dev/null \
| egrep -v "(importlib|zipp)" \
| sort > $(VENDOR_DIR)/vendor.txt

| sort > $(VENDOR_TXT)

.PHONY: vendor/sync
vendor/sync: | vendor/lock
# vendor packages
@vendoring sync

# strip out *.pyi stubs
@find "$(VENDOR_DIR)" -type f -name "*.pyi" -exec rm {} \;

.PHONY: vendor/update
vendor/update: | vendor/lock vendor/sync
@:
Loading