Merge pull request #9 from akb89/develop

Updated README and dependencies

.gitlab-ci.yml

@@ -21,17 +21,17 @@ build:python3.7:
 test:python3.5:
  image: python:3.5
  stage: test
- script: pip install pytest==3.7.2 pytest-cov==2.5.1 && python -m pytest --cov=pyfn tests/
+ script: pip install pytest==3.7.4 pytest-cov==2.6.0 && python -m pytest --cov=pyfn tests/
 
 test:python3.6:
  image: python:3.6
  stage: test
- script: pip install pytest==3.7.2 pytest-cov==2.5.1 && python -m pytest --cov=pyfn tests/
+ script: pip install pytest==3.7.4 pytest-cov==2.6.0 && python -m pytest --cov=pyfn tests/
 
 test:python3.7:
  image: python:3.7
  stage: test
- script: pip install pytest==3.7.2 pytest-cov==2.5.1 && python -m pytest --cov=pyfn tests/
+ script: pip install pytest==3.7.4 pytest-cov==2.6.0 && python -m pytest --cov=pyfn tests/
 
 lint:python3.5:
  image: python:3.5

README.md

@@ -72,7 +72,9 @@ When using `pyfn`, your FrameNet splits directory structure should follow:
 - SEMEVAL XML: the format of the SEMEVAL 2007 shared task 19 on frame semantic structure extraction
 - SEMAFOR CoNLL: the format used by the SEMAFOR parser
 - BIOS: the format used by the OPEN-SESAME parser
-- CoNLL-X: the format used by various state-of-the-art POS taggers and dependency parsers (see preprocessing considerations for frame semantic parsing in [below](#preprocessing-and-frame-semantic-parsing))
+- CoNLL-X: the format used by various state-of-the-art POS taggers and dependency
+parsers (see preprocessing considerations for frame semantic parsing
+[below](#preprocessing-and-frame-semantic-parsing))
 
 As well as to generate the `.csv` hierarchy files used by both SEMAFOR and
 OPEN-SESAME parsers to integrate the hierarchy feature (see (Kshirsagar et al., 2015) for details).
@@ -303,7 +305,7 @@ to be located under `pyfn/experiments/xp_XYZ/data` where `XYZ` stands for
 the experiments number and is specified using the `-x XYZ` argument, and where
 the `experiments` directory is located at the same level as the `scripts`
 directory. This opinionated choice has proven extremely useful in launching
-scripts by batch on a large set of experiments as it avoid having to input
+scripts by batch on a large set of experiments as it avoids having to input
 the full path each time.
 
 **Make sure to use**

setup.py

@@ -16,11 +16,12 @@
     author_email='[email protected]',
     long_description=long_description,
     long_description_content_type='text/markdown',
-    version='1.2.1',
+    version='1.2.2',
     url='https://gitlab.com/akb89/pyfn',
     download_url='https://pypi.org/project/pyfn/#files',
     license='MIT',
-    keywords=['framenet', 'xml', 'marshalling', 'unmarshalling'],
+    keywords=['framenet', 'xml', 'frame semantic parsing', 'preprocessing',
+              'coling2018', 'pipeline', 'semafor', 'open-sesame'],
     platforms=['any'],
     packages=['pyfn',
               'pyfn.exceptions',
@@ -37,7 +38,7 @@
             'pyfn = pyfn.main:main'
         ],
     },
-    tests_require=['pytest==3.7.4', 'pylint==2.1.1', 'pytest-cov==2.5.1',
+    tests_require=['pytest==3.7.4', 'pylint==2.1.1', 'pytest-cov==2.6.0',
                    'pydocstyle==2.1.1'],
     install_requires=['PyYAML==3.13', 'mmh3==2.5.1', 'lxml==4.2.4',
                       'pytz==2018.5'],