merge up from develop

DOAJ · Nov 15, 2024 · b808b57 · b808b57
2 parents aff25ce + 0f099fd
commit b808b57
Show file tree

Hide file tree

Showing 57 changed files with 1,343 additions and 405 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -74,5 +74,4 @@ workflows:
           filters:
             branches:
               ignore:
-                - /release\/.*/
                 - static_pages
diff --git a/README.md b/README.md
@@ -4,6 +4,12 @@
 This repository provides the software which drives the DOAJ website and the DOAJ 
 directory.
 
+## CI Status
+
+**develop** &nbsp; [![CircleCI](https://dl.circleci.com/status-badge/img/gh/DOAJ/doaj/tree/develop.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/DOAJ/doaj/tree/develop)
+
+**master** &nbsp; [![CircleCI](https://dl.circleci.com/status-badge/img/gh/DOAJ/doaj/tree/master.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/DOAJ/doaj/tree/master)
+
 ## Reporting issues
 
 Please feel free to use the issue tracker on https://github.com/DOAJ/doaj/issues for any bug 

diff --git a/cms/data/notifications.yml b/cms/data/notifications.yml
@@ -44,6 +44,10 @@ application:publisher:accepted:notify:
 
     It is your responsibility to keep the information about your journal in DOAJ up to date. When there are changes or updates needed please [submit an Update Request](https://doaj.org/publisher/journal) from your Publisher dashboard promptly. Please be aware that failure to do this may result in removal of your journal from DOAJ.
 
+    [How to submit an Update Request](https://doaj.org/apply/publisher-responsibilities/#keeping-your-journal-records-up-to-date)    
+
+    For more information on managing your DOAJ account and journal records, see our Publisher Information page (https://doaj.org/apply/publisher-responsibilities)                                                                                                                                                                                
+
     To increase the visibility, distribution and usage of your journal content, we encourage you to upload article metadata for this journal to DOAJ as soon as possible.
 
     [How to upload article metadata]({faq_url}#uploading-article-metadata)

diff --git a/cms/pages/about/index.md b/cms/pages/about/index.md
@@ -38,17 +38,6 @@ The work done by the [DOAJ Team](/about/team/) is supported by over 100 voluntar
 
 DOAJ also has a global network of Ambassadors who promote open access and best practice in their regions. Our Ambassadors are bound by an agreement and must declare all conflicts of interest.
 
-## Zero tolerance policy
-
-We expect the members of our Team, our volunteers and our Ambassadors to always be treated courteously and with respect for the work they are doing. They should not be subject to abusive behaviour in any form, which includes:
-
-- rude, disrespectful and offensive behaviour, including derogatory remarks or anything which amounts to verbal or emotional abuse in person or in communications
-- sexually inappropriate comments or behaviour
-- racist and discriminatory abuse
-- threats of physical violence
-- aggressive and violent behaviour
-
-
 ## Partnerships and collaborations
 
 DOAJ partners with many organisations. The nature of the partnerships varies and may include membership, contracts for work, exchanges of information or services, initiative signatories, or access to information resources that assist DOAJ with our application review process.
@@ -95,7 +84,72 @@ Established in 2015, Think. Check. Submit. was developed with the support of an
 
 Think. Check. Submit. provides tools and practical resources to educate researchers, promote integrity, and build trust in credible research and publications. Separate checklists for [journals](https://thinkchecksubmit.org/journals/) and [books](https://thinkchecksubmit.org/books-and-chapters/) are available to guide researchers through the key criteria for selecting where to publish their research and are also invaluable to scholarly communications professionals who are advising researchers about these issues. Both checklists are also available in a growing number of languages.
 
-
 ## Diversity
 
 DOAJ believes in the power and value of diversity in scholarly communications. DOAJ is an [adopting organisation](https://c4disc.org/about/adopting-organizations/) of the [C4DISC Joint Statement of Principles](https://c4disc.org/joint-statement-of-principles/). Adopting the Joint Statement of Principles demonstrates our support for improving diversity and inclusion in our industry.
+
+## Code of conduct and zero tolerance policy
+
+At DOAJ, we foster a welcoming and inclusive community for everyone. Our code of conduct and zero tolerance policy help us create an environment where you feel comfortable and valued. 
+
+### What this policy covers
+
+Our policy applies to all kinds of communication within our community or the spaces we create. They cover interactions among our team, volunteers, ambassadors, and individuals involved in events, activities and projects initiated or organised by us. This includes:
+
+- Communication via email or social media
+- Participation in webinars and events organised by us
+- Communication with our team members, volunteers and ambassadors at other events
+
+### Who this policy includes
+
+We welcome everyone, no matter your gender identity, sexual orientation, abilities, neurodiversity, appearance, body size, ethnicity, nationality, race, age, religion (or lack of it), social identity, or any other protected characteristic. Our community is wonderfully diverse and filled with passionate individuals who care deeply about their work. While our collaboration can sometimes spark lively discussions, we ask everyone to treat one another with consideration, kindness and respect.
+
+### Code of conduct
+
+We encourage members of our community who engage with or for DOAJ to:
+
+1. **Be kind and patient.** We want all members of our community to engage and be heard. We are a diverse community with many languages and many needs. Remember that people may use translation services or screen readers. They may be communicating in a second language.
+2. **Be respectful and open.** Our community is open scholarship, open research, open access, and open science. We encourage you to have open discussions. No matter the content, we ask you to communicate in a professional manner, be open to hearing others' points of view, and exchange information, experiences and knowledge openly.
+3. **Create a positive environment.** We want you to feel comfortable when engaging with us and our community. Learning and exploring different aspects of open scholarship should be fun! We encourage you to interact positively and share laughs, but avoid making demeaning or exclusionary jokes.
+4. **Speak up!** We encourage and support you in addressing unwelcome behaviour as long as you feel comfortable doing so. Otherwise, follow our process below to report issues.
+
+### Zero tolerance
+
+We have zero tolerance for:
+
+- Rude, disrespectful and offensive behaviour, including derogatory remarks or anything that amounts to verbal or emotional abuse
+- Sexually inappropriate comments or behaviour
+- Racist and discriminatory abuse
+- Threats of physical violence
+- Aggressive and violent behaviour
+- Doxxing (publishing private information about any of members of the DOAJ team, ambassadors or volunteers)
+- Stalking
+
+Or any other inappropriate behaviours that breach our code of conduct.
+
+### Reporting and resolving issues
+
+#### Reporting issues
+
+If you have concerns about someone’s behaviour, please contact the Operations Manager, Lene ([email protected]). Lene will:
+
+- refer the incident to our Executive Team (who will decide on further action)
+- follow up with all those involved and provide you with an update
+
+#### Resolving issues
+
+In cases where our zero tolerance policy has not been breached, we will try to resolve the conflict, for example, through a mediated conversation involving a third party or separate conversations with everyone involved. Our aim is to solve issues respectfully and to improve relationships and collaborations. 
+
+We also encourage you to let us know about incidents that were successfully resolved without our involvement. This helps us ensure we have the correct policies in place.
+
+#### Breaches to our zero tolerance policy
+
+We expect you to treat members of our team, volunteers and ambassadors with kindness and respect for the work they are doing. If someone breaches our zero tolerance policy, we may take action such as:
+
+- Stopping all communication with you, including emails or any appeals and complaints
+- Excluding a publisher or journal from the DOAJ
+- Banning an individual from future DOAJ events
+- Blocking or reporting an individual or a profile on social media
+- Removing an individual from an event or preventing them from attending future events
+- Reporting incidents involving our team, volunteers or ambassadors at external events or withdrawing from an event
+- Making a statement on our blog
diff --git a/cms/pages/docs/oai-pmh.md b/cms/pages/docs/oai-pmh.md
@@ -11,17 +11,19 @@ featuremap:
 
 ---
 
+Journal records are announced in the feed when they are added or removed.
+
 ## Journal feed
 
 {:.tabular-list}
 - `Identify`
   - Access the [base Identify endpoint](/oai?verb=Identify).
 - `ListSets`
-  - DOAJ provides all its subject classifications as OAI-PMH sets, so you can harvest just those you are interested in. Access the [full list of the sets](/oai?verb=ListSets).
+  - We provide all our subject classifications as OAI-PMH sets, so you can harvest only those you are interested in. Access the [full list of the sets](/oai?verb=ListSets).
 - `ListMetadataFormats`
-  - DOAJ currently supports only `oai_dc`; access [the metadata formats](/oai?verb=ListMetadataFormats).
+  - Currently, we only support `oai_dc`; access [the metadata formats](/oai?verb=ListMetadataFormats).
 
-The metadata held by DOAJ is mapped to Dublin Core in the OAI-PMH feed, with the following interpretations for each Journal field:
+The metadata held by us is mapped to Dublin Core in the OAI-PMH feed, with the following interpretations for each Journal field:
 
 | Dublin Core   | Meaning within DOAJ                                                                                                                                                                                                                                                                                      |
 |---------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -91,6 +93,7 @@ The metadata held by DOAJ is mapped to Dublin Core in the OAI-PMH feed, with the
 
 | Date changes were made live | Changes                                                                                                                                                                                                                                                 |
 |-----------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 6 November 2024             | added support for article and journal delete to the base Identify endpoint. (Sponsored by Clarivate.) |
 | 25 November 2020            | a minor edit to `dc:relation`: 'Links to related resources: the journal home page and the journal author-pays link if relevant' became 'Links to related resources (if present): the journal home page, open access statement, author instructions, aims, and waiver pages'|
 | 20 April 2015               | `subject` elements which represent a Library of Congress Classification \(LCC\) topic will now be marked with an additional OAI DC\-compliant attribute to denote this: `xsi:type="dcterms:LCSH"`\. LCC subjects will no longer be prefixed by `LCC:`\. |
 | 13 December 2013            | Initial release                                                                                                                                                                                                                                         |
@@ -103,13 +106,13 @@ The metadata held by DOAJ is mapped to Dublin Core in the OAI-PMH feed, with the
 - `Identify`
   - Access the [base Identify endpoint](http://www.doaj.org/oai.article?verb=Identify).
 - `ListSets`
-  - DOAJ provides all its subject classifications as OAI-PMH sets, so you can harvest just those you are interested in. Access the [full list of the sets](http://www.doaj.org/oai.article?verb=ListSets).
+  - We provide all our subject classifications as OAI-PMH sets, so you can harvest only those you are interested in. Access the [full list of the sets](http://www.doaj.org/oai.article?verb=ListSets).
 - `ListMetadataFormats`
-  - DOAJ currently supports the `oai_dc` and `oai_doaj` formats; access [the metadata formats](http://www.doaj.org/oai.article?verb=ListMetadataFormats).
+  - Currently, we only support the `oai_dc` and `oai_doaj` formats; access [the metadata formats](http://www.doaj.org/oai.article?verb=ListMetadataFormats).
 
 ### Dublin Core OAI Article format (`OAI_DC`)
 
-The metadata held by DOAJ is mapped to Dublin Core in the OAI-PMH feed, with the following interpretations for each Article field:
+The metadata held by us is mapped to Dublin Core in the OAI-PMH feed, with the following interpretations for each Article field:
 
 | Dublin Core   | Meaning within DOAJ                                                                                                                                                                                                                                                                                           |
 |---------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -190,6 +193,7 @@ The metadata held by DOAJ is mapped to Dublin Core in the OAI-PMH feed, with the
 
 | Date changes were made live                                                                                                                                                                                                                       | Changes         |
 |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------|
+| 6 November 2024             | added support for article and journal delete to the base Identify endpoint |
 | 25 November 2020                                                                                                                                                                                                                                  | The `dc:provenance` element was removed, as we no longer synchronise provenance information to our article records from the journal\. |
 | 22 August 2016                                                                                                                                                                                                                                    | The `dc:rights` element was removed, as it was technically inaccurate \- it represented the Journal's overall licence policy, not the specific rights for the article\. This information is now in `dc:provenance`\. |
 | 20 April 2015                                                                                                                                                                                                                                     | The `identifier` element will now point to the DOAJ article page rather than the `/search` page\. E\.g\. [`https://doaj.org/article/0000178c89214dc8b82df1a25c0c478e`](https://doaj.org/article/0000178c89214dc8b82df1a25c0c478e) <br/><br/>Up to two new `relation` elements will appear for each article, containing URL\-s to the Table of Contents page for the article's journal\. The page can be reached via both print ISSN and E\-ISSN, so up to two such links might appear\. <br/><br/>`subject` elements which represent a Library of Congress Classification \(LCC\) topic will now be marked with an additional OAI DC\-compliant attribute to denote this: `xsi:type="dcterms:LCSH"`\. LCC subjects will no longer be prefixed by `LCC:`\. |
@@ -288,4 +292,5 @@ The following fields are available (not every article will have all the informat
 
 | Date changes were made live | Changes         |
 |-----------------------------|-----------------|
+| 6 November 2024             | added support for article and journal delete to the base Identify endpoint |
 | 20 April 2015               | Initial release |
diff --git a/deploy/logrotate/README.md b/deploy/logrotate/README.md
@@ -30,4 +30,32 @@ Log uploads can be checked on the S3 bucket with the following command:
 
 ```
 aws --profile doaj-nginx-logs s3 ls s3://doaj-nginx-logs
-```
+```
+
+You can try a test run of `logrotate`:
+
+```
+sudo /usr/sbin/logrotate /etc/logrotate.conf
+```
+
+Or sync the files by directly running:
+
+```
+HOSTNAME=`hostname` sudo aws --profile doaj-nginx-logs s3 sync /var/log/nginx/ s3://doaj-nginx-logs/$HOSTNAME/ --exclude "*" --include "doaj.*.gz"
+```
+
+
+### Troubleshooting:
+
+```
+error: nginx:1 duplicate log entry for /var/log/nginx/doaj.access.log
+error: found error in file nginx, skipping
+```
+
+Check whether you've disabled the default nginx configuration
+
+```
+The config profile (doaj-nginx-logs) could not be found
+```
+
+Check that root user has access to the AWS credentials and symlink if required.
diff --git a/doajtest/fixtures/accounts.py b/doajtest/fixtures/accounts.py
@@ -85,9 +85,12 @@ def create_publisher_a():
     return publisher
 
 
-def create_maned_a():
+def create_maned_a(save=False):
     from portality import models
     maned = models.Account(**AccountFixtureFactory.make_managing_editor_source())
+    maned.set_password("password")
+    if save:
+        maned.save(blocking=True)
     return maned
 
 

diff --git a/doajtest/fixtures/v2/common.py b/doajtest/fixtures/v2/common.py
@@ -25,7 +25,7 @@
 }
 
 SEAL_FORM_EXPANDED = {
-    "doaj_seal": False,
+    "doaj_seal": [],
 }
 
 JOURNAL_LIKE_BIBJSON = {