From ce19e7d7da8769ab055e9d41fbeec8625d3f1a13 Mon Sep 17 00:00:00 2001 From: Mariatta Date: Mon, 27 Aug 2018 19:41:39 -0700 Subject: [PATCH 1/8] Fix warnings when building the documentation. Fix the warning related to `--repository` option. Add sphinx to requirements-test. Run `make html` as part of travis CI. Closes https://github.com/takluyver/flit/issues/189 --- .travis.yml | 4 +++- doc/upload.rst | 2 +- requirements-test.txt | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 88a048e9..e7ecd547 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,8 @@ install: - pip install --upgrade pytest - pip install -r requirements-test.txt - pip install codecov -script: py.test --cov=flit +script: + - py.test --cov=flit + - sphinx-build -b html -d _build/doctrees doc _build/html after_success: codecov sudo: false 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/requirements-test.txt b/requirements-test.txt index 035643c0..b19c4d10 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -8,3 +8,4 @@ pytoml pytest>=2.7.3 pytest-warnings pytest-cov +sphinx \ No newline at end of file From d1f47dcb33a99276c593fabf04d77623b282a272 Mon Sep 17 00:00:00 2001 From: Mariatta Date: Mon, 27 Aug 2018 19:50:45 -0700 Subject: [PATCH 2/8] flit install --- .travis.yml | 4 ++-- pyproject.toml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e7ecd547..80b5eaaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ matrix: sudo: true install: - - pip install --upgrade pytest - - pip install -r requirements-test.txt + - pip install --upgrade pip flit + - flit install --deps develop - pip install codecov script: - py.test --cov=flit diff --git a/pyproject.toml b/pyproject.toml index 41b8e917..eb760434 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,6 +35,7 @@ test = [ ] doc = [ "pygments-github-lexers", # TOML highlighting + "sphinx", ] [tool.flit.metadata.urls] From 9542a24ba6207813c206229e81d2bc82300d688d Mon Sep 17 00:00:00 2001 From: Mariatta Date: Mon, 27 Aug 2018 19:58:14 -0700 Subject: [PATCH 3/8] Don't add sphinx to requirements-test. --- pyproject.toml | 2 +- requirements-test.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index eb760434..6dab9c21 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ test = [ "pytest-cov", ] doc = [ - "pygments-github-lexers", # TOML highlighting + "pygments-github-lexers", # TOML highlighting "sphinx", ] diff --git a/requirements-test.txt b/requirements-test.txt index b19c4d10..7b98cf26 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -7,5 +7,4 @@ zipfile36 pytoml pytest>=2.7.3 pytest-warnings -pytest-cov -sphinx \ No newline at end of file +pytest-cov \ No newline at end of file From 019061b81d0a3a41175ddf92e6286f796c689095 Mon Sep 17 00:00:00 2001 From: Mariatta Date: Wed, 29 Aug 2018 17:11:33 -0700 Subject: [PATCH 4/8] Don't install from pypi --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80b5eaaa..06cace2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,9 @@ matrix: sudo: true install: - - pip install --upgrade pip flit - - flit install --deps develop - - pip install codecov + - python3 -m pip install --upgrade pip flit + - 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 From 2c486ef6b119771670f0aa2d084b8181fdd76daf Mon Sep 17 00:00:00 2001 From: Mariatta Date: Thu, 30 Aug 2018 13:00:27 -0700 Subject: [PATCH 5/8] Bump version to 1.2.dev0 --- doc/conf.py | 2 +- flit/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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__) From 1912b1b694dd6f2cf76dc6f5756af429c7240cd9 Mon Sep 17 00:00:00 2001 From: Mariatta Date: Thu, 30 Aug 2018 13:04:57 -0700 Subject: [PATCH 6/8] Rebase, with version bump to 1.2.dev0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 06cace2f..c1629dd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ matrix: sudo: true install: - - python3 -m pip install --upgrade pip flit + - python3 -m pip install --upgrade pip docutils requests pytoml - python3 -m flit install --deps develop - python3 -m pip install codecov script: From 4a644f1e6be1eda51e834e67e2329088e1861beb Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Thu, 30 Aug 2018 13:22:00 -0700 Subject: [PATCH 7/8] Install requiremetns from requirements-test.txt --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c1629dd4..83df85f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,8 @@ matrix: sudo: true install: - - python3 -m pip install --upgrade pip docutils requests pytoml + - 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: From bbf8192122374b747d4a6d80c34482f3efb8fdfa Mon Sep 17 00:00:00 2001 From: Mariatta Date: Thu, 30 Aug 2018 13:36:41 -0700 Subject: [PATCH 8/8] Update appveyor.yml --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) 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"