Merge ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:tox-path into charm-k8s-ingress:master

Proposed by Tom Haddon
Status: Merged
Approved by: Jon Seager
Approved revision: 426f67670723a3592dda1e93186877772ec9bb8e
Merged at revision: 1c402ebb9595f4cebdbacac1abcdc6169d5cd687
Proposed branch: ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:tox-path
Merge into: charm-k8s-ingress:master
Diff against target: 55 lines (+2/-11)
3 files modified
.gitignore (+0/-2)
Makefile (+1/-6)
tox.ini (+1/-3)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-is (community) continuous-integration Approve
ingress-charmers Pending
Review via email: mp+412510@code.launchpad.net

Commit message

Clean up tox path and gitignore since build and venv directories are no longer used

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

FAILED: Continuous integration, rev:1468886f4b9cd097e9d377bd3fb45e95f6fc31d1

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress/+merge/412510/+edit-commit-message

https://jenkins.canonical.com/is/job/lp-charm-k8s-ingress-ci/56/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/is/job/lp-charm-test/155/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/586709/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-ingress-ci/56//rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :
review: Approve (continuous-integration)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 1c402ebb9595f4cebdbacac1abcdc6169d5cd687

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2index 58a7dc6..ca38d73 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -4,5 +4,3 @@
6 .tox
7 .coverage
8 __pycache__
9-build
10-venv
11diff --git a/Makefile b/Makefile
12index 5507d2e..350bb87 100644
13--- a/Makefile
14+++ b/Makefile
15@@ -6,9 +6,7 @@ lint: blacken
16 @echo "Running flake8"
17 @tox -e lint
18
19-# We actually use the build directory created by charmcraft,
20-# but the .charm file makes a much more convenient sentinel.
21-unittest: nginx-ingress-integrator_ubuntu-20.04-amd64.charm
22+unittest:
23 @tox -e unit
24
25 test: lint unittest
26@@ -17,7 +15,4 @@ clean:
27 @echo "Cleaning files"
28 @git clean -fXd
29
30-nginx-ingress-integrator_ubuntu-20.04-amd64.charm: src/*.py requirements.txt
31- charmcraft build
32-
33 .PHONY: lint test unittest clean
34diff --git a/tox.ini b/tox.ini
35index b5626e4..349e8e4 100644
36--- a/tox.ini
37+++ b/tox.ini
38@@ -5,8 +5,6 @@ skip_missing_interpreters = True
39
40 [testenv]
41 basepython = python3
42-setenv =
43- PYTHONPATH = {toxinidir}/build/lib:{toxinidir}/build/venv
44
45 [testenv:unit]
46 commands =
47@@ -15,7 +13,7 @@ commands =
48 deps = -r{toxinidir}/tests/unit/requirements.txt
49 -r{toxinidir}/requirements.txt
50 setenv =
51- PYTHONPATH={toxinidir}/src:{toxinidir}:lib:{toxinidir}/build/lib:{toxinidir}/build/venv
52+ PYTHONPATH={toxinidir}/src:{toxinidir}:lib
53 TZ=UTC
54
55 [testenv:functional]

Subscribers

People subscribed via source and target branches

to all changes: