You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bloodhound.apache.org by gj...@apache.org on 2018/06/05 21:26:51 UTC
svn commit: r1832975 - in /bloodhound/branches/bh_core_experimental: Pipfile
Pipfile.lock README.md
Author: gjm
Date: Tue Jun 5 21:26:50 2018
New Revision: 1832975
URL: http://svn.apache.org/viewvc?rev=1832975&view=rev
Log:
Improving README.md accuracy; adjusting Pipfile
Modified:
bloodhound/branches/bh_core_experimental/Pipfile
bloodhound/branches/bh_core_experimental/Pipfile.lock
bloodhound/branches/bh_core_experimental/README.md
Modified: bloodhound/branches/bh_core_experimental/Pipfile
URL: http://svn.apache.org/viewvc/bloodhound/branches/bh_core_experimental/Pipfile?rev=1832975&r1=1832974&r2=1832975&view=diff
==============================================================================
--- bloodhound/branches/bh_core_experimental/Pipfile (original)
+++ bloodhound/branches/bh_core_experimental/Pipfile Tue Jun 5 21:26:50 2018
@@ -10,7 +10,6 @@ PyYAML = "*"
[packages]
django = ">=2.0.0"
-pyyaml = "*"
[requires]
python_version = "3.6"
Modified: bloodhound/branches/bh_core_experimental/Pipfile.lock
URL: http://svn.apache.org/viewvc/bloodhound/branches/bh_core_experimental/Pipfile.lock?rev=1832975&r1=1832974&r2=1832975&view=diff
==============================================================================
--- bloodhound/branches/bh_core_experimental/Pipfile.lock (original)
+++ bloodhound/branches/bh_core_experimental/Pipfile.lock Tue Jun 5 21:26:50 2018
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "4e791c7fd7b1d7f8749e94bcf56e4f78fb6514b5cf0d3174fe26d91f92cb672d"
+ "sha256": "5ba6eeb95fa58896eba1e3528bdea3ae2430c5424239bef1345adc500dc53fcd"
},
"pipfile-spec": 6,
"requires": {
@@ -30,26 +30,6 @@
"sha256:c06425302f2cf668f1bba7a0a03f3c1d34d4ebeef2c72003da308b3947c7f749"
],
"version": "==2018.4"
- },
- "pyyaml": {
- "hashes": [
- "sha256:0c507b7f74b3d2dd4d1322ec8a94794927305ab4cebbe89cc47fe5e81541e6e8",
- "sha256:16b20e970597e051997d90dc2cddc713a2876c47e3d92d59ee198700c5427736",
- "sha256:3262c96a1ca437e7e4763e2843746588a965426550f3797a79fca9c6199c431f",
- "sha256:326420cbb492172dec84b0f65c80942de6cedb5233c413dd824483989c000608",
- "sha256:4474f8ea030b5127225b8894d626bb66c01cda098d47a2b0d3429b6700af9fd8",
- "sha256:592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab",
- "sha256:5ac82e411044fb129bae5cfbeb3ba626acb2af31a8d17d175004b70862a741a7",
- "sha256:5f84523c076ad14ff5e6c037fe1c89a7f73a3e04cf0377cb4d017014976433f3",
- "sha256:827dc04b8fa7d07c44de11fabbc888e627fa8293b695e0f99cb544fdfa1bf0d1",
- "sha256:b4c423ab23291d3945ac61346feeb9a0dc4184999ede5e7c43e1ffb975130ae6",
- "sha256:bc6bced57f826ca7cb5125a10b23fd0f2fff3b7c4701d64c439a300ce665fff8",
- "sha256:c01b880ec30b5a6e6aa67b09a2fe3fb30473008c85cd6a67359a1b15ed6d83a4",
- "sha256:ca233c64c6e40eaa6c66ef97058cdc80e8d0157a443655baa1b2966e812807ca",
- "sha256:e863072cdf4c72eebf179342c94e6989c67185842d9997960b3e69290b2fa269"
- ],
- "index": "pypi",
- "version": "==3.12"
}
},
"develop": {
@@ -92,10 +72,10 @@
},
"pytest": {
"hashes": [
- "sha256:39555d023af3200d004d09e51b4dd9fdd828baa863cded3fd6ba2f29f757ae2d",
- "sha256:c76e93f3145a44812955e8d46cdd302d8a45fbfc7bf22be24fe231f9d8d8853a"
+ "sha256:26838b2bc58620e01675485491504c3aa7ee0faf335c37fcd5f8731ca4319591",
+ "sha256:32c49a69566aa7c333188149ad48b58ac11a426d5352ea3d8f6ce843f88199cb"
],
- "version": "==3.6.0"
+ "version": "==3.6.1"
},
"pytest-django": {
"hashes": [
Modified: bloodhound/branches/bh_core_experimental/README.md
URL: http://svn.apache.org/viewvc/bloodhound/branches/bh_core_experimental/README.md?rev=1832975&r1=1832974&r2=1832975&view=diff
==============================================================================
--- bloodhound/branches/bh_core_experimental/README.md (original)
+++ bloodhound/branches/bh_core_experimental/README.md Tue Jun 5 21:26:50 2018
@@ -23,6 +23,13 @@ pipenv install
If this doesn't work, it should be done from the same directory as the
`Pipenv` file.
+Additionally, to run tests described later, you'll also need to install the
+development dependencies:
+
+```
+pipenv install --dev
+```
+
Though possibly annoying, the commands in this file will assume the use of
`pipenv` but not that the pipenv shell has been activated.
@@ -61,7 +68,7 @@ pipenv run python manage.py test
Fixtures for tests when required can be generated with:
```
-pipenv python manage.py dumpdata bh-core --format=yaml --indent=2 > bh-core/fixtures/[fixture-name].yaml
+pipenv run python manage.py dumpdata trackers --format=yaml --indent=2 > trackers/fixtures/[fixture-name].yaml
```
## Integration Tests
@@ -79,9 +86,8 @@ tar -x geckodriver -zf "$TMP_DIR/geckodr
chmod +x "$BIN_LOCATION"/geckodriver
```
-If `$BIN_LOCATION` is on the system path, it should be possible to run the integration tests.
-
-So, assuming the use of pipenv:
+If `$BIN_LOCATION` is on the system path, and the development server is
+running, it should be possible to run the integration tests.
```
pipenv run python functional_tests.py