diff --git a/.travis.yml b/.travis.yml index 88a048e9..83df85f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,12 @@ matrix: sudo: true install: - - pip install --upgrade pytest - - pip install -r requirements-test.txt - - pip install codecov -script: py.test --cov=flit + - python3 -m pip install --upgrade pip + - python3 -m pip install --upgrade -r requirements-test.txt + - python3 -m flit install --deps develop + - python3 -m pip install codecov +script: + - py.test --cov=flit + - sphinx-build -b html -d _build/doctrees doc _build/html after_success: codecov sudo: false diff --git a/appveyor.yml b/appveyor.yml index 237fc053..364e7718 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,9 +6,12 @@ environment: - PYTHON: "C:\\Python36" install: + - "%PYTHON%\\python.exe -m pip install --upgrade pip codecov" - "%PYTHON%\\python.exe -m pip install -r requirements-test.txt" + - "%PYTHON%\\python.exe -m flit install --deps develop" build: off test_script: - "%PYTHON%\\python.exe -m pytest" + - "sphinx-build -b html -d _build\\doctrees doc _build\\html" diff --git a/doc/conf.py b/doc/conf.py index 0e2ab1a1..b33a9738 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -53,7 +53,7 @@ # built documents. # # The short X.Y version. -version = '1.1' +version = '1.2.dev0' # The full version, including alpha/beta/rc tags. release = version #+ '.1' diff --git a/doc/upload.rst b/doc/upload.rst index 9c4b339d..b2701b30 100644 --- a/doc/upload.rst +++ b/doc/upload.rst @@ -60,7 +60,7 @@ Using environment variables You can specify a server to upload to with :envvar:`FLIT_INDEX_URL`, and pass credentials with :envvar:`FLIT_USERNAME` and :envvar:`FLIT_PASSWORD`. Environment variables take precedence over the config file, except if you use -the :option:`--repository` option to explicitly pick a server from the config file. +the :option:`flit --repository` option to explicitly pick a server from the config file. This can make it easier to automate uploads, for example to release packages from a continuous integration job. diff --git a/flit/__init__.py b/flit/__init__.py index 647d253c..abd27a8e 100644 --- a/flit/__init__.py +++ b/flit/__init__.py @@ -7,7 +7,7 @@ from . import common from .log import enable_colourful_output -__version__ = '1.1' +__version__ = '1.2.dev0' log = logging.getLogger(__name__) diff --git a/pyproject.toml b/pyproject.toml index 41b8e917..6dab9c21 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,8 @@ test = [ "pytest-cov", ] doc = [ - "pygments-github-lexers", # TOML highlighting + "pygments-github-lexers", # TOML highlighting + "sphinx", ] [tool.flit.metadata.urls] diff --git a/requirements-test.txt b/requirements-test.txt index 035643c0..7b98cf26 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -7,4 +7,4 @@ zipfile36 pytoml pytest>=2.7.3 pytest-warnings -pytest-cov +pytest-cov \ No newline at end of file