-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2612 from zimmerman-team/develop
Merge develop into master for new release.
- Loading branch information
Showing
21 changed files
with
118 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers. | |
## Enforcement | ||
|
||
Instances of abusive, harassing, or otherwise unacceptable behavior may be | ||
reported by contacting the project team at [email protected]. All | ||
reported by contacting the project team at [email protected]. All | ||
complaints will be reviewed and investigated and will result in a response that | ||
is deemed necessary and appropriate to the circumstances. The project team is | ||
obligated to maintain confidentiality with regard to the reporter of an incident. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -772,7 +772,7 @@ def test_create_contact_info(self): | |
}, | ||
"telephone": "0631942897", | ||
"email": "[email protected]", | ||
"website": "https://zimmermanzimmerman.com", | ||
"website": "https://zimmerman.team", | ||
"mailing_address": { | ||
"narratives": [ | ||
{ | ||
|
@@ -906,7 +906,7 @@ def test_update_contact_info(self): | |
}, | ||
"telephone": "0631942897", | ||
"email": "[email protected]", | ||
"website": "https://zimmermanzimmerman.com", | ||
"website": "https://zimmerman.team", | ||
"mailing_address": { | ||
"narratives": [ | ||
{ | ||
|
@@ -1424,7 +1424,7 @@ def test_create_location(self): | |
"latitude": "31.616944", | ||
"longitude": "65.716944", | ||
}, | ||
"srsName": "http://www.opengis.net/def/crs/EPSG/0/4326", | ||
"srsName": "https://www.opengis.net/def/crs/EPSG/0/4326", | ||
}, | ||
"exactness": { | ||
"code": exactness.code, | ||
|
@@ -1566,7 +1566,7 @@ def test_update_location(self): | |
"latitude": "31.616944", | ||
"longitude": "65.716944", | ||
}, | ||
"srsName": "http://www.opengis.net/def/crs/EPSG/0/4326", | ||
"srsName": "https://www.opengis.net/def/crs/EPSG/0/4326", | ||
}, | ||
"exactness": { | ||
"code": exactness.code, | ||
|
@@ -1692,7 +1692,7 @@ def test_create_humanitarian_scope(self): | |
"code": vocabulary.code, | ||
"name": 'irrelevant', | ||
}, | ||
"vocabulary_uri": "https://github.com/zimmerman-zimmerman", | ||
"vocabulary_uri": "https://github.com/zimmerman-team", | ||
} | ||
|
||
res = self.c.post( | ||
|
@@ -1729,7 +1729,7 @@ def test_update_humanitarian_scope(self): | |
"code": vocabulary.code, | ||
"name": 'irrelevant', | ||
}, | ||
"vocabulary_uri": "https://github.com/zimmerman-zimmerman", | ||
"vocabulary_uri": "https://github.com/zimmerman-team", | ||
} | ||
|
||
res = self.c.put( | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -210,7 +210,7 @@ class Meta: | |
type = SubFactory(ContactTypeFactory) | ||
telephone = "0044111222333444" | ||
email = "[email protected]" | ||
website = "http://www.example.org" | ||
website = "https://www.example.org" | ||
|
||
|
||
class RelatedActivityFactory(NoDatabaseFactory): | ||
|
@@ -673,7 +673,7 @@ class Meta: | |
location_id_vocabulary = SubFactory(GeographicVocabularyFactory) | ||
location_id_code = '23213' | ||
point_pos = GEOSGeometry(Point(20.22, 45.22), srid=4326) | ||
point_srs_name = "http://www.opengis.net/def/crs/EPSG/0/4326" | ||
point_srs_name = "https://www.opengis.net/def/crs/EPSG/0/4326" | ||
exactness = SubFactory(GeographicExactnessFactory) | ||
location_class = SubFactory(GeographicLocationClassFactory) | ||
feature_designation = SubFactory(LocationTypeFactory) | ||
|
@@ -860,7 +860,7 @@ class Meta: | |
code = "code" | ||
type = SubFactory(HumanitarianScopeTypeFactory) | ||
vocabulary = SubFactory(HumanitarianScopeVocabularyFactory) | ||
vocabulary_uri = "http://reference.iatistandard.org/202/activity-standard/\ | ||
vocabulary_uri = "https://reference.iatistandard.org/202/activity-standard/\ | ||
iati-activities/iati-activity/humanitarian-scope/" | ||
|
||
|
||
|
Oops, something went wrong.