Skip to content

Commit

Permalink
Merge pull request #294 from commonsense/rollback-snakemake
Browse files Browse the repository at this point in the history
Require snakemake < 5.6 so it doesn't break things
  • Loading branch information
jlowryduda authored Sep 15, 2020
2 parents 8b11062 + 13ee686 commit 541d4a1
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 1 deletion.
9 changes: 9 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Robyn has used different names and e-mail addresses in the course of this project. Map them all to her current name and e-mail.
Robyn Speer <rspeer@luminoso.com> <rob@luminoso.com>
Robyn Speer <rspeer@luminoso.com> <rob@lumino.so>
Robyn Speer <rspeer@luminoso.com> <rspeer@mit.edu>
Robyn Speer <rspeer@luminoso.com> <rspeer+gh@luminoso.com>

# Accidental default e-mail addresses
Robyn Speer <rspeer@luminoso.com> <rspeer@conceptnet-api-1.media.mit.edu>
Robyn Speer <rspeer@luminoso.com> <rspeer@anemone.media.mit.edu>
18 changes: 18 additions & 0 deletions scripts/zenodo-upload.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash
# Upload big files to Zenodo.
# Script adapted from https://github.com/jhpoelen/zenodo-upload
#
# usage: ./zenodo_upload.sh [filename]
#

set -xe

DEPOSITION=$1
FILEPATH=$2
FILENAME=$(basename $FILEPATH)

BUCKET=$(curl -H "Accept: application/json" -H "Authorization: Bearer $ZENODO_TOKEN" "https://www.zenodo.org/api/deposit/depositions/$DEPOSITION" | jq --raw-output .links.bucket)


curl --progress-bar --upload-file $FILEPATH $BUCKET/$FILENAME?access_token=$ZENODO_TOKEN
echo
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
include_package_data=True,
exclude_package_data={'conceptnet5': ['support_data/testdata']},
install_requires=[
'snakemake', 'click', 'requests', 'ftfy', 'msgpack-python', 'numpy',
'snakemake < 5.6', 'click', 'requests', 'ftfy', 'msgpack-python', 'numpy',
'langcodes >= 2.1', 'wordfreq >= 2.0.1',
'xmltodict >= 0.11.0, < 0.12.0', 'ordered_set', 'psycopg2-binary',
'marisa-trie', 'tables >= 3.5.1'
Expand Down
Binary file added testdata/reference/edges/cedict/cedict.msgpack
Binary file not shown.

0 comments on commit 541d4a1

Please sign in to comment.