Skip to content

Commit

Permalink
Additional fixes for PEP517 issues
Browse files Browse the repository at this point in the history
  • Loading branch information
douglasdaly committed May 4, 2019
1 parent 7c806e5 commit baa84b4
Show file tree
Hide file tree
Showing 8 changed files with 227 additions and 183 deletions.
4 changes: 4 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@

version: 2

sphinx:
configuration: docs/conf.py

python:
version: 3.7
install:
- requirements: requirements.txt
- requirements: requirements-dev.txt
- method: pip
path: .
22 changes: 13 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,17 @@ ifeq ($(PKG_MGR), pipenv)
CREATE_VENV =
REMOVE_VENV = pipenv --rm
INSTALL_DEPENDENCIES = pipenv install --dev
GENERATE_DEPENDENCIES = pipenv lock --dev -r > requirements.txt
GENERATE_DEPENDENCIES = pipenv lock -r
GENERATE_DEPENDENCIES_DEV := $(GENERATE_DEPENDENCIES) --dev
else
RUN_PRE =
VENV_DIR = env

CREATE_VENV := virtualenv $(VENV_DIR)/
REMOVE_VENV := rm -rf $(VENV_DIR)
INSTALL_DEPENDENCIES = pip install -r requirements.txt
GENERATE_DEPENDENCIES = pip freeze --local > requirements.txt
GENERATE_DEPENDENCIES = pip freeze --local
GENERATE_DEPENDENCIES_DEV := $(GENERATE_DEPENDENCIES)
endif

ACTIVATE_VENV := source $(VENV_DIR)/bin/activate
Expand All @@ -74,8 +76,8 @@ TWINE := $(RUN_PRE) $(TWINE)
###############################################################################
.PHONY: help setup teardown \
venv-create venv-remove \
requirements requirements-gen \
docs docs-clean docs-del-api docs-gen-api docs-gen-make \
requirements generate-requirements \
docs docs-clean generate-docs-api generate-docs-make \
clean clean-build \
changes changes-draft changelog changelog-draft \
ipykernel-install ipykernel-uninstall \
Expand Down Expand Up @@ -107,10 +109,12 @@ venv-remove:
# Requirements

requirements: ## Installs Python dependencies
$(INSTALL_DEPENDENCIES)
(export PIP_USE_PEP517=false; $(INSTALL_DEPENDENCIES))

requirements-gen: ## Generates the project's requirements.txt file
$(GENERATE_DEPENDENCIES)
generate-requirements: ## Generates the project's requirements.txt files
$(GENERATE_DEPENDENCIES) > requirements.txt
$(GENERATE_DEPENDENCIES_DEV) > requirements-dev.txt
$(INVOKE) develop.update-requirements

# Documentation

Expand All @@ -120,10 +124,10 @@ docs: ## Generates the sphinx HTML documentation
docs-clean: ## Cleans the generated documentation
@cd docs/ && $(RUN_PRE) make clean

docs-gen-api: ## Generates the API documentation files
generate-docs-api: ## Generates the API documentation files
@cd docs/ && $(RUN_PRE) sphinx-apidoc -e -M -o api ../src/spines

docs-gen-make: ## Generates the API documentation for this Makefile
generate-docs-make: ## Generates the API documentation for this Makefile
$(INVOKE) docs.generate-make

# Cleaning
Expand Down
13 changes: 6 additions & 7 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true

[packages]
spines = {path = ".",editable = true}
parver = "*"
toml = "*"
xxhash = "*"

[dev-packages]
spines = {editable = true,path = "."}
coverage = "*"
flake8 = "*"
git-fame = "*"
Expand All @@ -14,22 +19,16 @@ jupyter = "*"
mypy = "*"
nbsphinx = "*"
pandoc = "*"
parver = "*"
pytest = "*"
pytest-cov = "*"
pytest-xdist = "*"
python-dotenv = "*"
sphinx = "*"
sphinx-rtd-theme = "*"
toml = "*"
towncrier = "*"
tox = "*"
twine = "*"
versioneer = "*"
wheel = "*"
xxhash = "*"

[packages]

[requires]
python_version = "3.7"
141 changes: 78 additions & 63 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools", "wheel"]
requires = ["setuptools", "wheel"] # PEP 508 specifications.

[tool.towncrier]
package = "spines"
Expand Down
Loading

0 comments on commit baa84b4

Please sign in to comment.