v0.0.2

.Rbuildignore

@@ -7,3 +7,6 @@
 ^data-raw/organizations$
 ^.DS_Store
 ^data-raw/memberships$
+^_pkgdown\.yml$
+^docs$
+^pkgdown$

.github/workflows/prchecks.yml

@@ -1,7 +1,6 @@
 on:
   pull_request:
     branches:
-      - master
       - main
 
 name: Binary checks
@@ -11,14 +10,13 @@ jobs:
   build:
     name: Build for ${{ matrix.config.os }}
     runs-on: ${{ matrix.config.os }}
-    if: "!contains(github.event.head_commit.message, '[skip-ci]')"
     strategy:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest, r: 'release', artifact_name: '*.tar.gz', asset_name: macOS}
+          - {os: macOS-latest,   r: 'release', artifact_name: '*.tar.gz', asset_name: macOS}
           - {os: windows-latest, r: 'release', artifact_name: '*.zip', asset_name: winOS}
-          - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest", artifact_name: '*.tar.gz', asset_name: linuxOS}
+          - {os: ubuntu-latest, r: 'release', artifact_name: '*.tar.gz', asset_name: linuxOS}
 
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
@@ -37,11 +35,9 @@ jobs:
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           cache-version: 2
+          needs: check, build
           extra-packages: |
             any::rcmdcheck
-            any::lintr
-            any::spelling
-          needs: check
 
       - uses: r-lib/actions/check-r-package@v2
         env:
@@ -58,11 +54,14 @@ jobs:
         shell: Rscript {0}
 
       - name: Save binary artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.config.asset_name }}
           path: build/
 
+      - name: Calculate code coverage
+        run: Rscript -e "covr::codecov()"
+
       - name: Lint
         run: lintr::lint_package()
         shell: Rscript {0}

.github/workflows/pushrelease.yml

@@ -2,7 +2,6 @@ on:
   push:
     branches:
       - main
-      - master
 
 name: Check and release
 
@@ -11,14 +10,13 @@ jobs:
   build:
     name: Build for ${{ matrix.config.os }}
     runs-on: ${{ matrix.config.os }}
-    if: "!contains(github.event.head_commit.message, '[skip-ci]')"
     strategy:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest, r: 'release', artifact_name: '*.tar.gz', asset_name: macOS}
+          - {os: macOS-latest,   r: 'release', artifact_name: '*.tar.gz', asset_name: macOS}
           - {os: windows-latest, r: 'release', artifact_name: '*.zip', asset_name: winOS}
-          - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest", artifact_name: '*.tar.gz', asset_name: linuxOS}
+          - {os: ubuntu-latest, r: 'release', artifact_name: '*.tar.gz', asset_name: linuxOS}
 
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
@@ -37,10 +35,10 @@ jobs:
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           cache-version: 2
+          needs: check, build
           extra-packages: |
             any::rcmdcheck
             any::remotes
-          needs: check
 
       - uses: r-lib/actions/check-r-package@v2
         env:
@@ -57,95 +55,80 @@ jobs:
         shell: Rscript {0}
 
       - name: Save binary artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.config.asset_name }}
           path: build/
 
+      - name: Calculate code coverage
+        if: runner.os == 'macOS-latest'
+        run: Rscript -e "covr::codecov()"
+
   release:
     name: Bump version and release
+    if: ${{ always() }}
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Checkout one
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
         with:
           fetch-depth: '0'
-
       - name: Bump version and push tag
         id: newtag
         uses: anothrNick/github-tag-action@1.39.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           WITH_V: true
           DEFAULT_BUMP: patch
-
+          RELEASE_BRANCHES: main
       - name: Checkout two
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
+      - name: Extract version
+        run: |
+          echo "PACKAGE_VERSION=$(grep '^Version' DESCRIPTION | sed 's/.*: *//')" >> $GITHUB_ENV
+          echo "PACKAGE_NAME=$(grep '^Package' DESCRIPTION | sed 's/.*: *//')" >> $GITHUB_ENV
+
+      - name: Download binaries
+        uses: actions/download-artifact@v4
 
-      - name: Create Release
+      - name: Rename binaries release
+        shell: bash
+        run: |
+          ls -R
+          cp ./macOS/${{ env.PACKAGE_NAME }}_${{ env.PACKAGE_VERSION }}*.tgz .
+          cp ./linuxOS/${{ env.PACKAGE_NAME }}_${{ env.PACKAGE_VERSION }}*.tar.gz .
+          cp ./winOS/${{ env.PACKAGE_NAME }}_${{ env.PACKAGE_VERSION }}*.zip .
+          echo "Renamed files"
+          ls manyios_*
+
+      - name: Create Release and Upload Assets
         id: create_release
-        uses: ncipollo/release-action@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v2
         with:
-          tag: ${{ steps.newtag.outputs.tag }}
+          tag_name: ${{ steps.newtag.outputs.tag }}
           name: Release ${{ steps.newtag.outputs.tag }}
           draft: false
           prerelease: false
-
-      - name: Download binaries
-        uses: actions/download-artifact@v2
-
-      - name: Display structure of downloaded files
-        run: ls -R
-
-      - name: Rename Mac release
-        run: mv ./macOS/*.tgz pkg_macOS.tgz
-
-      - name: Upload Mac binary
-        id: upload-mac
-        uses: actions/upload-release-asset@v1.0.2
+          fail_on_unmatched_files: true
+          # Specify the assets you want to upload
+          files: |
+            manyios_*.tgz
+            manyios_*.tar.gz
+            manyios_*.zip
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: pkg_macOS.tgz
-          asset_name: pkg_macOS.tgz
-          asset_content_type: application/zip
-
-      - name: Rename Linux release
-        run: mv ./linuxOS/*.tar.gz pkg_linuxOS.tar.gz
-
-      - name: Upload Linux binary
-        id: upload-lin
-        uses: actions/upload-release-asset@v1.0.2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: pkg_linuxOS.tar.gz
-          asset_name: pkg_linuxOS.tar.gz
-          asset_content_type: application/zip
-
-      - name: Rename Windows release
-        run: mv ./winOS/*.zip pkg_winOS.zip
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
 
-      - name: Upload Windows binary
-        id: upload-win
-        uses: actions/upload-release-asset@v1.0.2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: pkg_winOS.zip
-          asset_name: pkg_winOS.zip
-          asset_content_type: application/zip
-
-  render:
-    name: Update README.md and push
-    needs: build
+  pkgdown:
+    name: Build and deploy website
+    if: ${{ always() }}
+    needs: release
     runs-on: macOS-latest
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v2
 
@@ -157,44 +140,16 @@ jobs:
         with:
           cache-version: 2
           extra-packages: |
-            any::manydata
+            any::rcmdcheck
+            any::pkgdown
+            any::rsconnect
           needs: check
 
       - name: Install package
         run: R CMD INSTALL .
 
-      # Render README.md using rmarkdown
-      - name: render README
-        run: Rscript -e 'rmarkdown::render("README.Rmd", output_format = "md_document")'
-      # Add man/figures/README-* to the git add call if plots are generated
-      - name: commit rendered README
+      - name: Deploy package
         run: |
-          git add README.md
-          git commit -m "Re-build README.md" || echo "No changes to commit"
-          git push origin master || echo "No changes to commit"
-
-# In case of a website, please uncomment the code chunk below.
-  # pkgdown:
-  #   name: Build and deploy website
-  #   needs: render
-  #   runs-on: macOS-latest
-  #   env:
-  #     GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: r-lib/actions/setup-r@v2
-  #     - uses: r-lib/actions/setup-pandoc@v1
-  #     - uses: r-lib/actions/setup-r-dependencies@v2
-  #       with:
-  #         cache-version: 2
-  #         extra-packages: |
-  #           any::rcmdcheck
-  #           any::pkgdown
-  #         needs: check
-  #     - name: Install package
-  #       run: R CMD INSTALL .
-  #     - name: Deploy package
-  #       run: |
-  #         git config --local user.email "actions@github.com"
-  #         git config --local user.name "GitHub Actions"
-  #         Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
+          git config --local user.email "actions@github.com"
+          git config --local user.name "GitHub Actions"
+          Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'

.gitignore

@@ -3,3 +3,4 @@
 .RData
 .Ruserdata
 .DS_Store
+docs

DESCRIPTION

@@ -1,11 +1,9 @@
-Package: manyigos
+Package: manyios
 Title: Intergovernmental Organisations for manydata
-Version: 0.0.1
-Date: 2023-03-07
-Description: manyigos provides data on intergovernmental organisations in the international system across time. 
+Version: 0.0.2
+Date: 2025-06-02
+Description: manyios provides data on intergovernmental organisations in the international system across time. 
     The package combines and cross-references several existing datasets consistent with the manydata package aims.
-URL: https://github.com/globalgov/manyigos
-BugReports: https://github.com/globalgov/manyigos/issues
 Authors@R: 
     c(person(given = "James",
              family = "Hollway",
@@ -24,12 +22,30 @@ License: CC BY 4.0
 Depends: 
     R (>= 3.5.0),
     manydata
+Imports:
+    purrr,
+    stringi
 Suggests:
-    testthat (>= 3.0.0),
     pointblank,
-    lubridate
+    testthat (>= 3.0.0),
+    lubridate,
+    remotes,
+    knitr
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.1
+RoxygenNote: 7.3.2
+URL: https://github.com/globalgov/manyios
+BugReports: https://github.com/globalgov/manyios/issues
+Config/Needs/build: 
+    roxygen2, 
+    devtools
+Config/Needs/check: 
+    covr,
+    lintr,
+    spelling
+Config/Needs/website:
+    pkgdown
+Config/testthat/parallel: true
 Config/testthat/edition: 3
+Config/testthat/start-first: code_orgs

NAMESPACE

@@ -1,2 +1,8 @@
 # Generated by roxygen2: do not edit by hand
 
+export(code_orgs)
+export(consolidate)
+importFrom(manydata,consolidate)
+importFrom(purrr,map_chr)
+importFrom(stringi,stri_detect_regex)
+importFrom(stringi,stri_trans_general)

NEWS.md

@@ -1,3 +1,17 @@
+# manyios 0.0.2
+
+2025-06-02
+
+## Package
+
+* Closed #7 adding website and new package logo
+* Closed #11 by updating documentation to make it easier to retrieve information on data sources
+* Closed #13 by changing package name to manyios and updating references to manyigos across files
+
+## Data
+
+* Added `memberships$MIGO` dataset
+
 # manyigos 0.0.1
 
 2023-03-07