From 7683625627587cda4bfbdd02955298f82c999e0e Mon Sep 17 00:00:00 2001 From: Faris Chebib Date: Tue, 4 Sep 2018 22:27:22 -0600 Subject: [PATCH 1/2] Add dynamic meetup info --- Pipfile | 14 ++++ Pipfile.lock | 131 +++++++++++++++++++++++++++++++++++++ README.md | 17 ++++- setup.py | 7 +- utah/slcpython/__init__.py | 40 +++++++++-- 5 files changed, 199 insertions(+), 10 deletions(-) create mode 100644 Pipfile create mode 100644 Pipfile.lock diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000..a7baacb --- /dev/null +++ b/Pipfile @@ -0,0 +1,14 @@ +[[source]] +url = "https://pypi.org/simple" +verify_ssl = true +name = "pypi" + +[packages] +utah = {editable = true, path = "."} +meetup-api = "*" + +[dev-packages] +pytest = "*" + +[requires] +python_version = "3.6" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 0000000..410890a --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,131 @@ +{ + "_meta": { + "hash": { + "sha256": "825ac304a0f284b11c72bf04246d3c8036613e6bc5d9ee2607f17c2ce3884e3e" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.6" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "certifi": { + "hashes": [ + "sha256:376690d6f16d32f9d1fe8932551d80b23e9d393a8578c5633a2ed39a64861638", + "sha256:456048c7e371c089d0a77a5212fb37a2c2dce1e24146e3b7e0261736aaeaa22a" + ], + "version": "==2018.8.24" + }, + "chardet": { + "hashes": [ + "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", + "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691" + ], + "version": "==3.0.4" + }, + "idna": { + "hashes": [ + "sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e", + "sha256:684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16" + ], + "version": "==2.7" + }, + "meetup-api": { + "hashes": [ + "sha256:83721e37f066c3faf9494592f9ba7ed4b931e9a1a46768ba2e4b55fb249a69ad", + "sha256:8c6e0a2e6b46e3379a8318857084dd93e95bdc156a04b71b41ef7b63f4e91887" + ], + "index": "pypi", + "version": "==0.1.1" + }, + "requests": { + "hashes": [ + "sha256:63b52e3c866428a224f97cab011de738c36aec0185aa91cfacd418b5d58911d1", + "sha256:ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a" + ], + "version": "==2.19.1" + }, + "six": { + "hashes": [ + "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", + "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + ], + "version": "==1.11.0" + }, + "urllib3": { + "hashes": [ + "sha256:a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf", + "sha256:b5725a0bd4ba422ab0e66e89e030c806576753ea3ee08554382c14e685d117b5" + ], + "markers": "python_version != '3.1.*' and python_version != '3.2.*' and python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.6' and python_version < '4'", + "version": "==1.23" + }, + "utah": { + "editable": true, + "path": "." + } + }, + "develop": { + "atomicwrites": { + "hashes": [ + "sha256:0312ad34fcad8fac3704d441f7b317e50af620823353ec657a53e981f92920c0", + "sha256:ec9ae8adaae229e4f8446952d204a3e4b5fdd2d099f9be3aaf556120135fb3ee" + ], + "markers": "python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.3.*' and python_version != '3.0.*' and python_version != '3.1.*'", + "version": "==1.2.1" + }, + "attrs": { + "hashes": [ + "sha256:10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69", + "sha256:ca4be454458f9dec299268d472aaa5a11f67a4ff70093396e1ceae9c76cf4bbb" + ], + "version": "==18.2.0" + }, + "more-itertools": { + "hashes": [ + "sha256:c187a73da93e7a8acc0001572aebc7e3c69daf7bf6881a2cea10650bd4420092", + "sha256:c476b5d3a34e12d40130bc2f935028b5f636df8f372dc2c1c01dc19681b2039e", + "sha256:fcbfeaea0be121980e15bc97b3817b5202ca73d0eae185b4550cbfce2a3ebb3d" + ], + "version": "==4.3.0" + }, + "pluggy": { + "hashes": [ + "sha256:6e3836e39f4d36ae72840833db137f7b7d35105079aee6ec4a62d9f80d594dd1", + "sha256:95eb8364a4708392bae89035f45341871286a333f749c3141c20573d2b3876e1" + ], + "markers": "python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.3.*' and python_version != '3.0.*' and python_version != '3.1.*'", + "version": "==0.7.1" + }, + "py": { + "hashes": [ + "sha256:06a30435d058473046be836d3fc4f27167fd84c45b99704f2fb5509ef61f9af1", + "sha256:50402e9d1c9005d759426988a492e0edaadb7f4e68bcddfea586bc7432d009c6" + ], + "markers": "python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.3.*' and python_version != '3.0.*' and python_version != '3.1.*'", + "version": "==1.6.0" + }, + "pytest": { + "hashes": [ + "sha256:2d7c49e931316cc7d1638a3e5f54f5d7b4e5225972b3c9838f3584788d27f349", + "sha256:ad0c7db7b5d4081631e0155f5c61b80ad76ce148551aaafe3a718d65a7508b18" + ], + "index": "pypi", + "version": "==3.7.4" + }, + "six": { + "hashes": [ + "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", + "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + ], + "version": "==1.11.0" + } + } +} diff --git a/README.md b/README.md index 0292400..159d702 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,24 @@ This module is used as an example package for the Sept 2018 meetup, and also used as an example on slcpy.com. +# Standard Installation + +- `pip install utah` +- Set your `MEETUP_API_KEY` value: `$export MEETUP_API_KEY=api_key_value`, located at [meetup.com](https://secure.meetup.com/meetup_api/key/). +- Test with `from utah import slcpython; slcpython.howdy()` in a python interpreter. You should see details of the next meetup. + +# Dev Installation + +- Install `pipenv`: `python3 -m pip install pipenv`. +- Install the pipenv requirements: `pipenv sync --dev' +- After hacking, use `pipenv install -e .` +- For testing use: `python -m pytest` + + ## TODO - [x] Add tests -- [ ] Integrate meetup api to find latest meetups. +- [x] Integrate `meetup api` to find latest meetups. - [ ] Research if public api exists. - [ ] Figure out friendly auth flow for API key. +- [ ] Use rst for README diff --git a/setup.py b/setup.py index 8e0ec93..8f974fb 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ def readme(): setup( name='utah', - version='0.2', + version='0.9', description='The official module for Utah Python / SLCPython', long_description=readme(), classifiers=[ @@ -21,7 +21,10 @@ def readme(): author_email='faris@theluckybead.com', license='MIT', packages=['utah'], + install_requires=[ + 'meetup-api' + ], zip_safe=False, test_suite='nose.collector', - test_require=['nose'] + test_require=['pytest', 'pipenv'] ) diff --git a/utah/slcpython/__init__.py b/utah/slcpython/__init__.py index 97dc81e..f9ad8ef 100644 --- a/utah/slcpython/__init__.py +++ b/utah/slcpython/__init__.py @@ -1,9 +1,35 @@ +import os +from datetime import datetime + +import meetup.api +from meetup.exceptions import ApiKeyError + + +def get_group_next_event(urlname='slcpython'): + # TODO: convert to async def + api_key = os.environ['MEETUP_API_KEY'] + client = meetup.api.Client() + group_info = client.GetGroup({'urlname': urlname}) + return group_info.next_event + + def howdy(): - msg = """ - Howdy, Salt Lake City! - "Our next meetup is on:" - "Wednesday, September 5th, at 6:30 p.m." - "and is about:" - "A trio of python talks: Beginning / Intermediate / Advanced" - """ + try: + next_event_info = get_group_next_event() + next_datetime = datetime.fromtimestamp( + next_event_info['time'] / 1000.0) + datefmt = r'%A, %B %-d' + timefmt = r'%-I:%M%p' + time_msg = f"{next_datetime.strftime(datefmt)}, at {next_datetime.strftime(timefmt).lower()}" + + msg = f""" + Howdy, Salt Lake City! 🤠 + "Our next meetup is on:" + "{time_msg}" + "and is about:" + "{next_event_info['name']}" + """ + except ApiKeyError: + print('Meetup API key not set') + print(msg) From f7425d7383b12420ccdff714812158f2664d374f Mon Sep 17 00:00:00 2001 From: Faris Chebib Date: Mon, 4 Mar 2019 16:45:06 -0700 Subject: [PATCH 2/2] Initial go at dynamic tests --- Pipfile | 5 +- Pipfile.lock | 124 +++++++++++++++++++---------- utah/slc/__init__.py | 1 + utah/slcpython/__init__.py | 23 ++++-- utah/slcpython/tests/test_howdy.py | 10 ++- 5 files changed, 108 insertions(+), 55 deletions(-) create mode 100644 utah/slc/__init__.py diff --git a/Pipfile b/Pipfile index a7baacb..03bf045 100644 --- a/Pipfile +++ b/Pipfile @@ -4,11 +4,12 @@ verify_ssl = true name = "pypi" [packages] -utah = {editable = true, path = "."} +utah = {editable = true,path = "."} meetup-api = "*" +pytest = "*" [dev-packages] pytest = "*" [requires] -python_version = "3.6" +python_version = "3.7" diff --git a/Pipfile.lock b/Pipfile.lock index 410890a..bc3f078 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "825ac304a0f284b11c72bf04246d3c8036613e6bc5d9ee2607f17c2ce3884e3e" + "sha256": "963f9dc471bba3d662fd62bef2c730154f6e27d506acb0da074e574a4315558a" }, "pipfile-spec": 6, "requires": { @@ -16,12 +16,26 @@ ] }, "default": { + "atomicwrites": { + "hashes": [ + "sha256:03472c30eb2c5d1ba9227e4c2ca66ab8287fbfbbda3888aa93dc2e28fc6811b4", + "sha256:75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6" + ], + "version": "==1.3.0" + }, + "attrs": { + "hashes": [ + "sha256:69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79", + "sha256:f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399" + ], + "version": "==19.1.0" + }, "certifi": { "hashes": [ - "sha256:376690d6f16d32f9d1fe8932551d80b23e9d393a8578c5633a2ed39a64861638", - "sha256:456048c7e371c089d0a77a5212fb37a2c2dce1e24146e3b7e0261736aaeaa22a" + "sha256:47f9c83ef4c0c621eaef743f133f09fa8a74a9b75f037e8624f83bd1b6626cb7", + "sha256:993f830721089fef441cdfeb4b2c8c9df86f0c63239f06bd025a76a7daddb033" ], - "version": "==2018.8.24" + "version": "==2018.11.29" }, "chardet": { "hashes": [ @@ -32,10 +46,10 @@ }, "idna": { "hashes": [ - "sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e", - "sha256:684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16" + "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", + "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" ], - "version": "==2.7" + "version": "==2.8" }, "meetup-api": { "hashes": [ @@ -45,27 +59,56 @@ "index": "pypi", "version": "==0.1.1" }, + "more-itertools": { + "hashes": [ + "sha256:0125e8f60e9e031347105eb1682cef932f5e97d7b9a1a28d9bf00c22a5daef40", + "sha256:590044e3942351a1bdb1de960b739ff4ce277960f2425ad4509446dbace8d9d1" + ], + "markers": "python_version > '2.7'", + "version": "==6.0.0" + }, + "pluggy": { + "hashes": [ + "sha256:19ecf9ce9db2fce065a7a0586e07cfb4ac8614fe96edf628a264b1c70116cf8f", + "sha256:84d306a647cc805219916e62aab89caa97a33a1dd8c342e87a37f91073cd4746" + ], + "version": "==0.9.0" + }, + "py": { + "hashes": [ + "sha256:64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa", + "sha256:dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53" + ], + "version": "==1.8.0" + }, + "pytest": { + "hashes": [ + "sha256:067a1d4bf827ffdd56ad21bd46674703fce77c5957f6c1eef731f6146bfcef1c", + "sha256:9687049d53695ad45cf5fdc7bbd51f0c49f1ea3ecfc4b7f3fde7501b541f17f4" + ], + "index": "pypi", + "version": "==4.3.0" + }, "requests": { "hashes": [ - "sha256:63b52e3c866428a224f97cab011de738c36aec0185aa91cfacd418b5d58911d1", - "sha256:ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a" + "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", + "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b" ], - "version": "==2.19.1" + "version": "==2.21.0" }, "six": { "hashes": [ - "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", - "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", + "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" ], - "version": "==1.11.0" + "version": "==1.12.0" }, "urllib3": { "hashes": [ - "sha256:a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf", - "sha256:b5725a0bd4ba422ab0e66e89e030c806576753ea3ee08554382c14e685d117b5" + "sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39", + "sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22" ], - "markers": "python_version != '3.1.*' and python_version != '3.2.*' and python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.6' and python_version < '4'", - "version": "==1.23" + "version": "==1.24.1" }, "utah": { "editable": true, @@ -75,57 +118,54 @@ "develop": { "atomicwrites": { "hashes": [ - "sha256:0312ad34fcad8fac3704d441f7b317e50af620823353ec657a53e981f92920c0", - "sha256:ec9ae8adaae229e4f8446952d204a3e4b5fdd2d099f9be3aaf556120135fb3ee" + "sha256:03472c30eb2c5d1ba9227e4c2ca66ab8287fbfbbda3888aa93dc2e28fc6811b4", + "sha256:75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6" ], - "markers": "python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.3.*' and python_version != '3.0.*' and python_version != '3.1.*'", - "version": "==1.2.1" + "version": "==1.3.0" }, "attrs": { "hashes": [ - "sha256:10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69", - "sha256:ca4be454458f9dec299268d472aaa5a11f67a4ff70093396e1ceae9c76cf4bbb" + "sha256:69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79", + "sha256:f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399" ], - "version": "==18.2.0" + "version": "==19.1.0" }, "more-itertools": { "hashes": [ - "sha256:c187a73da93e7a8acc0001572aebc7e3c69daf7bf6881a2cea10650bd4420092", - "sha256:c476b5d3a34e12d40130bc2f935028b5f636df8f372dc2c1c01dc19681b2039e", - "sha256:fcbfeaea0be121980e15bc97b3817b5202ca73d0eae185b4550cbfce2a3ebb3d" + "sha256:0125e8f60e9e031347105eb1682cef932f5e97d7b9a1a28d9bf00c22a5daef40", + "sha256:590044e3942351a1bdb1de960b739ff4ce277960f2425ad4509446dbace8d9d1" ], - "version": "==4.3.0" + "markers": "python_version > '2.7'", + "version": "==6.0.0" }, "pluggy": { "hashes": [ - "sha256:6e3836e39f4d36ae72840833db137f7b7d35105079aee6ec4a62d9f80d594dd1", - "sha256:95eb8364a4708392bae89035f45341871286a333f749c3141c20573d2b3876e1" + "sha256:19ecf9ce9db2fce065a7a0586e07cfb4ac8614fe96edf628a264b1c70116cf8f", + "sha256:84d306a647cc805219916e62aab89caa97a33a1dd8c342e87a37f91073cd4746" ], - "markers": "python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.3.*' and python_version != '3.0.*' and python_version != '3.1.*'", - "version": "==0.7.1" + "version": "==0.9.0" }, "py": { "hashes": [ - "sha256:06a30435d058473046be836d3fc4f27167fd84c45b99704f2fb5509ef61f9af1", - "sha256:50402e9d1c9005d759426988a492e0edaadb7f4e68bcddfea586bc7432d009c6" + "sha256:64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa", + "sha256:dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53" ], - "markers": "python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.3.*' and python_version != '3.0.*' and python_version != '3.1.*'", - "version": "==1.6.0" + "version": "==1.8.0" }, "pytest": { "hashes": [ - "sha256:2d7c49e931316cc7d1638a3e5f54f5d7b4e5225972b3c9838f3584788d27f349", - "sha256:ad0c7db7b5d4081631e0155f5c61b80ad76ce148551aaafe3a718d65a7508b18" + "sha256:067a1d4bf827ffdd56ad21bd46674703fce77c5957f6c1eef731f6146bfcef1c", + "sha256:9687049d53695ad45cf5fdc7bbd51f0c49f1ea3ecfc4b7f3fde7501b541f17f4" ], "index": "pypi", - "version": "==3.7.4" + "version": "==4.3.0" }, "six": { "hashes": [ - "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", - "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", + "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" ], - "version": "==1.11.0" + "version": "==1.12.0" } } } diff --git a/utah/slc/__init__.py b/utah/slc/__init__.py new file mode 100644 index 0000000..6e1cfcb --- /dev/null +++ b/utah/slc/__init__.py @@ -0,0 +1 @@ +from utah.slcpython import * \ No newline at end of file diff --git a/utah/slcpython/__init__.py b/utah/slcpython/__init__.py index f9ad8ef..dcb40d4 100644 --- a/utah/slcpython/__init__.py +++ b/utah/slcpython/__init__.py @@ -1,21 +1,22 @@ import os from datetime import datetime +import webbrowser import meetup.api from meetup.exceptions import ApiKeyError -def get_group_next_event(urlname='slcpython'): +def get_group_next_event(urlname='slcpython', key=''): # TODO: convert to async def - api_key = os.environ['MEETUP_API_KEY'] - client = meetup.api.Client() + client = meetup.api.Client(key) group_info = client.GetGroup({'urlname': urlname}) return group_info.next_event -def howdy(): +def howdy(key=''): try: - next_event_info = get_group_next_event() + api_key = os.environ.get('MEETUP_API_KEY', key) + next_event_info = get_group_next_event(key=api_key) next_datetime = datetime.fromtimestamp( next_event_info['time'] / 1000.0) datefmt = r'%A, %B %-d' @@ -29,7 +30,15 @@ def howdy(): "and is about:" "{next_event_info['name']}" """ - except ApiKeyError: - print('Meetup API key not set') + except (ApiKeyError, KeyError): + msg = """ + Sorry, we couldn't find a MEETUP_API_KEY. + Please set one up by visiting + https://secure.meetup.com/meetup_api/key/ + Then, `export MEETUP_API_KEY=` before + running this command. + Alternatively, you may add a `key` argument + to `howdy`. Eg, `slcpython.howdy(key='')` + """ print(msg) diff --git a/utah/slcpython/tests/test_howdy.py b/utah/slcpython/tests/test_howdy.py index 4df9f90..100b1a5 100644 --- a/utah/slcpython/tests/test_howdy.py +++ b/utah/slcpython/tests/test_howdy.py @@ -1,8 +1,9 @@ -import sys from contextlib import contextmanager -from unittest import TestCase - from io import StringIO +import sys + +from unittest import TestCase +from unittest.mock import patch from utah.slcpython import howdy @@ -19,7 +20,8 @@ def captured_output(): class TestHowdy(TestCase): - def test_howdy_prints_info(self): + @patch('utah.slcpython.meetup.api') + def test_howdy_prints_info(self, client): with captured_output() as (out, err): howdy() output = out.getvalue()